laptop changes 2026-08-29laptop

3 files changed, 37 insertions, 20 deletions

diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix
index 304aca7..e3bb02e 100644
--- a/modules/desktop/apps/editors/neovim.nix
+++ b/modules/desktop/apps/editors/neovim.nix
@@ -22,9 +22,10 @@ in {
         };
 
         home.packages = [
-            pkgs.clang-tools
             pkgs.nil
             pkgs.texlab
+            pkgs.zls
+            pkgs.wgsl-analyzer
         ];
 
         home.manager.programs.neovim = {
@@ -34,8 +35,8 @@ in {
             withNodeJs = true;
 
             extraConfig = ''
-                luafile /etc/nixos/config/nvim/lua/settings.lua
-                luafile /etc/nixos/config/nvim/lua/lsp.lua
+                luafile ~/.config/nvim/lua/settings.lua
+                luafile ~/.config/nvim/lua/lsp.lua
             '';
             coc.enable = true;
             coc.settings = {
@@ -47,6 +48,16 @@ in {
 
                 "nix.enableLanguageServer" = true;
                 "nix.serverPath" = "nil";
+
+                "zig.enabled" = true;
+                "zig.path" = "${pkgs.zls}/bin/zls";
+
+                "languageserver" = {
+                    "wgsl" = {
+                        "command" = "${pkgs.wgsl-analyzer}/bin/wgsl-analyzer";
+                        "filetypes" = [ "wgsl" ];
+                    };
+                };
             };
 
             plugins = with pkgs.vimPlugins; [
@@ -60,6 +71,7 @@ in {
                 popup-nvim
                 plenary-nvim
                 telescope-nvim
+                wgsl-vim
 
                 nvim-lspconfig
                 nvim-treesitter nvim-treesitter.withAllGrammars
diff --git a/modules/desktop/greetd.nix b/modules/desktop/greetd.nix
index 0bc5208..4177839 100644
--- a/modules/desktop/greetd.nix
+++ b/modules/desktop/greetd.nix
@@ -15,9 +15,6 @@ in {
     };
 
     config = lib.mkIf (greetdConf.enable) {
-        services.greetd = {
-            enable = true;
-        };
         security.pam.services.greetd.enableGnomeKeyring = true;
     };
 }
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
-        '';
     })
     ]);
 }