From dd8ff25c317b5bc10028048f5547bb5a70873684 Mon Sep 17 00:00:00 2001 From: reidlab Date: Mon, 2 Jun 2025 01:46:47 -0700 Subject: [PATCH] update packages; niri stuff --- flake.lock | 86 +++++++++---------- modules/desktop/cliphist.nix | 7 -- modules/desktop/monitors.nix | 1 + modules/desktop/niri.nix | 27 +++--- modules/desktop/themes/catppuccin/default.nix | 2 + modules/desktop/themes/default.nix | 1 + modules/software/tools/gpg.nix | 2 +- 7 files changed, 65 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 841f466..e904118 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ }, "hardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "lastModified": 1743953322, + "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1742397293, - "narHash": "sha256-WVREToubLhIlogCoNJzo+HdatLKkEushwStDU1uyRnc=", + "lastModified": 1747688623, + "narHash": "sha256-QfFRh7FBbMtN/MPZKSTuVCtauRGPHg9Pgx9tV5rb5bg=", "owner": "hyprwm", "repo": "hypridle", - "rev": "71e875e49e583c7b8b1364b55dfe494375c4e3ea", + "rev": "4f1c165d3e340331de020b46b33a3edb2fd9d55e", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1744468525, + "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", "type": "github" }, "original": { @@ -232,11 +232,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1742460722, - "narHash": "sha256-u23NzXN2yez0nO2zEtEaChE/4jhtC8WvpM8OpwUsls8=", + "lastModified": 1747635830, + "narHash": "sha256-IypoV7crmhQ4llD0n4qqO4XTRNAAbHfA+2oiTiq2qpk=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "f883e669d147ac189b64ce403300a5a3e4de2c66", + "rev": "da1d076d849fc0f298c1d287bddd04802bf7d0f9", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1737978343, - "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "lastModified": 1743950287, + "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742629677, - "narHash": "sha256-x3s8p2rTjB42PQR5yN49qYhEOx/AhykqiNNyDFHmAas=", + "lastModified": 1748847346, + "narHash": "sha256-ohJbvwSyyGGmC29+Uxt9BEH0fSzFZVJmmped9px5ocU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b6db5c8dc7e46864b090e01114a2b8b40e7b6c3b", + "rev": "a36d9f210d5731382f205259425b41406aa78ff7", "type": "github" }, "original": { @@ -388,11 +388,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742627013, - "narHash": "sha256-GOp+thjLXji90Apk6yBhH/5+nuYKGdaG7gAaOQba8Lk=", + "lastModified": 1748794937, + "narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=", "owner": "YaLTeR", "repo": "niri", - "rev": "0d4f0f00c0cd83a72151468bc610ce230a550027", + "rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba", "type": "github" }, "original": { @@ -453,16 +453,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -485,11 +485,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -501,11 +501,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742475924, - "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "type": "github" }, "original": { diff --git a/modules/desktop/cliphist.nix b/modules/desktop/cliphist.nix index 4efa7d2..241d6b2 100644 --- a/modules/desktop/cliphist.nix +++ b/modules/desktop/cliphist.nix @@ -27,13 +27,6 @@ in { package = cfg.package; }; - # home-manager recently did a huge upgrade and made it so wayland stuff doesn't break anymore - # however... they forgot to include cliphist - # https://github.com/nix-community/home-manager/pull/5785 - # EDIT: i initially did this with `graphical-session-pre.target`, but that didn't work, pray this does - hm.systemd.user.services.cliphist.Unit.After = "graphical-session.target"; - hm.systemd.user.services.cliphist-images.Unit.After = "graphical-session.target"; - modules.desktop.rofi.enable = true; }; } diff --git a/modules/desktop/monitors.nix b/modules/desktop/monitors.nix index f0e9e40..8a25053 100644 --- a/modules/desktop/monitors.nix +++ b/modules/desktop/monitors.nix @@ -26,6 +26,7 @@ in { name = monitor.name; value = { scale = monitor.scale; + background-color = config.modules.desktop.themes.niri.background; }; }) cfg.monitors); }; diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index d3964b1..f315f05 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -94,6 +94,10 @@ in { }; }; + overview = { + backdrop-color = config.modules.desktop.themes.niri.background; + }; + hotkey-overlay.skip-at-startup = true; screenshot-path = null; @@ -324,16 +328,17 @@ in { "Mod+8".action = focus-workspace 8; "Mod+9".action = focus-workspace 9; "Mod+0".action = focus-workspace 10; - "Mod+Shift+1".action = move-column-to-workspace 1; - "Mod+Shift+2".action = move-column-to-workspace 2; - "Mod+Shift+3".action = move-column-to-workspace 3; - "Mod+Shift+4".action = move-column-to-workspace 4; - "Mod+Shift+5".action = move-column-to-workspace 5; - "Mod+Shift+6".action = move-column-to-workspace 6; - "Mod+Shift+7".action = move-column-to-workspace 7; - "Mod+Shift+8".action = move-column-to-workspace 8; - "Mod+Shift+9".action = move-column-to-workspace 9; - "Mod+Shift+0".action = move-column-to-workspace 10; + # no clue why, this got removed!! TODO: find an alternative + # "Mod+Shift+1".action = move-column-to-workspace 1; + # "Mod+Shift+2".action = move-column-to-workspace 2; + # "Mod+Shift+3".action = move-column-to-workspace 3; + # "Mod+Shift+4".action = move-column-to-workspace 4; + # "Mod+Shift+5".action = move-column-to-workspace 5; + # "Mod+Shift+6".action = move-column-to-workspace 6; + # "Mod+Shift+7".action = move-column-to-workspace 7; + # "Mod+Shift+8".action = move-column-to-workspace 8; + # "Mod+Shift+9".action = move-column-to-workspace 9; + # "Mod+Shift+0".action = move-column-to-workspace 10; "Mod+Comma".action = consume-window-into-column; "Mod+Period".action = expel-window-from-column; @@ -356,6 +361,8 @@ in { "Print".action = screenshot; + "Mod+Grave".action = toggle-overview; + "Mod+Shift+E".action = quit; "XF86AudioMicMute".action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index 4437332..0a127e9 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -73,6 +73,8 @@ in { inactive = "#${base02}"; # catppuccin crust shadow = "#11111b"; + # catppuccin crust + background = "#11111b"; }; waybar = builtins.concatStringsSep "\n" [ diff --git a/modules/desktop/themes/default.nix b/modules/desktop/themes/default.nix index 28da996..a80a3af 100644 --- a/modules/desktop/themes/default.nix +++ b/modules/desktop/themes/default.nix @@ -49,6 +49,7 @@ in { accent = mkOpt str ""; inactive = mkOpt str ""; shadow = mkOpt str ""; + background = mkOpt str ""; }; waybar = mkOpt str ""; diff --git a/modules/software/tools/gpg.nix b/modules/software/tools/gpg.nix index 48530cd..12d5109 100644 --- a/modules/software/tools/gpg.nix +++ b/modules/software/tools/gpg.nix @@ -15,7 +15,7 @@ in { enableExtraSocket = true; enableSshSupport = true; - pinentryPackage = pkgs.pinentry-qt; + pinentry.package = pkgs.pinentry-qt; }; }; }