diff --git a/wlx-overlay-s/src/config.rs b/wlx-overlay-s/src/config.rs index c9129dd..33eb8b2 100644 --- a/wlx-overlay-s/src/config.rs +++ b/wlx-overlay-s/src/config.rs @@ -356,21 +356,12 @@ impl GeneralConfig { } } -const FALLBACKS: [&str; 5] = [ +const FALLBACKS: [&str; 2] = [ include_str!("res/keyboard.yaml"), - include_str!("res/watch.yaml"), - include_str!("res/settings.yaml"), - include_str!("res/anchor.yaml"), include_str!("res/wayvr.yaml"), ]; -const FILES: [&str; 5] = [ - "keyboard.yaml", - "watch.yaml", - "settings.yaml", - "anchor.yaml", - "wayvr.yaml", -]; +const FILES: [&str; 2] = ["keyboard.yaml", "wayvr.yaml"]; #[derive(Clone, Copy)] #[repr(usize)] diff --git a/wlx-overlay-s/src/res/anchor.yaml b/wlx-overlay-s/src/res/anchor.yaml deleted file mode 100644 index 11a9d1a..0000000 --- a/wlx-overlay-s/src/res/anchor.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# looking to make changes? -# drop me in ~/.config/wlxoverlay/anchor.yaml -# - -width: 0.1 - -size: [200, 200] - -# +X: right, +Y: up, +Z: back -spawn_pos: [0, 0, -1] - -elements: - - type: Panel - rect: [98, 0, 4, 200] - corner_radius: 0 - bg_color: "#ffff00" - - - type: Panel - rect: [0, 98, 200, 4] - corner_radius: 0 - bg_color: "#ffff00" - - - type: Label - rect: [8, 90, 600, 70] - corner_radius: 0 - font_size: 18 - fg_color: "#ffff00" - source: Static - text: Center diff --git a/wlx-overlay-s/src/res/settings.yaml b/wlx-overlay-s/src/res/settings.yaml deleted file mode 100644 index c448359..0000000 --- a/wlx-overlay-s/src/res/settings.yaml +++ /dev/null @@ -1,670 +0,0 @@ -# looking to make changes? -# drop me in ~/.config/wlxoverlay/settings.yaml -# - -width: 0.3 - -size: [600, 700] - -# +X: right, +Y: up, +Z: back -spawn_pos: [0, -0.1, -0.5] - -elements: - - type: Panel - rect: [0, 0, 600, 800] - corner_radius: 8 - bg_color: "#1e2030" - - - type: Label - rect: [15, 35, 600, 70] - corner_radius: 6 - font_size: 24 - fg_color: "#cad3f5" - source: Static - text: Settings - - - type: Button - rect: [560, 0, 40, 40] - corner_radius: 8 - font_size: 16 - bg_color: "#ed8796" - fg_color: "#24273a" - text: X - click_down: - - type: Window - target: "settings" - action: Destroy - - - type: Panel - rect: [50, 53, 500, 1] - corner_radius: 6 - bg_color: "#6e738d" - - ####### Watch Section ####### - - - type: Label - rect: [15, 85, 570, 24] - corner_radius: 6 - font_size: 18 - fg_color: "#cad3f5" - source: Static - text: Watch - - - type: Panel - rect: [250, 105, 1, 100] - corner_radius: 6 - bg_color: "#6e738d" - - - type: Label - rect: [288, 105, 100, 24] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: Visibility - - - type: Button - rect: [270, 120, 100, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Hide" - click_down: - - type: Watch - action: Hide - - - type: Button - rect: [270, 170, 100, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Swap Hand" - click_down: - - type: Watch - action: SwitchHands - - - type: Panel - rect: [390, 105, 1, 100] - corner_radius: 6 - bg_color: "#6e738d" - - - type: Label - rect: [430, 105, 120, 24] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: Watch Fade - - - type: Button - rect: [410, 120, 140, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Cutoff Point" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - ViewAngle: {kind: "MaxOpacity", delta: 0.01} - scroll_down: - - type: Watch - action: - ViewAngle: {kind: "MaxOpacity", delta: -0.01} - - - type: Button - rect: [410, 170, 140, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Cutoff Strength" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - ViewAngle: {kind: "MinOpacity", delta: 0.01} - scroll_down: - - type: Watch - action: - ViewAngle: {kind: "MinOpacity", delta: -0.01} - - - type: Label - rect: [25, 140, 90, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: Rotation - - - type: Button - rect: [108, 120, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "X" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - Rotation: {axis: "X", delta: 0.25} - scroll_down: - - type: Watch - action: - Rotation: {axis: "X", delta: -0.25} - - - type: Button - rect: [153, 120, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Y" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - Rotation: {axis: "Y", delta: 0.25} - scroll_down: - - type: Watch - action: - Rotation: {axis: "Y", delta: -0.25} - - - type: Button - rect: [198, 120, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Z" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - Rotation: {axis: "Z", delta: 0.25} - scroll_down: - - type: Watch - action: - Rotation: {axis: "Z", delta: -0.25} - - - type: Label - rect: [25, 190, 90, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: Position - - - type: Button - rect: [108, 170, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "X" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - Position: {axis: "X", delta: 0.001} - scroll_down: - - type: Watch - action: - Position: {axis: "X", delta: -0.001} - - - type: Button - rect: [153, 170, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Y" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - Position: {axis: "Y", delta: 0.001} - scroll_down: - - type: Watch - action: - Position: {axis: "Y", delta: -0.001} - - - type: Button - rect: [198, 170, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Z" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: Watch - action: - Position: {axis: "Z", delta: 0.001} - scroll_down: - - type: Watch - action: - Position: {axis: "Z", delta: -0.001} - - - type: Panel - rect: [50, 220, 500, 1] - corner_radius: 6 - bg_color: "#6e738d" - - ####### Mirror Section ####### - - type: Label - rect: [15, 255, 570, 24] - corner_radius: 6 - font_size: 18 - fg_color: "#cad3f5" - source: Static - text: Mirrors - - - type: Label - rect: [25, 290, 30, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: M1 - - - type: Button - rect: [60, 270, 110, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "Show/Hide" - click_down: # ToggleVisible if exists, else create - - type: Overlay - target: M1 - action: ToggleVisible # only fires if overlay exists - - type: Window - target: M1 - action: ShowMirror # only fires if not exists - - - type: Button - rect: [185, 270, 60, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "Lock" - click_down: - - type: Overlay - target: M1 - action: ToggleInteraction - - - type: Button - rect: [258, 270, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#ed8796" - text: "X" - click_down: - - type: Window - target: M1 - action: Destroy - - - type: Label - rect: [25, 340, 30, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: M2 - - - type: Button - rect: [60, 320, 110, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "Show/Hide" - click_down: - - type: Overlay - target: M2 - action: ToggleVisible - - type: Window - target: M2 - action: ShowMirror - - - type: Button - rect: [185, 320, 60, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "Lock" - click_down: - - type: Overlay - target: M2 - action: ToggleInteraction - - - type: Button - rect: [258, 320, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#ed8796" - text: "X" - click_down: - - type: Window - target: M2 - action: Destroy - - - type: Label - rect: [25, 390, 30, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: M3 - - - type: Button - rect: [60, 370, 110, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "Show/Hide" - click_down: - - type: Overlay - target: M3 - action: ToggleVisible - - type: Window - target: M3 - action: ShowMirror - - - type: Button - rect: [185, 370, 60, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "Lock" - click_down: - - type: Overlay - target: M3 - action: ToggleInteraction - - - type: Button - rect: [258, 370, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#ed8796" - text: "X" - click_down: - - type: Window - target: M3 - action: Destroy - - - type: Panel - rect: [300, 240, 1, 200] - corner_radius: 6 - bg_color: "#6e738d" - - ####### Color Gain Section ####### - - - type: Label - rect: [325, 255, 90, 24] - corner_radius: 6 - font_size: 18 - fg_color: "#cad3f5" - source: Static - text: Color Gain - - - type: Label - rect: [470, 255, 90, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - source: Static - text: (SteamVR) - - - type: Button - rect: [330, 270, 60, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#cad3f5" - bg_color: "#494d64" - text: "All" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: ColorAdjust - channel: All - delta: 0.01 - scroll_down: - - type: ColorAdjust - channel: All - delta: -0.01 - - - type: Button - rect: [405, 270, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#e78284" - text: "R" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: ColorAdjust - channel: R - delta: 0.01 - scroll_down: - - type: ColorAdjust - channel: R - delta: -0.01 - - - type: Button - rect: [450, 270, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#a6d189" - text: "G" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: ColorAdjust - channel: G - delta: 0.01 - scroll_down: - - type: ColorAdjust - channel: G - delta: -0.01 - - - type: Button - rect: [495, 270, 30, 30] - corner_radius: 15 - font_size: 12 - fg_color: "#24273a" - bg_color: "#8caaee" - text: "B" - click_down: - - type: Toast - message: Use stick up/down while hovering the button! - scroll_up: - - type: ColorAdjust - channel: B - delta: 0.01 - scroll_down: - - type: ColorAdjust - channel: B - delta: -0.01 - - - type: Panel - rect: [325, 315, 225, 1] - corner_radius: 6 - bg_color: "#6e738d" - - ####### Playspace Section ####### - - - type: Label - rect: [325, 345, 90, 24] - corner_radius: 6 - font_size: 18 - fg_color: "#cad3f5" - source: Static - text: Playspace - - - type: Button - rect: [330, 360, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Fix Floor" - click_down: - - type: System - action: PlayspaceFixFloor - - type: Window - target: "settings" - action: Destroy - - - type: Button - rect: [330, 410, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Reset Offset" - click_down: - - type: System - action: PlayspaceResetOffset - - type: Window - target: "settings" - action: Destroy - - ####### Notifications Section ####### - - - type: Panel - rect: [50, 460, 500, 1] - corner_radius: 6 - bg_color: "#6e738d" - - - type: Label - rect: [325, 490, 90, 24] - corner_radius: 6 - font_size: 18 - fg_color: "#cad3f5" - source: Static - text: Notifications - - - type: Button - rect: [330, 505, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#e64553" - text: "Enabled" - click_down: - - type: System - action: ToggleNotifications - highlight: Notifications - - - type: Button - rect: [330, 555, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#e64553" - text: "Sound Enabled" - click_down: - - type: System - action: ToggleNotificationSounds - highlight: NotificationSounds - - ####### Behavior Section ####### - - type: Label - rect: [15, 490, 570, 24] - corner_radius: 6 - font_size: 18 - fg_color: "#cad3f5" - source: Static - text: Behavior - - - type: Button - rect: [30, 505, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#e64553" - text: "Auto-Realign" - click_down: - - type: System - action: ToggleAutoRealign - highlight: AutoRealign - - - type: Button - rect: [30, 555, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#e64553" - text: "Grab+Scroll Slide" - click_down: - - type: System - action: ToggleAllowSliding - highlight: AllowSliding - - ####### Footer Section ####### - - - type: Panel - rect: [50, 605, 500, 1] - corner_radius: 6 - bg_color: "#6e738d" - - - type: Button - rect: [330, 625, 220, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Save Config" - click_down: - - type: System - action: PersistConfig - - type: Toast - message: Settings saved successfully. - - - type: Button - rect: [30, 625, 250, 30] - corner_radius: 6 - font_size: 12 - fg_color: "#24273a" - bg_color: "#eed49f" - text: "Save Overlay Layout" - click_down: - - type: System - action: PersistLayout - - type: Toast - message: Saved. You will see this layout on next startup. - diff --git a/wlx-overlay-s/src/res/watch.yaml b/wlx-overlay-s/src/res/watch.yaml deleted file mode 100644 index ddeb73c..0000000 --- a/wlx-overlay-s/src/res/watch.yaml +++ /dev/null @@ -1,192 +0,0 @@ -# looking to make changes? -# drop me in ~/.config/wlxoverlay/watch.yaml -# - -width: 0.115 - -size: [400, 200] - -elements: - # background panel - - type: Panel - rect: [0, 30, 400, 130] - corner_radius: 20 - bg_color: "#24273a" - - - type: Button - rect: [2, 162, 26, 36] - corner_radius: 4 - font_size: 15 - bg_color: "#c6a0f6" - fg_color: "#24273a" - text: "C" - click_up: # destroy if exists, otherwise create - - type: Window - target: settings - action: ShowUi # only triggers if not exists - - type: Window - target: settings - action: Destroy # only triggers if exists since before current frame - - # Dashboard toggle button - - type: Button - rect: [32, 162, 48, 36] - corner_radius: 4 - font_size: 15 - bg_color: "#2288FF" - fg_color: "#24273a" - text: "Dash" - click_up: - - type: WayVR - action: ToggleDashboard - - # Keyboard button - - type: Button - rect: [84, 162, 48, 36] - corner_radius: 4 - font_size: 15 - fg_color: "#24273a" - bg_color: "#a6da95" - text: Kbd - click_up: - - type: Overlay - target: "kbd" - action: ToggleVisible - long_click_up: - - type: Overlay - target: "kbd" - action: Reset - right_up: - - type: Overlay - target: "kbd" - action: ToggleImmovable - middle_up: - - type: Overlay - target: "kbd" - action: ToggleInteraction - scroll_up: - - type: Overlay - target: "kbd" - action: - Opacity: { delta: 0.025 } - scroll_down: - - type: Overlay - target: "kbd" - action: - Opacity: { delta: -0.025 } - - # bottom row, of keyboard + overlays - - type: OverlayList - rect: [134, 160, 266, 40] - corner_radius: 4 - font_size: 15 - fg_color: "#cad3f5" - bg_color: "#1e2030" - layout: Horizontal - click_up: ToggleVisible - long_click_up: Reset - right_up: ToggleImmovable - middle_up: ToggleInteraction - scroll_up: - Opacity: { delta: 0.025 } - scroll_down: - Opacity: { delta: -0.025 } - - # local clock - - type: Label - rect: [19, 90, 200, 50] - corner_radius: 4 - font_size: 46 # Use 32 for 12-hour time - fg_color: "#cad3f5" - source: Clock - format: "%H:%M" # 23:59 - #format: "%I:%M %p" # 11:59 PM - - # local date - - type: Label - rect: [20, 117, 200, 20] - corner_radius: 4 - font_size: 14 - fg_color: "#cad3f5" - source: Clock - format: "%x" # local date representation - - # local day-of-week - - type: Label - rect: [20, 137, 200, 50] - corner_radius: 4 - font_size: 14 - fg_color: "#cad3f5" - source: Clock - format: "%A" # Tuesday - #format: "%a" # Tue - - # alt clock 1 - - type: Label - rect: [210, 90, 200, 50] - corner_radius: 4 - font_size: 24 # Use 18 for 12-hour time - fg_color: "#8bd5ca" - source: Clock - timezone: 0 - format: "%H:%M" # 23:59 - #format: "%I:%M %p" # 11:59 PM - - type: Label - rect: [210, 60, 200, 50] - corner_radius: 4 - font_size: 14 - fg_color: "#8bd5ca" - source: Timezone - timezone: 0 - - # alt clock 2 - - type: Label - rect: [210, 150, 200, 50] - corner_radius: 4 - font_size: 24 # Use 18 for 12-hour time - fg_color: "#b7bdf8" - source: Clock - timezone: 1 - format: "%H:%M" # 23:59 - #format: "%I:%M %p" # 11:59 PM - - type: Label - rect: [210, 120, 200, 50] - corner_radius: 4 - font_size: 14 - fg_color: "#b7bdf8" - source: Timezone - timezone: 1 - - # batteries - - type: BatteryList - rect: [0, 5, 400, 30] - corner_radius: 4 - font_size: 16 - fg_color: "#8bd5ca" - fg_color_low: "#B06060" - fg_color_charging: "#6080A0" - num_devices: 9 - layout: Horizontal - low_threshold: 33 - - # volume buttons - - type: Button - rect: [315, 52, 70, 32] - corner_radius: 4 - font_size: 13 - fg_color: "#cad3f5" - bg_color: "#5b6078" - text: "Vol +" - click_down: - - type: Exec - command: ["pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%"] - - type: Button - rect: [315, 116, 70, 32] - corner_radius: 4 - font_size: 13 - fg_color: "#cad3f5" - bg_color: "#5b6078" - text: "Vol -" - click_down: - - type: Exec - command: ["pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%"]