merge desktop laptop 2026-08-29

1 files changed, 22 insertions, 14 deletions

diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index 1cf80e8..0b0a902 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -25,6 +25,11 @@ in {
 
         home.manager.services.polkit-gnome.enable = true;
         
+        fonts.packages =
+        with pkgs; [
+            adwaita-fonts
+        ];
+
         home.packages = with pkgs; [
             libnotify
             killall
@@ -34,13 +39,29 @@ in {
             mako
             jq
             swww
+
+            adwaita-icon-theme
+            adwaita-icon-theme-legacy
         ];
 
+        home.manager.xdg.configFile."niri/config.kdl".source = "${configDir}/niri/${config.networking.hostName}.kdl";
+
+        programs.regreet = {
+            enable = true;
+            theme.name = "Adwaita";
+            cursorTheme.name = "Adwaita";
+        };
+
+        home.file.".icons/default".source = "${pkgs.adwaita-icon-theme}/share/icons/Adwaita";
+
         modules.device.displayProtocol = "wayland";
 
         environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-        home.manager.xdg.configFile."niri/config.kdl".source = "${configDir}/niri/${config.networking.hostName}.kdl";
+        home.manager.gtk.cursorTheme = {
+            name = "Adwaita";
+            size = 12;
+        };
 
         system.userActivationScripts.linkwaybar.text = ''
             if [[ ! -h "$HOME/.config/waybar" ]]; then
@@ -49,19 +70,6 @@ in {
         '';
     }
     (lib.mkIf (config.modules.desktop.greetd.enable) {
-        services.greetd.settings = {
-            default_session.command = ''
-                ${pkgs.greetd.tuigreet}/bin/tuigreet \
-                    --time \
-                    --asterisks \
-                    --user-menu \
-                    --cmd niri-session
-            '';
-        };
-
-        environment.etc."greetd/environments".text = ''
-            Niri
-        '';
     })
     ]);
 }