diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default index 6cf3dd6..c396277 100644 --- a/config/waybar/configs/[BOT] Default +++ b/config/waybar/configs/[BOT] Default @@ -41,7 +41,7 @@ "custom/lock", //], "custom/separator#dot-line", - "custom/keybinds", + "custom/hint", ], "modules-right": [ diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default index 8ab71d6..79ac099 100644 --- a/config/waybar/configs/[TOP] Default +++ b/config/waybar/configs/[TOP] Default @@ -41,7 +41,7 @@ "custom/lock", //], "custom/separator#dot-line", - "custom/keybinds", + "custom/hint", ], "modules-right": [ diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop index 654fe5c..1521b82 100644 --- a/config/waybar/configs/[TOP] Default Laptop +++ b/config/waybar/configs/[TOP] Default Laptop @@ -41,7 +41,7 @@ "custom/lock", //], "custom/separator#dot-line", - "custom/keybinds", + "custom/hint", ], "modules-right": [ diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2 new file mode 100644 index 0000000..d60189d --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop_v2 @@ -0,0 +1,53 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v2 (Laptop) - Top ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/separator#dot-line", + "clock", + "group/motherboard", + "custom/separator#blank" + "group/laptop" + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/light_dark", + "custom/separator#line", + "hyprland/workspaces#roman", + "custom/separator#line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "custom/separator#line", + "tray", + "mpris", + "bluetooth", + "group/audio", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2 new file mode 100644 index 0000000..f865f22 --- /dev/null +++ b/config/waybar/configs/[TOP] Default_v2 @@ -0,0 +1,51 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v2 - Top ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/separator#dot-line", + "clock", + "group/motherboard", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/light_dark", + "custom/separator#line", + "hyprland/workspaces#roman", + "custom/separator#line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "custom/separator#line", + "tray", + "mpris", + "bluetooth", + "group/audio", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/modules b/config/waybar/modules index fed721b..f42f89d 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -465,7 +465,7 @@ "tooltip": true, }, -"custom/keybinds": { +"custom/hint": { "format":"󰺁 HINT!", "exec": "echo ; echo  Key Hints SUPER H", "on-click": "~/.config/hypr/scripts/KeyHints.sh", @@ -499,7 +499,7 @@ }, "custom/menu": { - "format": "{}", + "format": "{}", "exec": "echo ; echo 󱓟 app launcher", "interval" : 86400, // once every day "tooltip": true, diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 187dac2..3f34407 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -68,7 +68,7 @@ window#waybar.hidden { #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css index 5f74fe8..5ce97ea 100644 --- a/config/waybar/style/Catppuccin-Mocha.css +++ b/config/waybar/style/Catppuccin-Mocha.css @@ -74,7 +74,7 @@ window#waybar.hidden { #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css index d08b53f..89a3b9c 100644 --- a/config/waybar/style/Crimson.css +++ b/config/waybar/style/Crimson.css @@ -129,7 +129,7 @@ tooltip { #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/Mauve.css b/config/waybar/style/Mauve.css index 86b6418..685025f 100644 --- a/config/waybar/style/Mauve.css +++ b/config/waybar/style/Mauve.css @@ -151,7 +151,7 @@ tooltip { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css index 2e0e4f8..0e46383 100644 --- a/config/waybar/style/Purpl.css +++ b/config/waybar/style/Purpl.css @@ -140,7 +140,7 @@ tooltip { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css index bc9b202..783ea1d 100644 --- a/config/waybar/style/Rose Pine.css +++ b/config/waybar/style/Rose Pine.css @@ -118,7 +118,7 @@ tooltip { #wireplumber, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css index e60e275..2f41cbb 100644 --- a/config/waybar/style/Simple Pink.css +++ b/config/waybar/style/Simple Pink.css @@ -145,7 +145,7 @@ tooltip { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css index 6c2af3c..d4ee32d 100644 --- a/config/waybar/style/[Black & White] Monochrome.css +++ b/config/waybar/style/[Black & White] Monochrome.css @@ -128,7 +128,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css index 5c99c52..04ca924 100644 --- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css +++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css @@ -68,7 +68,7 @@ window#waybar.empty #window { #wireplumber, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, @@ -126,7 +126,7 @@ window#waybar.empty #window { } #custom-swaync, -#custom-keybinds, +#custom-hint, #tray { color: aliceblue; } diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css index dcb5bbc..1a995de 100644 --- a/config/waybar/style/[Colored] Chroma Glow.css +++ b/config/waybar/style/[Colored] Chroma Glow.css @@ -116,7 +116,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css index 49f8dbf..5998227 100644 --- a/config/waybar/style/[Colored] Translucent.css +++ b/config/waybar/style/[Colored] Translucent.css @@ -130,7 +130,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css index 3dd64b4..9eab49a 100644 --- a/config/waybar/style/[Colorful] Aurora Blossom.css +++ b/config/waybar/style/[Colorful] Aurora Blossom.css @@ -117,7 +117,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css index c841c90..3c17abf 100644 --- a/config/waybar/style/[Colorful] Aurora.css +++ b/config/waybar/style/[Colorful] Aurora.css @@ -108,7 +108,7 @@ tooltip label{ #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css index 8caa5cb..df8808b 100644 --- a/config/waybar/style/[Colorful] Rainbow Spectrum.css +++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css @@ -72,7 +72,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, @@ -281,7 +281,7 @@ tooltip label{ background-color: #89dceb; } -#custom-keybinds, +#custom-hint, #pulseaudio { background-color: #fab387; } diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css index 75ba82b..00baff3 100644 --- a/config/waybar/style/[Dark] Golden Noir.css +++ b/config/waybar/style/[Dark] Golden Noir.css @@ -143,7 +143,7 @@ tooltip { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Obsidian Edge.css index be74c6b..a64649f 100644 --- a/config/waybar/style/[Dark] Obsidian Edge.css +++ b/config/waybar/style/[Dark] Obsidian Edge.css @@ -136,7 +136,7 @@ tooltip label { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css index 25ccf5c..9b3d568 100644 --- a/config/waybar/style/[Light] Monochrome Contrast.css +++ b/config/waybar/style/[Light] Monochrome Contrast.css @@ -129,7 +129,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css index f95daa0..c245a59 100644 --- a/config/waybar/style/[Light] Obsidian Glow.css +++ b/config/waybar/style/[Light] Obsidian Glow.css @@ -105,7 +105,7 @@ tooltip label { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css index ba4e83a..600b72d 100644 --- a/config/waybar/style/[Pywal] Chroma Edge.css +++ b/config/waybar/style/[Pywal] Chroma Edge.css @@ -109,7 +109,7 @@ tooltip label{ #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css index b100639..90e2e7a 100644 --- a/config/waybar/style/[Pywal] Chroma Fusion.css +++ b/config/waybar/style/[Pywal] Chroma Fusion.css @@ -68,7 +68,7 @@ window#waybar.empty #window { #wireplumber, #workspaces, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, @@ -124,7 +124,7 @@ window#waybar.empty #window { color: @rosewater; } -#custom-keybinds, +#custom-hint, #tray { color: aliceblue; } diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Pywal] Chroma Tally.css index ace2ea3..fa3a697 100644 --- a/config/waybar/style/[Pywal] Chroma Tally.css +++ b/config/waybar/style/[Pywal] Chroma Tally.css @@ -74,7 +74,7 @@ window#waybar { #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Pywal] Colored.css index aeccffb..f52211b 100644 --- a/config/waybar/style/[Pywal] Colored.css +++ b/config/waybar/style/[Pywal] Colored.css @@ -137,7 +137,7 @@ tooltip { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Pywal] Simple.css index 138e926..835d2ca 100644 --- a/config/waybar/style/[Pywal] Simple.css +++ b/config/waybar/style/[Pywal] Simple.css @@ -125,7 +125,7 @@ tooltip { #custom-backlight, #custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css index ea13145..ca81168 100644 --- a/config/waybar/style/[Retro] Simple Style.css +++ b/config/waybar/style/[Retro] Simple Style.css @@ -67,7 +67,7 @@ window#waybar { #workspaces, #custom-backlight, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css index 0f9b176..430072d 100644 --- a/config/waybar/style/[Transparent] Crystal Clear.css +++ b/config/waybar/style/[Transparent] Crystal Clear.css @@ -114,7 +114,7 @@ tooltip { #wireplumber, #workspaces, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, diff --git a/copy.sh b/copy.sh index ed71ea7..4bb1c52 100755 --- a/copy.sh +++ b/copy.sh @@ -249,12 +249,14 @@ printf "\n%.0s" {1..3} # Detect machine type and set Waybar configurations accordingly, logging the output if hostnamectl | grep -q 'Chassis: desktop'; then # Configurations for a desktop - ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + ln -sf "$HOME/.config/waybar/configs/[TOP] Default_v2" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG" + rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" 2>&1 | tee -a "$LOG" else # Configurations for a laptop or any system other than desktop - ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG" + rm -r "$HOME/.config/waybar/configs/[TOP] Default_v2" 2>&1 | tee -a "$LOG" fi printf "\n%.0s" {1..3}