From c6378dfa61981eaeecf73acc044a5ef54b764d4b Mon Sep 17 00:00:00 2001 From: Kiran George Date: Sun, 5 May 2024 12:37:30 +0530 Subject: [PATCH 1/5] Ignoring dropterm in ags overview --- config/ags/modules/overview/overview_hyprland.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ags/modules/overview/overview_hyprland.js b/config/ags/modules/overview/overview_hyprland.js index 7a5b55c..034d6c8 100644 --- a/config/ags/modules/overview/overview_hyprland.js +++ b/config/ags/modules/overview/overview_hyprland.js @@ -52,7 +52,7 @@ export default () => { const Window = ({ address, at: [x, y], size: [w, h], workspace: { id, name }, class: c, title, xwayland }, screenCoords) => { const revealInfoCondition = (Math.min(w, h) * userOptions.overview.scale > 70); - if (w <= 0 || h <= 0 || (c === '' && title === '')) return null; + if (w <= 0 || h <= 0 || (c === '' && title === '') || c.endsWith('-dropterm')) return null; // Non-primary monitors if (screenCoords.x != 0) x -= screenCoords.x; if (screenCoords.y != 0) y -= screenCoords.y; From aafbbcc8c767329404dcc679c727e0b3435ce598 Mon Sep 17 00:00:00 2001 From: Kiran George Date: Sun, 5 May 2024 14:12:10 +0530 Subject: [PATCH 2/5] Close Rofi if running when ags overview is launched --- config/hypr/configs/Keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 1cc8e2a..0afbf4f 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -30,7 +30,7 @@ bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwi bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel bind = SHIFT, ALT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout -bind = $mainMod, A, exec, ags -t 'overview' +bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' # FEATURES / EXTRAS (UserScripts) bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings From e1a22b19efdf542480868f1c250f11ace3a275c1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 May 2024 16:45:26 +0900 Subject: [PATCH 3/5] Style change of ags which should work well with Dark / Light switcher. Keybinds moved to UserConfigs --- config/ags/user/style.css | 47 +++++++++++++---------- config/hypr/UserConfigs/UserKeybinds.conf | 1 + config/hypr/configs/Keybinds.conf | 1 - config/hypr/scripts/DarkLight.sh | 10 +++++ 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/config/ags/user/style.css b/config/ags/user/style.css index b149668..aa7e4e3 100644 --- a/config/ags/user/style.css +++ b/config/ags/user/style.css @@ -5,6 +5,11 @@ @import '../../../.cache/wal/colors-waybar.css'; /* @import '../../../.cache/wal/colors-waybar-rgba.css'; */ +/* define some colors */ +@define-color border-color @color2; +@define-color border-color-alt @color7; +@define-color noti-bg rgba(0, 0, 0, 0.8); +@define-color noti-bg-alt #111111; widget { border-radius: 0.818rem; @@ -19,24 +24,24 @@ widget { transition: 300ms cubic-bezier(0, 0.55, 0.45, 1); border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid @color7; - border-left: 1px solid @color7; - border-right: 1px solid @color7; - border-bottom: 1px solid @color7; + border-top: 1px solid @border-color; + border-left: 1px solid @border-color-alt; + border-right: 1px solid @border-color-alt; + border-bottom: 1px solid @border-color; /* box-shadow: 0px 2px 3px alpha(@color0, 0.45); */ margin: 0.476rem; min-width: 13.636rem; min-height: 3.409rem; padding: 0rem 1.364rem; padding-right: 2.864rem; - background-color: alpha(@color0, 0.5); - color: alpha(@color7, 0.9); + background-color: @noti-bg; + color: @color2a; caret-color: transparent; font-weight: bold; } .overview-search-box selection { - background-color: #DEBCDF; - color: #402843; + background-color: @noti-bg; + color: @color2; } .overview-search-box-extended { @@ -45,7 +50,7 @@ widget { } .overview-search-prompt { - color: alpha(@color7, 0.9); + color: @color2; } .overview-search-icon { @@ -65,16 +70,16 @@ widget { .overview-search-results { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid @color7; - border-left: 1px solid @color7; - border-right: 1px solid @color7; - border-bottom: 1px solid @color7; + border-top: 1px solid @border-color; + border-left: 1px solid @border-color-alt; + border-right: 1px solid @border-color-alt; + border-bottom: 1px solid @border-color; box-shadow: 0px 2px 3px @color9; margin: 0.476rem; min-width: 28.773rem; padding: 0.682rem; - background-color: alpha(@color2, 0.5); - color: alpha(@color7, 1.5); +background-color: @noti-bg; + color: @color2; font-weight: bold; } @@ -106,22 +111,22 @@ widget { .overview-search-result-btn:hover, .overview-search-result-btn:focus { - background-color: alpha(@color7, 0.4); + background-color: alpha(@color7, 0.9); color: alpha(@color0, 0.7); } .overview-search-result-btn:active { - background-color: alpha(@color7, 0.4); + background-color: alpha(@color7, 0.9); color: @color4; } .overview-tasks { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid @color7; - border-left: 1px solid @color7; - border-right: 1px solid @color7; - border-bottom: 1px solid @color7; + border-top: 1px solid @border-color; + border-left: 1px solid @border-color-alt; + border-right: 1px solid @border-color-alt; + border-bottom: 1px solid @border-color; box-shadow: 0px 2px 3px @color5; margin: 0.476rem; padding: 0.341rem; diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index 7ffd702..6dc461a 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -14,6 +14,7 @@ $UserScripts = $HOME/.config/hypr/UserScripts # rofi App launcher #bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window +bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' bind = $mainMod, Return, exec, $term # Launch terminal bind = $mainMod, T, exec, $files diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 0afbf4f..1946cc2 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -30,7 +30,6 @@ bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwi bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel bind = SHIFT, ALT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout -bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' # FEATURES / EXTRAS (UserScripts) bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 6c9f610..6d6c57c 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -9,6 +9,7 @@ dark_wallpapers="$wallpaper_base_path/Dark" light_wallpapers="$wallpaper_base_path/Light" hypr_config_path="$HOME/.config/hypr" swaync_style="$HOME/.config/swaync/style.css" +ags_style="$HOME/.config/ags/user/style.css" SCRIPTSDIR="$HOME/.config/hypr/scripts" notif="$HOME/.config/swaync/images/bell.png" dark_rofi_pywal="$HOME/.cache/wal/colors-rofi-dark.rasi" @@ -74,6 +75,15 @@ else sed -i '/@define-color noti-bg-alt/s/#.*;/#F0F0F0;/' "${swaync_style}" fi +# ags color change +if [ "$next_mode" = "Dark" ]; then + sed -i '/@define-color noti-bg/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(0, 0, 0, 0.8);/' "${ags_style}" + sed -i '/@define-color noti-bg-alt/s/#.*;/#111111;/' "${ags_style}" +else + sed -i '/@define-color noti-bg/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(255, 255, 255, 0.9);/' "${ags_style}" + sed -i '/@define-color noti-bg-alt/s/#.*;/#F0F0F0;/' "${ags_style}" +fi + # Set Dynamic Wallpaper for Dark or Light Mode if [ "$next_mode" = "Dark" ]; then next_wallpaper="$(find "${dark_wallpapers}" -type f \( -iname "*.jpg" -o -iname "*.png" \) -print0 | shuf -n1 -z | xargs -0)" From 513b3ebbac5d8ccb1ea207b56d6a3a61d45061aa Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 May 2024 17:03:47 +0900 Subject: [PATCH 4/5] woops messed up something... --- config/ags/user/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/ags/user/style.css b/config/ags/user/style.css index aa7e4e3..142c8a6 100644 --- a/config/ags/user/style.css +++ b/config/ags/user/style.css @@ -35,9 +35,9 @@ widget { padding: 0rem 1.364rem; padding-right: 2.864rem; background-color: @noti-bg; - color: @color2a; + color: @color2; caret-color: transparent; - font-weight: bold; + font-weight: bolder; } .overview-search-box selection { background-color: @noti-bg; @@ -78,7 +78,7 @@ widget { margin: 0.476rem; min-width: 28.773rem; padding: 0.682rem; -background-color: @noti-bg; + background-color: @noti-bg; color: @color2; font-weight: bold; } From 59daca892dcbe48f87a28e06fdca337a5598f7fe Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 6 May 2024 17:07:39 +0900 Subject: [PATCH 5/5] Ok will stop here now I promise :) --- config/ags/user/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/ags/user/style.css b/config/ags/user/style.css index 142c8a6..ff6b8a5 100644 --- a/config/ags/user/style.css +++ b/config/ags/user/style.css @@ -41,7 +41,7 @@ widget { } .overview-search-box selection { background-color: @noti-bg; - color: @color2; + color: @border-color; } .overview-search-box-extended { @@ -79,7 +79,7 @@ widget { min-width: 28.773rem; padding: 0.682rem; background-color: @noti-bg; - color: @color2; + color: @border-color; font-weight: bold; } @@ -131,7 +131,7 @@ widget { margin: 0.476rem; padding: 0.341rem; /* background-color: rgba(49, 50, 68, 0.8); */ - background-color: alpha(@color0, 0.6); + background-color: @noti-bg; color: #EBDFED; }