From a880332346f8b964be9180ae6f0f8cc4643135d1 Mon Sep 17 00:00:00 2001 From: satr14 Date: Wed, 8 Apr 2026 20:17:35 +0700 Subject: [PATCH] fix eval warnings --- modules/home/core/cli.nix | 3 +++ modules/home/core/shell.nix | 2 +- modules/home/desktop.nix | 2 +- modules/home/rice/compositor.nix | 4 ++-- modules/home/rice/keybinds.nix | 4 ++-- modules/home/rice/theme.nix | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/home/core/cli.nix b/modules/home/core/cli.nix index b3a6372..3cd45ea 100644 --- a/modules/home/core/cli.nix +++ b/modules/home/core/cli.nix @@ -44,6 +44,8 @@ enable = true; defaultEditor = true; vimAlias = true; + withRuby = false; + withPython3 = false; initLua = '' vim.opt.clipboard = "unnamedplus" vim.opt.termguicolors = true @@ -81,6 +83,7 @@ }; git = { enable = true; + signing.format = null; settings = { pull.rebase = "true"; credential.helper = "cache --timeout=3600"; diff --git a/modules/home/core/shell.nix b/modules/home/core/shell.nix index 8ce99d3..2a23a42 100644 --- a/modules/home/core/shell.nix +++ b/modules/home/core/shell.nix @@ -32,7 +32,7 @@ ''; shellAliases = { "cd-gvfs" = "cd /run/user/$(id -u)/gvfs"; - "wlp-set" = "swww img --transition-type=grow --transition-duration=1"; + "wlp-set" = "awww img --transition-type=grow --transition-duration=1"; "ssh" = "TERM=xterm-256color ssh"; "cd" = "z"; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index cafb780..aa51784 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -16,7 +16,7 @@ ]; services = { - swww.enable = true; + awww.enable = true; hyprpolkitagent.enable = true; }; diff --git a/modules/home/rice/compositor.nix b/modules/home/rice/compositor.nix index b701605..1c84e92 100644 --- a/modules/home/rice/compositor.nix +++ b/modules/home/rice/compositor.nix @@ -30,7 +30,7 @@ #"dunst &" #"hypridle &" - #"swww-daemon &" + #"awww-daemon &" "uwsm app -s s -- waybar &" "uwsm app -s b -- sunshine &" @@ -140,7 +140,7 @@ layerrule = [ "no_anim on, match:namespace selection" # hyprshot overlay "no_anim on, match:namespace hyprpicker" - "animation fade, match:namespace swww-daemon" + "animation fade, match:namespace awww-daemon" "animation fade, match:namespace logout_dialog" "animation fade, match:namespace hyprshutdown" "above_lock 2, match:namespace notifications" diff --git a/modules/home/rice/keybinds.nix b/modules/home/rice/keybinds.nix index ad2cfc5..c0d4634 100644 --- a/modules/home/rice/keybinds.nix +++ b/modules/home/rice/keybinds.nix @@ -95,10 +95,10 @@ "SUPER, N, exec, uwsm app -- rofi-network-manager" "SUPER, J, exec, notify-send -u critical ${hostname} 'Caffein Mode' && notify-send '(SUPER+X to reset)' && systemctl --user stop hypridle" - "SUPER, K, exec, notify-send -u critical ${hostname} 'Focus Mode' && notify-send '(SUPER+X to reset)' && systemctl --user stop swww && pkill -SIGUSR1 waybar && hyprctl --batch 'keyword decoration:inactive_opacity 1.0; keyword decoration:blur:enabled 0; keyword general:gaps_in 0; keyword general:gaps_out 0; keyword general:border_size 1; keyword decoration:rounding 0; keyword decoration:shadow:enabled false'" + "SUPER, K, exec, notify-send -u critical ${hostname} 'Focus Mode' && notify-send '(SUPER+X to reset)' && systemctl --user stop awww && pkill -SIGUSR1 waybar && hyprctl --batch 'keyword decoration:inactive_opacity 1.0; keyword decoration:blur:enabled 0; keyword general:gaps_in 0; keyword general:gaps_out 0; keyword general:border_size 1; keyword decoration:rounding 0; keyword decoration:shadow:enabled false'" "SUPER, B, submap, disabled-all-keybinds" "SUPER, H, exec, notify-send ${hostname} 'Animations Off' && hyprctl keyword animations:enabled 0" - "SUPER, X, exec, dunstctl close-all && hyprctl reload && hyprctl dispatch submap reset && pkill -SIGUSR2 waybar && systemctl --user restart swww hypridle fusuma" + "SUPER, X, exec, dunstctl close-all && hyprctl reload && hyprctl dispatch submap reset && pkill -SIGUSR2 waybar && systemctl --user restart awww hypridle fusuma" "SUPER, Z, exec, dunstctl close-all" "SUPER SHIFT, S, exec, hyprshot -zm region -o ~/Pictures/Screenshots; killall -9 hyprpicker hyprshot" diff --git a/modules/home/rice/theme.nix b/modules/home/rice/theme.nix index 0b994c5..71120dc 100644 --- a/modules/home/rice/theme.nix +++ b/modules/home/rice/theme.nix @@ -18,6 +18,7 @@ gtk = { enable = true; gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; + gtk4.theme = null; iconTheme = { name = "Papirus-Dark"; package = lib.mkForce pkgs.papirus-icon-theme;