From b6c2fd3f18419be9fb456c0a9df612cff08c3d0c Mon Sep 17 00:00:00 2001 From: VietNguyenx <101798660+VietNguyenVN@users.noreply.github.com> Date: Sat, 21 Feb 2026 11:36:24 +0700 Subject: [PATCH 1/4] Remove unnecessary [hidden] comment for zoom keybinds keybinds.conf --- dots/.config/hypr/hyprland/keybinds.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dots/.config/hypr/hyprland/keybinds.conf b/dots/.config/hypr/hyprland/keybinds.conf index 8afb00457..c4454db16 100644 --- a/dots/.config/hypr/hyprland/keybinds.conf +++ b/dots/.config/hypr/hyprland/keybinds.conf @@ -230,8 +230,8 @@ bindd = Ctrl+Shift+Alt+Super, Delete, Shutdown, exec, systemctl poweroff || logi ##! Screen # Zoom -binde = Super, Minus, exec, ~/.config/hypr/hyprland/scripts/zoom.sh decrease 0.3 # [hidden] Zoom out -binde = Super, Equal, exec, ~/.config/hypr/hyprland/scripts/zoom.sh increase 0.3 # [hidden] Zoom in +binde = Super, Minus, exec, ~/.config/hypr/hyprland/scripts/zoom.sh decrease 0.3 # Zoom out +binde = Super, Equal, exec, ~/.config/hypr/hyprland/scripts/zoom.sh increase 0.3 # Zoom in # Zoom with keypad binde = Super, code:82, exec, qs -c $qsConfig ipc call zoom zoomOut # [hidden] Zoom out binde = Super, code:86, exec, qs -c $qsConfig ipc call zoom zoomIn # [hidden] Zoom in From c5e0c2d3dc7579de74e5e92a4d75df7cd1d428d2 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 21 Feb 2026 20:38:34 +0100 Subject: [PATCH 2/4] gtk theme: improve readability --- .../.config/matugen/templates/gtk-3.0/gtk.css | 16 +++++----- .../.config/matugen/templates/gtk-4.0/gtk.css | 32 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dots/.config/matugen/templates/gtk-3.0/gtk.css b/dots/.config/matugen/templates/gtk-3.0/gtk.css index c0054f864..1b5e6e7fe 100644 --- a/dots/.config/matugen/templates/gtk-3.0/gtk.css +++ b/dots/.config/matugen/templates/gtk-3.0/gtk.css @@ -8,15 +8,15 @@ @define-color accent_bg_color {{colors.primary.default.hex}}; @define-color window_bg_color {{colors.background.default.hex}}; @define-color window_fg_color {{colors.on_background.default.hex}}; -@define-color headerbar_bg_color {{colors.surface_dim.default.hex}}; +@define-color headerbar_bg_color {{colors.surface_container.default.hex}}; @define-color headerbar_fg_color {{colors.on_surface.default.hex}}; -@define-color popover_bg_color {{colors.surface_dim.default.hex}}; +@define-color popover_bg_color {{colors.surface_container_highest.default.hex}}; @define-color popover_fg_color {{colors.on_surface.default.hex}}; -@define-color view_bg_color {{colors.surface.default.hex}}; +@define-color view_bg_color {{colors.surface_container.default.hex}}; @define-color view_fg_color {{colors.on_surface.default.hex}}; -@define-color card_bg_color {{colors.surface.default.hex}}; +@define-color card_bg_color {{colors.surface_container.default.hex}}; @define-color card_fg_color {{colors.on_surface.default.hex}}; -@define-color sidebar_bg_color @window_bg_color; -@define-color sidebar_fg_color @window_fg_color; -@define-color sidebar_border_color @window_bg_color; -@define-color sidebar_backdrop_color @window_bg_color; +@define-color sidebar_bg_color {{colors.surface_container_lowest.default.hex}}; +@define-color sidebar_fg_color {{colors.on_surface.default.hex}}; +@define-color sidebar_border_color @sidebar_bg_color; +@define-color sidebar_backdrop_color @sidebar_bg_color; diff --git a/dots/.config/matugen/templates/gtk-4.0/gtk.css b/dots/.config/matugen/templates/gtk-4.0/gtk.css index 80b1d6975..de8ba1e19 100644 --- a/dots/.config/matugen/templates/gtk-4.0/gtk.css +++ b/dots/.config/matugen/templates/gtk-4.0/gtk.css @@ -9,18 +9,18 @@ @define-color accent_bg_color {{colors.primary.light.hex}}; @define-color window_bg_color {{colors.background.light.hex}}; @define-color window_fg_color {{colors.on_background.light.hex}}; - @define-color headerbar_bg_color {{colors.surface_dim.light.hex}}; + @define-color headerbar_bg_color {{colors.surface_container.light.hex}}; @define-color headerbar_fg_color {{colors.on_surface.light.hex}}; - @define-color popover_bg_color {{colors.surface_dim.light.hex}}; + @define-color popover_bg_color {{colors.surface_container_highest.light.hex}}; @define-color popover_fg_color {{colors.on_surface.light.hex}}; - @define-color view_bg_color {{colors.surface.light.hex}}; + @define-color view_bg_color {{colors.surface_container_lowest.light.hex}}; @define-color view_fg_color {{colors.on_surface.light.hex}}; - @define-color card_bg_color {{colors.surface.light.hex}}; + @define-color card_bg_color {{colors.surface_container.light.hex}}; @define-color card_fg_color {{colors.on_surface.light.hex}}; - @define-color sidebar_bg_color @window_bg_color; - @define-color sidebar_fg_color @window_fg_color; - @define-color sidebar_border_color @window_bg_color; - @define-color sidebar_backdrop_color @window_bg_color; + @define-color sidebar_bg_color {{colors.surface_container.light.hex}}; + @define-color sidebar_fg_color {{colors.on_surface.light.hex}}; + @define-color sidebar_border_color @sidebar_bg_color; + @define-color sidebar_backdrop_color @sidebar_bg_color; } @media (prefers-color-scheme: dark) { @@ -29,16 +29,16 @@ @define-color accent_bg_color {{colors.primary.dark.hex}}; @define-color window_bg_color {{colors.background.dark.hex}}; @define-color window_fg_color {{colors.on_background.dark.hex}}; - @define-color headerbar_bg_color {{colors.surface_dim.dark.hex}}; + @define-color headerbar_bg_color {{colors.surface_container.dark.hex}}; @define-color headerbar_fg_color {{colors.on_surface.dark.hex}}; - @define-color popover_bg_color {{colors.surface_dim.dark.hex}}; + @define-color popover_bg_color {{colors.surface_container_highest.dark.hex}}; @define-color popover_fg_color {{colors.on_surface.dark.hex}}; - @define-color view_bg_color {{colors.surface.dark.hex}}; + @define-color view_bg_color {{colors.surface_container_lowest.dark.hex}}; @define-color view_fg_color {{colors.on_surface.dark.hex}}; - @define-color card_bg_color {{colors.surface.dark.hex}}; + @define-color card_bg_color {{colors.surface_container.dark.hex}}; @define-color card_fg_color {{colors.on_surface.dark.hex}}; - @define-color sidebar_bg_color @window_bg_color; - @define-color sidebar_fg_color @window_fg_color; - @define-color sidebar_border_color @window_bg_color; - @define-color sidebar_backdrop_color @window_bg_color; + @define-color sidebar_bg_color {{colors.surface_container.dark.hex}}; + @define-color sidebar_fg_color {{colors.on_surface.dark.hex}}; + @define-color sidebar_border_color @sidebar_bg_color; + @define-color sidebar_backdrop_color @sidebar_bg_color; } From e72d39fecb28201c97e96dc6ce64dcd6caa7da86 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 21 Feb 2026 21:48:54 +0100 Subject: [PATCH 3/4] gtk theme: m3-ize more colors, fix distracting inactive fade --- .../.config/matugen/templates/gtk-3.0/gtk.css | 30 +++++++--- .../.config/matugen/templates/gtk-4.0/gtk.css | 59 +++++++++++++++---- 2 files changed, 72 insertions(+), 17 deletions(-) diff --git a/dots/.config/matugen/templates/gtk-3.0/gtk.css b/dots/.config/matugen/templates/gtk-3.0/gtk.css index 1b5e6e7fe..0d8cb9cbe 100644 --- a/dots/.config/matugen/templates/gtk-3.0/gtk.css +++ b/dots/.config/matugen/templates/gtk-3.0/gtk.css @@ -1,22 +1,38 @@ /* -* GTK Colors -* Generated with Matugen +* GTK colors generated with Matugen +* The source template is here: ~/.config/matugen/templates/gtk-3.0/gtk.css */ +/* Accents */ @define-color accent_color {{colors.primary.default.hex}}; @define-color accent_fg_color {{colors.on_primary.default.hex}}; @define-color accent_bg_color {{colors.primary.default.hex}}; +@define-color destructive_bg_color {{colors.error_container.default.hex}}; +@define-color destructive_fg_color {{colors.on_error_container.default.hex}}; +@define-color destructive_color {{colors.error.default.hex}}; +@define-color success_bg_color #374B3E; +@define-color success_fg_color #D1E9D6; +@define-color success_color #B5CCBA; +/* Base surfaces */ @define-color window_bg_color {{colors.background.default.hex}}; @define-color window_fg_color {{colors.on_background.default.hex}}; @define-color headerbar_bg_color {{colors.surface_container.default.hex}}; +@define-color headerbar_backdrop_color {{colors.surface_container.default.hex}}; @define-color headerbar_fg_color {{colors.on_surface.default.hex}}; -@define-color popover_bg_color {{colors.surface_container_highest.default.hex}}; -@define-color popover_fg_color {{colors.on_surface.default.hex}}; -@define-color view_bg_color {{colors.surface_container.default.hex}}; -@define-color view_fg_color {{colors.on_surface.default.hex}}; @define-color card_bg_color {{colors.surface_container.default.hex}}; @define-color card_fg_color {{colors.on_surface.default.hex}}; -@define-color sidebar_bg_color {{colors.surface_container_lowest.default.hex}}; +@define-color sidebar_bg_color {{colors.surface_container.default.hex}}; @define-color sidebar_fg_color {{colors.on_surface.default.hex}}; +@define-color secondary_sidebar_bg_color {{colors.surface_container_low.default.hex}}; +@define-color secondary_sidebar_fg_color {{colors.on_surface.default.hex}}; @define-color sidebar_border_color @sidebar_bg_color; @define-color sidebar_backdrop_color @sidebar_bg_color; +@define-color view_bg_color {{colors.surface_container_lowest.default.hex}}; +@define-color view_fg_color {{colors.on_surface.default.hex}}; +@define-color overview_bg_color {{colors.surface_container_lowest.default.hex}}; +@define-color overview_fg_color {{colors.on_surface.default.hex}}; +/* Popups */ +@define-color popover_bg_color {{colors.surface_container_highest.default.hex}}; +@define-color popover_fg_color {{colors.on_surface.default.hex}}; +@define-color dialog_bg_color {{colors.surface_container_high.default.hex}}; +@define-color dialog_fg_color {{colors.on_surface.default.hex}}; diff --git a/dots/.config/matugen/templates/gtk-4.0/gtk.css b/dots/.config/matugen/templates/gtk-4.0/gtk.css index de8ba1e19..07c8099f5 100644 --- a/dots/.config/matugen/templates/gtk-4.0/gtk.css +++ b/dots/.config/matugen/templates/gtk-4.0/gtk.css @@ -1,44 +1,83 @@ /* -* GTK Colors -* Generated with Matugen +* GTK colors generated with Matugen +* The source template is here: ~/.config/matugen/templates/gtk-4.0/gtk.css */ @media (prefers-color-scheme: light) { + /* Accents */ @define-color accent_color {{colors.primary.light.hex}}; @define-color accent_fg_color {{colors.on_primary.light.hex}}; @define-color accent_bg_color {{colors.primary.light.hex}}; + @define-color destructive_bg_color {{colors.error_container.light.hex}}; + @define-color destructive_fg_color {{colors.on_error_container.light.hex}}; + @define-color destructive_color {{colors.error.light.hex}}; + @define-color success_bg_color #B5CCBA; + @define-color success_fg_color #213528; + @define-color success_color #374B3E; + /* Base surfaces */ @define-color window_bg_color {{colors.background.light.hex}}; @define-color window_fg_color {{colors.on_background.light.hex}}; @define-color headerbar_bg_color {{colors.surface_container.light.hex}}; + @define-color headerbar_backdrop_color {{colors.surface_container.light.hex}}; @define-color headerbar_fg_color {{colors.on_surface.light.hex}}; - @define-color popover_bg_color {{colors.surface_container_highest.light.hex}}; - @define-color popover_fg_color {{colors.on_surface.light.hex}}; - @define-color view_bg_color {{colors.surface_container_lowest.light.hex}}; - @define-color view_fg_color {{colors.on_surface.light.hex}}; @define-color card_bg_color {{colors.surface_container.light.hex}}; @define-color card_fg_color {{colors.on_surface.light.hex}}; @define-color sidebar_bg_color {{colors.surface_container.light.hex}}; @define-color sidebar_fg_color {{colors.on_surface.light.hex}}; + @define-color secondary_sidebar_bg_color {{colors.surface_container_low.light.hex}}; + @define-color secondary_sidebar_backdrop_color {{colors.surface_container_low.light.hex}}; + @define-color secondary_sidebar_fg_color {{colors.on_surface.light.hex}}; @define-color sidebar_border_color @sidebar_bg_color; @define-color sidebar_backdrop_color @sidebar_bg_color; + @define-color view_bg_color {{colors.surface_container_lowest.light.hex}}; + @define-color view_fg_color {{colors.on_surface.light.hex}}; + @define-color overview_bg_color {{colors.surface_container_lowest.light.hex}}; + @define-color overview_fg_color {{colors.on_surface.light.hex}}; + /* Popups */ + @define-color popover_bg_color {{colors.surface_container_highest.light.hex}}; + @define-color popover_fg_color {{colors.on_surface.light.hex}}; + @define-color dialog_bg_color {{colors.surface_container_high.light.hex}}; + @define-color dialog_fg_color {{colors.on_surface.light.hex}}; + @define-color thumbnail_bg_color {{colors.surface_container_high.light.hex}}; + @define-color thumbnail_fg_color {{colors.on_surface.light.hex}}; } @media (prefers-color-scheme: dark) { + + /* Accents */ @define-color accent_color {{colors.primary.dark.hex}}; @define-color accent_fg_color {{colors.on_primary.dark.hex}}; @define-color accent_bg_color {{colors.primary.dark.hex}}; + @define-color destructive_bg_color {{colors.error_container.dark.hex}}; + @define-color destructive_fg_color {{colors.on_error_container.dark.hex}}; + @define-color destructive_color {{colors.error.dark.hex}}; + @define-color success_bg_color #374B3E; + @define-color success_fg_color #D1E9D6; + @define-color success_color #B5CCBA; + /* Base surfaces */ @define-color window_bg_color {{colors.background.dark.hex}}; @define-color window_fg_color {{colors.on_background.dark.hex}}; @define-color headerbar_bg_color {{colors.surface_container.dark.hex}}; + @define-color headerbar_backdrop_color {{colors.surface_container.dark.hex}}; @define-color headerbar_fg_color {{colors.on_surface.dark.hex}}; - @define-color popover_bg_color {{colors.surface_container_highest.dark.hex}}; - @define-color popover_fg_color {{colors.on_surface.dark.hex}}; - @define-color view_bg_color {{colors.surface_container_lowest.dark.hex}}; - @define-color view_fg_color {{colors.on_surface.dark.hex}}; @define-color card_bg_color {{colors.surface_container.dark.hex}}; @define-color card_fg_color {{colors.on_surface.dark.hex}}; @define-color sidebar_bg_color {{colors.surface_container.dark.hex}}; @define-color sidebar_fg_color {{colors.on_surface.dark.hex}}; + @define-color secondary_sidebar_bg_color {{colors.surface_container_low.dark.hex}}; + @define-color secondary_sidebar_backdrop_color {{colors.surface_container_low.dark.hex}}; + @define-color secondary_sidebar_fg_color {{colors.on_surface.dark.hex}}; @define-color sidebar_border_color @sidebar_bg_color; @define-color sidebar_backdrop_color @sidebar_bg_color; + @define-color view_bg_color {{colors.surface_container_lowest.dark.hex}}; + @define-color view_fg_color {{colors.on_surface.dark.hex}}; + @define-color overview_bg_color {{colors.surface_container_lowest.dark.hex}}; + @define-color overview_fg_color {{colors.on_surface.dark.hex}}; + /* Popups */ + @define-color popover_bg_color {{colors.surface_container_highest.dark.hex}}; + @define-color popover_fg_color {{colors.on_surface.dark.hex}}; + @define-color dialog_bg_color {{colors.surface_container_high.dark.hex}}; + @define-color dialog_fg_color {{colors.on_surface.dark.hex}}; + @define-color thumbnail_bg_color {{colors.surface_container_high.dark.hex}}; + @define-color thumbnail_fg_color {{colors.on_surface.dark.hex}}; } From 9a3bb5e59ef739d7c1f59fa957b375ee01f2be6e Mon Sep 17 00:00:00 2001 From: GokuPlay609 Date: Wed, 25 Feb 2026 13:16:46 +0530 Subject: [PATCH 4/4] fix: sudo keepalive cleanup leaking exit code 143 wait on a SIGTERM-killed process returns 143 (128+15). With set -e active in the setup script, this overrides the script's exit code, making a successful install appear failed. Amp-Thread-ID: https://ampcode.com/threads/T-019c93b6-b135-743f-8844-6a1ca8875506 Co-authored-by: Amp --- sdata/lib/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdata/lib/functions.sh b/sdata/lib/functions.sh index 423f45b81..bc8f08400 100644 --- a/sdata/lib/functions.sh +++ b/sdata/lib/functions.sh @@ -119,8 +119,8 @@ function sudo_init_keepalive(){ # Stop the sudo keepalive background process function sudo_stop_keepalive(){ if [[ -n "$SUDO_KEEPALIVE_PID" ]] && kill -0 "$SUDO_KEEPALIVE_PID" 2>/dev/null; then - kill "$SUDO_KEEPALIVE_PID" 2>/dev/null - wait "$SUDO_KEEPALIVE_PID" 2>/dev/null + kill "$SUDO_KEEPALIVE_PID" 2>/dev/null || true + wait "$SUDO_KEEPALIVE_PID" 2>/dev/null || true SUDO_KEEPALIVE_PID="" fi }