From 327bb4e30b207df1c86cbbca191aba6e1bb4fb36 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 6 Dec 2023 22:23:37 +0900 Subject: Bump to 2.1.17. Changes: Change initial boot behaviour... Forcing a single wallpaper to load initially. (Will change every major release :) Script will now detect if desktop or any other machines and will symlink the proper waybar layout --- config/hypr/initial-boot.sh | 27 ++++++------- config/hypr/v2.1.16 | 5 --- config/hypr/v2.1.17 | 5 +++ config/waybar/configs/Def[Bottom]-Laptop | 66 ++++++++++++++++++++++++++++++++ config/waybar/configs/Def[TOP]-Laptop | 66 ++++++++++++++++++++++++++++++++ config/waybar/configs/Default [Bottom] | 5 --- config/waybar/configs/Default [TOP] | 5 --- 7 files changed, 151 insertions(+), 28 deletions(-) mode change 100644 => 100755 config/hypr/initial-boot.sh delete mode 100644 config/hypr/v2.1.16 create mode 100644 config/hypr/v2.1.17 create mode 100644 config/waybar/configs/Def[Bottom]-Laptop create mode 100644 config/waybar/configs/Def[TOP]-Laptop (limited to 'config') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh old mode 100644 new mode 100755 index d5ce3233..ba07fed5 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -1,27 +1,28 @@ #!/bin/bash -# THIS SCRIPT CAN BE DELETED ONCE BOOTED!! - # A bash script designed to ran it only once dotfiles installed + +# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf +# not necessary to do since this script is only designed to ran only once as long as the marker exist + +# Set swww options +wallpaper=$HOME/Pictures/wallpapers/mecha-nostalgia.png + +swww="swww img" +effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" + # Check if a marker file exists. if [ ! -f ~/.config/hypr/.initial_startup_done ]; then - # Check if the ~/.cache/wal directory exists - if [ ! -d ~/.cache/wal ]; then - printf " Initializing pywal........\n\n" - # Check if the ~/Pictures/wallpapers directory exists - if [ -d ~/Pictures/wallpapers ]; then - # Run wal with random wallpapers from ~/Pictures/wallpapers - wal -i ~/Pictures/wallpapers/mecha-nostalgia.png - echo "Pywal initialized" - fi - fi + # Initialize pywal + printf " Initializing pywal........\n\n" + wal -i $wallpaper #initial symlink for Pywal Dark and Light for Rofi Themes ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" # Initial scripts to load inorder to have a proper wallpaper waybar and pywal themes - exec $HOME/.config/hypr/scripts/Wallpaper.sh & + swww query || swww init && $swww $wallpaper $effect # Create a marker file to indicate that the script has been executed. touch ~/.config/hypr/.initial_startup_done diff --git a/config/hypr/v2.1.16 b/config/hypr/v2.1.16 deleted file mode 100644 index 31b3414d..00000000 --- a/config/hypr/v2.1.16 +++ /dev/null @@ -1,5 +0,0 @@ -### https://github.com/JaKooLit ### -## https://github.com/JaKooLit/Hyprland-Dots -## This is to have a reference of which version would be - -## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/hypr/v2.1.17 b/config/hypr/v2.1.17 new file mode 100644 index 00000000..31b3414d --- /dev/null +++ b/config/hypr/v2.1.17 @@ -0,0 +1,5 @@ +### https://github.com/JaKooLit ### +## https://github.com/JaKooLit/Hyprland-Dots +## This is to have a reference of which version would be + +## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop new file mode 100644 index 00000000..8bf8ecd1 --- /dev/null +++ b/config/waybar/configs/Def[Bottom]-Laptop @@ -0,0 +1,66 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "bottom", +"spacing": 3, +"fixed-center": true, +"ipc": true, +//"margin-top": 6, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/keybinds", + ], + +"modules-right": [ + //"hyprland/window", + "tray", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "network#speed", + "custom/separator#dot-line", + "battery", + "custom/separator#dot-line", + "backlight", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + //"wireplumber", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/power", + ], +} diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop new file mode 100644 index 00000000..eabaf37e --- /dev/null +++ b/config/waybar/configs/Def[TOP]-Laptop @@ -0,0 +1,66 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT ### // +{ +"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": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/keybinds", + ], + +"modules-right": [ + //"hyprland/window", + "tray", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "network#speed", + "custom/separator#dot-line", + "battery", + "custom/separator#dot-line", + "backlight", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + //"wireplumber", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 8bf8ecd1..6c37a22f 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -50,13 +50,8 @@ "custom/separator#dot-line", "network#speed", "custom/separator#dot-line", - "battery", - "custom/separator#dot-line", - "backlight", - "custom/separator#dot-line", "pulseaudio", "custom/separator#dot-line", - //"wireplumber", "pulseaudio#microphone", "custom/separator#dot-line", "keyboard-state", diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP] index eabaf37e..edc14094 100644 --- a/config/waybar/configs/Default [TOP] +++ b/config/waybar/configs/Default [TOP] @@ -50,13 +50,8 @@ "custom/separator#dot-line", "network#speed", "custom/separator#dot-line", - "battery", - "custom/separator#dot-line", - "backlight", - "custom/separator#dot-line", "pulseaudio", "custom/separator#dot-line", - //"wireplumber", "pulseaudio#microphone", "custom/separator#dot-line", "keyboard-state", -- cgit v1.2.3 From d1f1dd0cb8194a96cc38b078f27d65d9a7860f20 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 6 Dec 2023 23:11:45 +0900 Subject: change oen waybar style border radius --- config/waybar/style/Chroma Tally.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 04b68dc8..789cb384 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -15,7 +15,7 @@ padding: 1px; window#waybar { background: rgba (0, 0, 0, 0.5); - border-radius: 20px 20px 20px 20px; + border-radius: 12px; border-bottom: 3px; border-style: solid; border-color: @color2; -- cgit v1.2.3 From fefd56f435d8885f30982c3d5ad09a91495d83a8 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 09:50:59 +0900 Subject: adjusted border-bottom for some waybar styles --- config/waybar/style/Monochrome Contrast.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/Monochrome Contrast.css index a8832e6d..74602604 100644 --- a/config/waybar/style/Monochrome Contrast.css +++ b/config/waybar/style/Monochrome Contrast.css @@ -40,7 +40,7 @@ tooltip label{ .modules-right { background-color: white; color: black; - border-bottom: 4px; + border-bottom: 2px; border-style: solid; border-color: black; border-radius: 10px; @@ -52,7 +52,7 @@ tooltip label{ .modules-center { background-color: white; color: black; - border-bottom: 4px; + border-bottom: 2px; border-style: solid; border-color: black; border-radius: 10px; @@ -64,7 +64,7 @@ tooltip label{ .modules-left { background-color: white; color: black; - border-bottom: 4px; + border-bottom: 2px; border-style: solid; border-color: black; border-radius: 10px; -- cgit v1.2.3 From 86ccfafed6083d36a38714867202545ed83ae8b2 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 10:58:39 +0900 Subject: added custom-keyboad waybar module --- config/hypr/scripts/SwitchKeyboardLayout.sh | 31 +++++++++++++++++++++++++++ config/waybar/configs/Def[Bottom]-Laptop | 3 ++- config/waybar/configs/Def[TOP]-Laptop | 3 ++- config/waybar/configs/Default [Bottom] | 2 ++ config/waybar/configs/Default [TOP] | 2 ++ config/waybar/modules | 10 ++++++++- config/waybar/style/Catppuccin-Latte.css | 3 +-- config/waybar/style/Catppuccin-Mocha.css | 3 +-- config/waybar/style/Chroma Edge.css | 1 + config/waybar/style/Chroma Glow.css | 3 +-- config/waybar/style/Chroma Tally.css | 3 +-- config/waybar/style/Crimson.css | 3 +-- config/waybar/style/Crystal Clear.css | 3 +-- config/waybar/style/Golden Noir.css | 3 +-- config/waybar/style/Monochrome Contrast.css | 9 ++++---- config/waybar/style/Monochrome Manifest.css | 9 ++++---- config/waybar/style/Obsidian Edge.css | 3 +-- config/waybar/style/Obsidian Glow.css | 3 +-- config/waybar/style/Purpl.css | 3 +-- config/waybar/style/Pywal Simple.css | 3 +-- config/waybar/style/Pywal.css | 5 ++--- config/waybar/style/Rainbow Spectrum.css | 4 ++-- config/waybar/style/Rose Pine.css | 3 +-- config/waybar/style/Simple Pink.css | 3 +-- config/waybar/style/Translucent Chromatic.css | 3 +-- 25 files changed, 75 insertions(+), 46 deletions(-) create mode 100755 config/hypr/scripts/SwitchKeyboardLayout.sh (limited to 'config') diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh new file mode 100755 index 00000000..40b212f0 --- /dev/null +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +layout_f="/tmp/kb_layout" +current_layout=$(cat "$layout_f") + +# Read keyboard layout settings from Settings.conf +settings_file="$HOME/.config/hypr/configs/Settings.conf" + +if [ -f "$settings_file" ]; then + # Extract the value of kb_layout from Settings.conf + kb_layout_line=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2) + IFS=',' read -ra layout_mapping <<< "$kb_layout_line" +fi + +layout_count=${#layout_mapping[@]} + +# Find the index of the current layout in the mapping +for ((i = 0; i < layout_count; i++)); do + if [ "$current_layout" == "${layout_mapping[i]}" ]; then + current_index=$i + break + fi +done + +# Calculate the index of the next layout +next_index=$(( (current_index + 1) % layout_count )) +new_layout="${layout_mapping[next_index]}" + +# Update the keyboard layout +hyprctl keyword input:kb_layout "$new_layout" +echo "$new_layout" > "$layout_f" diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop index 8bf8ecd1..d7b7d18a 100644 --- a/config/waybar/configs/Def[Bottom]-Laptop +++ b/config/waybar/configs/Def[Bottom]-Laptop @@ -56,11 +56,12 @@ "custom/separator#dot-line", "pulseaudio", "custom/separator#dot-line", - //"wireplumber", "pulseaudio#microphone", "custom/separator#dot-line", "keyboard-state", "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", "custom/power", ], } diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop index eabaf37e..8808e762 100644 --- a/config/waybar/configs/Def[TOP]-Laptop +++ b/config/waybar/configs/Def[TOP]-Laptop @@ -56,11 +56,12 @@ "custom/separator#dot-line", "pulseaudio", "custom/separator#dot-line", - //"wireplumber", "pulseaudio#microphone", "custom/separator#dot-line", "keyboard-state", "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", "custom/power", ], } \ No newline at end of file diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 6c37a22f..1e1e5abf 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -56,6 +56,8 @@ "custom/separator#dot-line", "keyboard-state", "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", "custom/power", ], } diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP] index edc14094..acce267f 100644 --- a/config/waybar/configs/Default [TOP] +++ b/config/waybar/configs/Default [TOP] @@ -56,6 +56,8 @@ "custom/separator#dot-line", "keyboard-state", "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", "custom/power", ], } \ No newline at end of file diff --git a/config/waybar/modules b/config/waybar/modules index a4567c08..fa989045 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -457,6 +457,14 @@ "tooltip": false, "on-click": "~/.config/hypr/scripts/KeyHints.sh", }, + + "custom/keyboard": { + "exec": "cat /tmp/kb_layout", + "interval": 3, + "format": " {}", + "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", + "tooltip": false, + }, "custom/light_dark": { "format": "", @@ -640,7 +648,7 @@ "temperature#vertical": { "interval": 10, "tooltip": true, - "hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], + "hwmon-path": ["/sys/class/hwmon/hwmon6/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], //"thermal-zone": 0, "critical-threshold": 80, "format-critical": "{icon}\n{temperatureC}°C", diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 619b24a3..21f295ba 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -53,8 +53,6 @@ window#waybar.hidden { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -72,6 +70,7 @@ window#waybar.hidden { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css index eceb569b..1d49b33f 100644 --- a/config/waybar/style/Catppuccin-Mocha.css +++ b/config/waybar/style/Catppuccin-Mocha.css @@ -59,8 +59,6 @@ window#waybar.hidden { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -78,6 +76,7 @@ window#waybar.hidden { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Chroma Edge.css b/config/waybar/style/Chroma Edge.css index fac5035a..7195b3f1 100644 --- a/config/waybar/style/Chroma Edge.css +++ b/config/waybar/style/Chroma Edge.css @@ -107,6 +107,7 @@ tooltip label{ #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Chroma Glow.css b/config/waybar/style/Chroma Glow.css index 46cfe7c5..789b2675 100644 --- a/config/waybar/style/Chroma Glow.css +++ b/config/waybar/style/Chroma Glow.css @@ -102,8 +102,6 @@ tooltip label{ #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -121,6 +119,7 @@ tooltip label{ #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 789cb384..263906d7 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -59,8 +59,6 @@ window#waybar { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -78,6 +76,7 @@ window#waybar { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css index 44c20e0f..8d139d1a 100644 --- a/config/waybar/style/Crimson.css +++ b/config/waybar/style/Crimson.css @@ -116,8 +116,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -135,6 +133,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Crystal Clear.css b/config/waybar/style/Crystal Clear.css index 324c7aad..566b1961 100644 --- a/config/waybar/style/Crystal Clear.css +++ b/config/waybar/style/Crystal Clear.css @@ -102,8 +102,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -119,6 +117,7 @@ tooltip { #workspaces, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Golden Noir.css b/config/waybar/style/Golden Noir.css index 2540188c..42ae216b 100644 --- a/config/waybar/style/Golden Noir.css +++ b/config/waybar/style/Golden Noir.css @@ -128,8 +128,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -147,6 +145,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/Monochrome Contrast.css index 74602604..6dbb4732 100644 --- a/config/waybar/style/Monochrome Contrast.css +++ b/config/waybar/style/Monochrome Contrast.css @@ -40,7 +40,7 @@ tooltip label{ .modules-right { background-color: white; color: black; - border-bottom: 2px; + border-bottom: 4px; border-style: solid; border-color: black; border-radius: 10px; @@ -52,7 +52,7 @@ tooltip label{ .modules-center { background-color: white; color: black; - border-bottom: 2px; + border-bottom: 4px; border-style: solid; border-color: black; border-radius: 10px; @@ -64,7 +64,7 @@ tooltip label{ .modules-left { background-color: white; color: black; - border-bottom: 2px; + border-bottom: 4px; border-style: solid; border-color: black; border-radius: 10px; @@ -115,8 +115,6 @@ tooltip label{ #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -134,6 +132,7 @@ tooltip label{ #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Monochrome Manifest.css b/config/waybar/style/Monochrome Manifest.css index 2d4cafd0..913dc8e3 100644 --- a/config/waybar/style/Monochrome Manifest.css +++ b/config/waybar/style/Monochrome Manifest.css @@ -40,7 +40,7 @@ tooltip label{ .modules-right { background-color: black; color: white; - border-bottom: 2px; + border-bottom: 3px; border-style: solid; border-color: white; border-radius: 10px; @@ -52,7 +52,7 @@ tooltip label{ .modules-center { background-color: black; color: white; - border-bottom: 2px; + border-bottom: 3px; border-style: solid; border-color: white; border-radius: 10px; @@ -64,7 +64,7 @@ tooltip label{ .modules-left { background-color: black; color: white; - border-bottom: 2px; + border-bottom: 3px; border-style: solid; border-color: white; border-radius: 10px; @@ -114,8 +114,6 @@ tooltip label{ #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -133,6 +131,7 @@ tooltip label{ #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Obsidian Edge.css b/config/waybar/style/Obsidian Edge.css index 59f58285..53aa79ba 100644 --- a/config/waybar/style/Obsidian Edge.css +++ b/config/waybar/style/Obsidian Edge.css @@ -121,8 +121,6 @@ tooltip label { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -140,6 +138,7 @@ tooltip label { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Obsidian Glow.css b/config/waybar/style/Obsidian Glow.css index e790730c..df6a9681 100644 --- a/config/waybar/style/Obsidian Glow.css +++ b/config/waybar/style/Obsidian Glow.css @@ -90,8 +90,6 @@ tooltip label { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -109,6 +107,7 @@ tooltip label { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css index 3a6c6904..7d89f329 100644 --- a/config/waybar/style/Purpl.css +++ b/config/waybar/style/Purpl.css @@ -125,8 +125,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -144,6 +142,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Pywal Simple.css b/config/waybar/style/Pywal Simple.css index 83d73cde..321f6e86 100644 --- a/config/waybar/style/Pywal Simple.css +++ b/config/waybar/style/Pywal Simple.css @@ -106,8 +106,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -125,6 +123,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Pywal.css b/config/waybar/style/Pywal.css index 411cf426..a0ce5025 100644 --- a/config/waybar/style/Pywal.css +++ b/config/waybar/style/Pywal.css @@ -8,7 +8,7 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 96%; + font-size: 94%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } @@ -122,8 +122,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -141,6 +139,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Rainbow Spectrum.css b/config/waybar/style/Rainbow Spectrum.css index 9f0c7040..aa140f0c 100644 --- a/config/waybar/style/Rainbow Spectrum.css +++ b/config/waybar/style/Rainbow Spectrum.css @@ -57,8 +57,6 @@ tooltip label{ #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -76,6 +74,7 @@ tooltip label{ #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, @@ -138,6 +137,7 @@ tooltip label{ background-color: #a6e3a1; } +#custom-keyboard, #keyboard-state, #keyboard-state label, #keyboard-state label.locked, diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css index 261f4b66..856edc0a 100644 --- a/config/waybar/style/Rose Pine.css +++ b/config/waybar/style/Rose Pine.css @@ -107,8 +107,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -123,6 +121,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css index b21c4ac7..32831fe3 100644 --- a/config/waybar/style/Simple Pink.css +++ b/config/waybar/style/Simple Pink.css @@ -129,8 +129,6 @@ tooltip { #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -148,6 +146,7 @@ tooltip { #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/Translucent Chromatic.css index b6f3c414..3efc20d6 100644 --- a/config/waybar/style/Translucent Chromatic.css +++ b/config/waybar/style/Translucent Chromatic.css @@ -115,8 +115,6 @@ tooltip label{ #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -134,6 +132,7 @@ tooltip label{ #custom-backlight, #custom-cycle_wall, #custom-keybinds, +#custom-keyboard, #custom-light_dark, #custom-lock, #custom-menu, -- cgit v1.2.3 From e5aaed60240f41fde318ab957703cbab76d0c99c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 11:17:40 +0900 Subject: dunst with a more brighter text on dark mode --- config/dunst/dunstrc | 6 +++--- config/hypr/scripts/DarkLight.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index e20c4cc8..74d500d9 100755 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -281,7 +281,7 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. - background = "#00000080" + background = "#00000095" foreground = "#fafafa" frame_color = "#3C27C7" timeout = 2 @@ -289,7 +289,7 @@ icon = $HOME/.config/dunst/images/bell.png [urgency_normal] - background = "#00000080" + background = "#00000095" foreground = "#fafafa" frame_color = "#3C27C7" timeout = 5 @@ -297,7 +297,7 @@ icon = $HOME/.config/dunst/images/bell.png [urgency_critical] - background = "#00000080" + background = "#00000095" foreground = "#fafafa" frame_color = "#3C27C7" timeout = 0 diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 2072e1be..dc7adda0 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -46,7 +46,7 @@ notify_user "$next_mode" # Change background for dunst if [ "$next_mode" = "dark" ]; then - sed -i '/background = /s/.*/ background = "#00000080"/' "${dunst_config}/dunstrc" + sed -i '/background = /s/.*/ background = "#00000095"/' "${dunst_config}/dunstrc" sed -i '/foreground = /s/.*/ foreground = "#fafafa"/' "${dunst_config}/dunstrc" else sed -i '/background = /s/.*/ background = "#FFFFFF80"/' "${dunst_config}/dunstrc" -- cgit v1.2.3 From 86733c1873f9a6e227a2ae7a85c3371fc0b0625f Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 11:21:34 +0900 Subject: added initial wallpaper --- config/hypr/initial-boot.sh | 2 +- copy.sh | 2 +- wallpapers/anime-girl-abyss.png | Bin 0 -> 2931296 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 wallpapers/anime-girl-abyss.png (limited to 'config') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index ba07fed5..cfadfcc4 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -6,7 +6,7 @@ # not necessary to do since this script is only designed to ran only once as long as the marker exist # Set swww options -wallpaper=$HOME/Pictures/wallpapers/mecha-nostalgia.png +wallpaper=$HOME/Pictures/wallpapers/anime-girl-abyss.png swww="swww img" effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" diff --git a/copy.sh b/copy.sh index 7f29b34e..bb5e7691 100755 --- a/copy.sh +++ b/copy.sh @@ -221,7 +221,7 @@ fi ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \ # initialize pywal to avoid config error on hyprland -wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 2>&1 | tee -a "$LOG" +wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG" #initial symlink for Pywal Dark and Light for Rofi Themes ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" diff --git a/wallpapers/anime-girl-abyss.png b/wallpapers/anime-girl-abyss.png new file mode 100644 index 00000000..6871f0e7 Binary files /dev/null and b/wallpapers/anime-girl-abyss.png differ -- cgit v1.2.3 From 86204c8dc9f561d8e8025ac0d4161b68cf93c7db Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 12:27:49 +0900 Subject: updated some waybar styles --- config/waybar/style/Catppuccin-Latte.css | 1 + config/waybar/style/Catppuccin-Mocha.css | 15 ++++++++------- config/waybar/style/Chroma Edge.css | 25 +++++++++++++++---------- config/waybar/style/Chroma Glow.css | 2 ++ config/waybar/style/Chroma Tally.css | 3 +++ config/waybar/style/Monochrome Contrast.css | 6 +++--- config/waybar/style/Monochrome Manifest.css | 8 ++++---- config/waybar/style/Pywal.css | 2 +- config/waybar/style/Translucent Chromatic.css | 7 +++++-- 9 files changed, 42 insertions(+), 27 deletions(-) (limited to 'config') diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 21f295ba..45283f3e 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -132,6 +132,7 @@ window#waybar.hidden { color: @green; } +#custom-keyboard, #memory { color: @sky; } diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css index 1d49b33f..93f5fda3 100644 --- a/config/waybar/style/Catppuccin-Mocha.css +++ b/config/waybar/style/Catppuccin-Mocha.css @@ -138,6 +138,7 @@ window#waybar.hidden { color: @green; } +#custom-keyboard, #memory { color: @sky; } @@ -177,7 +178,7 @@ window#waybar.hidden { } #workspaces button:hover { - border-radius: 8px; + border-radius: 10px; color: @overlay0; background-color: @surface0; padding-left: 2px; @@ -187,13 +188,13 @@ window#waybar.hidden { } #workspaces button.persistent { - color: @surface1; - border-radius: 10px; + color: @surface1; + border-radius: 10px; } #workspaces button.active { - color: @peach; - border-radius: 8px; + color: @peach; + border-radius: 10px; padding-left: 8px; padding-right: 8px; animation: gradient_f 20s ease-in infinite; @@ -201,8 +202,8 @@ window#waybar.hidden { } #workspaces button.urgent { - color: @red; - border-radius: 0px; + color: @red; + border-radius: 0px; } #taskbar button.active { diff --git a/config/waybar/style/Chroma Edge.css b/config/waybar/style/Chroma Edge.css index 7195b3f1..797d0d68 100644 --- a/config/waybar/style/Chroma Edge.css +++ b/config/waybar/style/Chroma Edge.css @@ -49,9 +49,10 @@ tooltip { tooltip label{ color: #cdd6f4; } + #workspaces button { - color: #7984a4; - background-color: transparent; + background-color: transparent; + color: grey; box-shadow: none; text-shadow: none; padding: 0px; @@ -62,21 +63,24 @@ tooltip label{ transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } -#workspace button.hover { - background-color: transparent; - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} #workspaces button.active { - color: white; + background-color: transparent; + color: #D3D3D3; padding-left: 8px; padding-right: 8px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#workspaces button:hover { + background: rgba(0, 0, 0, 0.2); + color: #D3D3D3; + padding-left: 2px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + #workspaces button.urgent { background-color: #eb4d4b; } @@ -163,6 +167,7 @@ tooltip label{ background-color: rgba(50, 50, 50, 0.1); } +#custom-keyboard, #memory { color: #ebcb8b; } diff --git a/config/waybar/style/Chroma Glow.css b/config/waybar/style/Chroma Glow.css index 789b2675..90a2677a 100644 --- a/config/waybar/style/Chroma Glow.css +++ b/config/waybar/style/Chroma Glow.css @@ -72,6 +72,7 @@ tooltip label{ #workspaces button:hover { background: rgba(0, 0, 0, 0.2); + color: #D3D3D3; padding-left: 2px; padding-right: 2px; animation: gradient_f 20s ease-in infinite; @@ -193,6 +194,7 @@ label:focus { background-color: #000000; } +#custom-keyboard, #custom-menu{ color: yellow; /*padding: 3px;*/ diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 263906d7..f70bcea3 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -43,6 +43,7 @@ window#waybar { } #workspaces button:hover { + color: @color2; background-color: rgba(0,153,153,0); padding-left: 2px; padding-right: 2px; @@ -146,6 +147,8 @@ window#waybar { #disk { color: #94e2d5; } + +#custom-keyboard, #memory { color: #d3869b; } diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/Monochrome Contrast.css index 6dbb4732..33d85bff 100644 --- a/config/waybar/style/Monochrome Contrast.css +++ b/config/waybar/style/Monochrome Contrast.css @@ -40,7 +40,7 @@ tooltip label{ .modules-right { background-color: white; color: black; - border-bottom: 4px; + border-bottom: 2px; border-style: solid; border-color: black; border-radius: 10px; @@ -52,7 +52,7 @@ tooltip label{ .modules-center { background-color: white; color: black; - border-bottom: 4px; + border-bottom: 2px; border-style: solid; border-color: black; border-radius: 10px; @@ -64,7 +64,7 @@ tooltip label{ .modules-left { background-color: white; color: black; - border-bottom: 4px; + border-bottom: 2px; border-style: solid; border-color: black; border-radius: 10px; diff --git a/config/waybar/style/Monochrome Manifest.css b/config/waybar/style/Monochrome Manifest.css index 913dc8e3..073f7271 100644 --- a/config/waybar/style/Monochrome Manifest.css +++ b/config/waybar/style/Monochrome Manifest.css @@ -40,7 +40,7 @@ tooltip label{ .modules-right { background-color: black; color: white; - border-bottom: 3px; + border-bottom: 2px; border-style: solid; border-color: white; border-radius: 10px; @@ -52,7 +52,7 @@ tooltip label{ .modules-center { background-color: black; color: white; - border-bottom: 3px; + border-bottom: 2px; border-style: solid; border-color: white; border-radius: 10px; @@ -64,7 +64,7 @@ tooltip label{ .modules-left { background-color: black; color: white; - border-bottom: 3px; + border-bottom: 2px; border-style: solid; border-color: white; border-radius: 10px; @@ -85,7 +85,7 @@ tooltip label{ transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } #workspaces button:hover { - color: grey; + color: white; background-color: rgba(0,153,153,0.2); padding-left: 2px; padding-right: 2px; diff --git a/config/waybar/style/Pywal.css b/config/waybar/style/Pywal.css index a0ce5025..74e71a69 100644 --- a/config/waybar/style/Pywal.css +++ b/config/waybar/style/Pywal.css @@ -8,7 +8,7 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 94%; + font-size: 96%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/Translucent Chromatic.css index 3efc20d6..afe0c10e 100644 --- a/config/waybar/style/Translucent Chromatic.css +++ b/config/waybar/style/Translucent Chromatic.css @@ -76,7 +76,7 @@ tooltip label{ #workspaces button.active { background-color: transparent; - color: #D3D3D3; + color: @accent1; padding-left: 8px; padding-right: 8px; animation: gradient_f 20s ease-in infinite; @@ -85,6 +85,7 @@ tooltip label{ #workspaces button:hover { background: rgba(0, 0, 0, 0.2); + color: @accent3; padding-left: 2px; padding-right: 2px; animation: gradient_f 20s ease-in infinite; @@ -93,7 +94,7 @@ tooltip label{ #workspaces button.focused { background-color: #bbccdd; - color: #323232; + color: @accent2; /* box-shadow: inset 0 -3px #ffffff; */ } @@ -211,6 +212,7 @@ label:focus { /*padding: 3px;*/ } +#custom-keyboard, #cpu { color: @accent1; } @@ -278,6 +280,7 @@ label:focus { color: #ffa000; } +#keyboard-state, #temperature { color: @accent6; /* background-color: #f0932b; */ -- cgit v1.2.3 From 91515c96c89e22cc8411279a6263740f897ba6ca Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 13:01:17 +0900 Subject: reduce borders on some waybar styles --- config/waybar/style/Catppuccin-Latte.css | 2 +- config/waybar/style/Chroma Tally.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 45283f3e..1f12b545 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -17,7 +17,7 @@ window#waybar { transition-property: background-color; transition-duration: 0.5s; /*background: transparent;*/ - border-bottom: 3px solid @sapphire; + border-bottom: 2px solid @sapphire; background: @theme_base_color; border-radius: 10px; } diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index f70bcea3..3302a662 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -16,7 +16,7 @@ padding: 1px; window#waybar { background: rgba (0, 0, 0, 0.5); border-radius: 12px; - border-bottom: 3px; + border-bottom: 2px; border-style: solid; border-color: @color2; } -- cgit v1.2.3 From abb68d82a2a839438a3de19b377084ae9796bf42 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 14:29:10 +0900 Subject: updated initial boot and kb layout switch --- config/hypr/initial-boot.sh | 36 ++++++++++++++++++----------- config/hypr/scripts/SwitchKeyboardLayout.sh | 18 +++++++++++---- config/waybar/modules | 8 +++---- 3 files changed, 39 insertions(+), 23 deletions(-) (limited to 'config') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index cfadfcc4..797f49cb 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -1,11 +1,12 @@ #!/bin/bash -# A bash script designed to ran it only once dotfiles installed +# A bash script designed to run only once dotfiles installed # THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf -# not necessary to do since this script is only designed to ran only once as long as the marker exist +# not necessary to do since this script is only designed to run only once as long as the marker exists -# Set swww options +# Variables +scriptsDir=$HOME/.config/hypr/scripts wallpaper=$HOME/Pictures/wallpapers/anime-girl-abyss.png swww="swww img" @@ -14,18 +15,25 @@ effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type # Check if a marker file exists. if [ ! -f ~/.config/hypr/.initial_startup_done ]; then - # Initialize pywal - printf " Initializing pywal........\n\n" - wal -i $wallpaper + # Initialize pywal + printf " Initializing pywal........\n\n" + wal -i "$wallpaper" + + # Initial symlink for Pywal Dark and Light for Rofi Themes + ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" + + # Initial scripts to load in order to have a proper wallpaper waybar and pywal themes + pkill swww && swww init || swww query && $swww "$wallpaper" $effect + + # Refreshing waybar, dunst, rofi etc. + "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & + "$scriptsDir/Refresh.sh" > /dev/null 2>&1 & + + # initiate the kb_layout (for some reason) waybar cant launch it + "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 & - #initial symlink for Pywal Dark and Light for Rofi Themes - ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" - - # Initial scripts to load inorder to have a proper wallpaper waybar and pywal themes - swww query || swww init && $swww $wallpaper $effect - # Create a marker file to indicate that the script has been executed. touch ~/.config/hypr/.initial_startup_done -fi - + exit +fi diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index 40b212f0..e7c56b42 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -1,13 +1,21 @@ -#!/bin/bash +#!/usr/bin/env bash + +layout_f="$HOME/.cache/kb_layout" +settings_file="$HOME/.config/hypr/configs/Settings.conf" + +# Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found +if [ ! -f "$layout_f" ]; then + default_layout=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null) + if [ -z "$default_layout" ]; then + default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found + fi + echo "$default_layout" > "$layout_f" +fi -layout_f="/tmp/kb_layout" current_layout=$(cat "$layout_f") # Read keyboard layout settings from Settings.conf -settings_file="$HOME/.config/hypr/configs/Settings.conf" - if [ -f "$settings_file" ]; then - # Extract the value of kb_layout from Settings.conf kb_layout_line=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2) IFS=',' read -ra layout_mapping <<< "$kb_layout_line" fi diff --git a/config/waybar/modules b/config/waybar/modules index fa989045..5e90530b 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -459,11 +459,11 @@ }, "custom/keyboard": { - "exec": "cat /tmp/kb_layout", - "interval": 3, + "exec": "cat ~/.cache/kb_layout", + "interval": 1, "format": " {}", - "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", - "tooltip": false, + "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", + "tooltip": false, }, "custom/light_dark": { -- cgit v1.2.3 From bd5c91140d042bcd5f4342eeb3c7e97b6fb1c00a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 18:00:21 +0900 Subject: change persistent-workspace to newer name --- config/waybar/configs/Camellia [Bottom] | 2 +- config/waybar/configs/Camellia [TOP] | 2 +- config/waybar/modules | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/Camellia [Bottom] index 02118d38..a7b995c9 100644 --- a/config/waybar/configs/Camellia [Bottom] +++ b/config/waybar/configs/Camellia [Bottom] @@ -43,7 +43,7 @@ "on-click": "activate", "on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent_workspaces":{ + "persistent-workspaces":{ "1": [], "2": [], "3": [], diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP] index cb265b77..2aa21cb5 100644 --- a/config/waybar/configs/Camellia [TOP] +++ b/config/waybar/configs/Camellia [TOP] @@ -43,7 +43,7 @@ "on-click": "activate", "on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent_workspaces":{ + "persistent-workspaces":{ "1": [], "2": [], "3": [], diff --git a/config/waybar/modules b/config/waybar/modules index 5e90530b..7d08724e 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -11,7 +11,7 @@ "on-click": "activate", "on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent_workspaces": { + "persistent-workspaces": { "1": [], "2": [], "3": [], @@ -32,7 +32,7 @@ "on-click": "activate", "on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent_workspaces":{ + "persistent-workspaces":{ "1": [], "2": [], "3": [], @@ -62,7 +62,7 @@ "on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", "show-special": false, - "persistent_workspaces":{ + "persistent-workspaces":{ "1": [], "2": [], "3": [], @@ -81,7 +81,7 @@ "disable-scroll": true, "all-outputs": true, "format": "{icon}", - "persistent_workspaces": { + "persistent-workspaces": { "1": [], "2": [], "3": [], @@ -465,6 +465,7 @@ "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", "tooltip": false, }, + "custom/light_dark": { "format": "", -- cgit v1.2.3 From 651ab648e13a6f6bdc8183cb31eec55e1dff8ef2 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 7 Dec 2023 23:18:39 +0900 Subject: updated modules and Waybar Defaults configs --- config/waybar/configs/Def[Bottom]-Laptop | 2 +- config/waybar/configs/Def[TOP]-Laptop | 2 +- config/waybar/configs/Default [Bottom] | 2 +- config/waybar/configs/Default [TOP] | 2 +- config/waybar/modules | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop index d7b7d18a..47df83c0 100644 --- a/config/waybar/configs/Def[Bottom]-Laptop +++ b/config/waybar/configs/Def[Bottom]-Laptop @@ -1,6 +1,6 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT ### // +// ### DEFAULT Bottom - Laptop### // { "include": "~/.config/waybar/modules", "layer": "top", diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop index 8808e762..b322a75b 100644 --- a/config/waybar/configs/Def[TOP]-Laptop +++ b/config/waybar/configs/Def[TOP]-Laptop @@ -1,6 +1,6 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT ### // +// ### DEFAULT Top -Laptop ### // { "include": "~/.config/waybar/modules", "layer": "top", diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 1e1e5abf..35ff7f2d 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -1,6 +1,6 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT ### // +// ### DEFAULT Bottom ### // { "include": "~/.config/waybar/modules", "layer": "top", diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP] index acce267f..69e10467 100644 --- a/config/waybar/configs/Default [TOP] +++ b/config/waybar/configs/Default [TOP] @@ -1,6 +1,6 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT ### // +// ### DEFAULT - Top ### // { "include": "~/.config/waybar/modules", "layer": "top", diff --git a/config/waybar/modules b/config/waybar/modules index 7d08724e..093d1888 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -446,7 +446,7 @@ "custom/cycle_wall":{ "format":" ", "on-click": "~/.config/hypr/scripts/WallpaperSelect.sh", - "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh swww", + "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh", "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh", "tooltip": true, "tooltip-format": "Change wallpaper or style" @@ -471,7 +471,7 @@ "format": "", "on-click": "~/.config/hypr/scripts/DarkLight.sh", "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh", - "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh swww", + "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh", "tooltip": false, }, -- cgit v1.2.3