From 267bb6e6832669b5dc9e98a92018f5b5c0351e49 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 3 Sep 2024 15:08:58 +0900 Subject: [PATCH 01/10] small bump to v2.3.4-5 --- config/hypr/{v2.3.4 => v2.3.4-5} | 0 config/waybar/configs/[TOP] Everforest | 1 + 2 files changed, 1 insertion(+) rename config/hypr/{v2.3.4 => v2.3.4-5} (100%) diff --git a/config/hypr/v2.3.4 b/config/hypr/v2.3.4-5 similarity index 100% rename from config/hypr/v2.3.4 rename to config/hypr/v2.3.4-5 diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest index 7ad9c1754..326764cb6 100644 --- a/config/waybar/configs/[TOP] Everforest +++ b/config/waybar/configs/[TOP] Everforest @@ -24,6 +24,7 @@ // "mpris", "custom/swaync", "tray", + "mpris", ], "modules-center": [ "clock#forest", From db5a5334836ffeae1227d9d2b8d1266461143375 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 3 Sep 2024 23:38:43 +0900 Subject: [PATCH 02/10] minor waybar tweak --- config/hypr/{v2.3.4-5 => v2.3.5-D} | 0 config/waybar/modules | 1 + 2 files changed, 1 insertion(+) rename config/hypr/{v2.3.4-5 => v2.3.5-D} (100%) diff --git a/config/hypr/v2.3.4-5 b/config/hypr/v2.3.5-D similarity index 100% rename from config/hypr/v2.3.4-5 rename to config/hypr/v2.3.5-D diff --git a/config/waybar/modules b/config/waybar/modules index 1363800cc..dbea9dd60 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -194,6 +194,7 @@ "title<.*reddit.*>": " ", "title<.*Picture-in-Picture.*>": " ", "class": " ", + "class": " ", "class": " ", "class": " ", "class": " ", From 631caa2dd7a1a113996ff46c9a274021d44052f3 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 5 Sep 2024 22:35:04 +0900 Subject: [PATCH 03/10] minor tweak hyprland#workspace-rw --- config/waybar/modules | 1 + 1 file changed, 1 insertion(+) diff --git a/config/waybar/modules b/config/waybar/modules index dbea9dd60..15cc42cc9 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -203,6 +203,7 @@ "class<[Ss]potify>": "", "class": "󰨞", "class": "󰝰 ", + "class<[Tt]hunderbird>": " ", "class": " ", "class": " ", "class": "󰅳 ", From ba5783f04d4f6cfe8289812e4cbb58669ea171dd Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 8 Sep 2024 09:41:45 +0900 Subject: [PATCH 04/10] updated --- config/waybar/configs/[TOP] Minimal - Long | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long index 143f22d44..5e2e5425a 100644 --- a/config/waybar/configs/[TOP] Minimal - Long +++ b/config/waybar/configs/[TOP] Minimal - Long @@ -30,7 +30,7 @@ "idle_inhibitor", ], "modules-right": [ - "group/motherboard", + "group/mobo_drawer", "custom/separator#blank_2", "group/laptop", "custom/separator#blank_2", From 21adf9eb149e06b68e59fc60f8d29bbdb6eb1cc5 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 8 Sep 2024 14:55:12 +0900 Subject: [PATCH 05/10] just color tweak --- copy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copy.sh b/copy.sh index 97201bb83..fe560b2f7 100755 --- a/copy.sh +++ b/copy.sh @@ -25,7 +25,7 @@ printf "\n%.0s" {1..2} OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" -WARN="$(tput setaf 166)[WARN]$(tput sgr0)" +WARN="$(tput setaf 5)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" ORANGE=$(tput setaf 166) YELLOW=$(tput setaf 3) From d87402e36b299c59d0f098ede06a6478eca19a20 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:23:09 +0900 Subject: [PATCH 06/10] Update style.css --- config/wlogout/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/wlogout/style.css b/config/wlogout/style.css index 362c2f3f4..da8efcc59 100644 --- a/config/wlogout/style.css +++ b/config/wlogout/style.css @@ -1,7 +1,7 @@ /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ /* wallust-wlogout */ -/* Importing pywal colors */ +/* Importing wallust colors */ @import '../../.config/waybar/wallust/colors-waybar.css'; From dc862efc66b72462975f873c8f79ef34462e4c4c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 9 Sep 2024 19:27:29 +0900 Subject: [PATCH 07/10] a fix as per issues $422 --- config/hypr/scripts/SwitchKeyboardLayout.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index 9ef71f646..7ff1c7c63 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -61,7 +61,8 @@ change_layout() { while read -r name; do echo "Switching layout for $name to $new_layout..." - hyprctl switchxkblayout "$name" "$new_layout" + #hyprctl switchxkblayout "$name" "$new_layout" + hyprctl switchxkblayout "$name" next if [[ $? -eq 0 ]]; then echo "Switched the layout for $name." else From e82037dde2049493a95e6039f2dd8b528613f050 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 9 Sep 2024 22:41:10 +0900 Subject: [PATCH 08/10] added keep aspect ration for PIP window rule --- config/hypr/UserConfigs/WindowRules.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index cb660df62..869162da7 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -122,6 +122,9 @@ windowrulev2 = size 60% 70%, title:^(ROG Control)$ windowrulev2 = pin,title:^(Picture-in-Picture)$ #windowrulev2 = pin,title:^(Firefox)$ +# windowrule v2 - extras +windowrulev2 = keepaspectratio, title:^(Picture-in-Picture)$ + #windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1 #windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1 #windowrulev2 = opacity 0.8 0.8, pinned:1 From 0bdcafacd91669bf20833848ecc0ceb9f87305a4 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 9 Sep 2024 22:47:44 +0900 Subject: [PATCH 09/10] updated switch keyboard layout added with ignore --- config/hypr/scripts/SwitchKeyboardLayout.sh | 94 ++++++++++++--------- 1 file changed, 53 insertions(+), 41 deletions(-) diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index 7ff1c7c63..76c065746 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -2,32 +2,37 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # This is for changing kb_layouts. Set kb_layouts in $settings_file -layout_f="$HOME/.cache/kb_layout" +layout_file="$HOME/.cache/kb_layout" settings_file="$HOME/.config/hypr/UserConfigs/UserSettings.conf" -notif="$HOME/.config/swaync/images/bell.png" - -echo "Starting script..." - -# Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found -if [ ! -f "$layout_f" ]; then - echo "Creating layout file as it does not exist..." - 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" +notif_icon="$HOME/.config/swaync/images/bell.png" + +# Refined ignore list with patterns or specific device names +ignore_patterns=( + "--(avrcp)" + "Bluetooth Speaker" + "Other Device + Name" + ) + + +# Create layout file with default layout if it does not exist +if [ ! -f "$layout_file" ]; then + echo "Creating layout file..." + default_layout=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2 | tr -d '[:space:]' | cut -d ',' -f 1 2>/dev/null) + default_layout=${default_layout:-"us"} # Default to 'us' layout + echo "$default_layout" > "$layout_file" echo "Default layout set to $default_layout" fi -current_layout=$(cat "$layout_f") +current_layout=$(cat "$layout_file") echo "Current layout: $current_layout" -# Read keyboard layout settings from Settings.conf +# Read available layouts from settings file if [ -f "$settings_file" ]; then - echo "Reading keyboard layout settings from $settings_file..." kb_layout_line=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2) - IFS=',' read -ra layout_mapping <<< "$kb_layout_line" - echo "Available layouts: ${layout_mapping[@]}" + # Remove leading and trailing spaces around each layout + kb_layout_line=$(echo "$kb_layout_line" | tr -d '[:space:]') + IFS=',' read -r -a layout_mapping <<< "$kb_layout_line" else echo "Settings file not found!" exit 1 @@ -36,57 +41,64 @@ fi layout_count=${#layout_mapping[@]} echo "Number of layouts: $layout_count" -# Find the index of the current layout in the mapping +# Find current layout index and calculate next layout for ((i = 0; i < layout_count; i++)); do if [ "$current_layout" == "${layout_mapping[i]}" ]; then current_index=$i - echo "Current layout index: $current_index" break fi done -# Calculate the index of the next layout next_index=$(( (current_index + 1) % layout_count )) new_layout="${layout_mapping[next_index]}" echo "Next layout: $new_layout" -# Created by T-Crypt - +# Function to get keyboard names get_keyboard_names() { hyprctl devices -j | jq -r '.keyboards[].name' } +# Function to check if a device matches any ignore pattern +is_ignored() { + local device_name=$1 + for pattern in "${ignore_patterns[@]}"; do + if [[ "$device_name" == *"$pattern"* ]]; then + return 0 # Device matches ignore pattern + fi + done + return 1 # Device does not match any ignore pattern +} + +# Function to change keyboard layout change_layout() { - local got_error=false + local error_found=false while read -r name; do + if is_ignored "$name"; then + echo "Skipping ignored device: $name" + continue + fi + echo "Switching layout for $name to $new_layout..." - #hyprctl switchxkblayout "$name" "$new_layout" hyprctl switchxkblayout "$name" next - if [[ $? -eq 0 ]]; then - echo "Switched the layout for $name." - else - >&2 echo "Error while switching the layout for $name." - got_error=true + if [ $? -ne 0 ]; then + echo "Error while switching layout for $name." >&2 + error_found=true fi done <<< "$(get_keyboard_names)" - if [ "$got_error" = true ]; then - >&2 echo "Some errors were found during the process..." - return 1 - fi - - return 0 # All layouts had been cycled successfully + $error_found && return 1 + return 0 } +# Execute layout change and notify if ! change_layout; then - notify-send -u low -t 2000 'Keyboard layout' 'Error: Layout change failed' - >&2 echo "Layout change failed." + notify-send -u low -t 2000 'kb_layout' 'Error: Layout change failed' + echo "Layout change failed." >&2 exit 1 else - # Notification for the new keyboard layout - notify-send -u low -i "$notif" "new KB_Layout: $new_layout" + notify-send -u low -i "$notif_icon" "New kb_layout: $new_layout" echo "Layout change notification sent." fi -echo "$new_layout" > "$layout_f" +echo "$new_layout" > "$layout_file" From aafa6f108ed6b93aa4fdcae2e98ef3b2c96419b6 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 9 Sep 2024 22:49:49 +0900 Subject: [PATCH 10/10] updated / prepare for next release --- config/hypr/{v2.3.5-D => v2.3.5} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/hypr/{v2.3.5-D => v2.3.5} (100%) diff --git a/config/hypr/v2.3.5-D b/config/hypr/v2.3.5 similarity index 100% rename from config/hypr/v2.3.5-D rename to config/hypr/v2.3.5