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/waybar/modules | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'config/waybar/modules') 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", -- 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/waybar/modules') 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/waybar/modules') 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/waybar/modules') 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