switching to helix complete

modules/editors/helix.nix

@@ -2,18 +2,39 @@
   config,
   lib,
   pkgs,
+  inputs',
   ...
 }: let
   cfg = config.modules.system.programs.editors.helix;
   inherit (config.modules.other.system) username;
-  inherit (lib) mkIf;
+  inherit (lib) mkIf getExe makeBinPath;
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
       programs.helix = {
         enable = true;
+        package = inputs'.helix.packages.default.overrideAttrs (previousAttrs: {
+          makeWrapperArgs = with pkgs;
+            previousAttrs.makeWrapperArgs
+            or []
+            ++ [
+              "--suffix"
+              "PATH"
+              ":"
+              (makeBinPath [
+                clang-tools
+                marksman
+                nil
+                bash-language-server
+                shellcheck
+              ])
+            ];
+        });
         settings = {
+          theme = "catppuccin_mocha";
           editor = {
+            indent-guides.render = true;
+            lsp.display-inlay-hints = true;
             line-number = "relative";
             mouse = false;
             bufferline = "multiple";
@@ -30,14 +51,14 @@ in {
             A-w = ":buffer-close";
           };
         };
-        languages.language = [
-          {
-            name = "nix";
-            auto-format = true;
-            formatter.command = "${pkgs.alejandra}/bin/alejandra";
-            language-servers = ["${pkgs.nil}/bin/nil"];
-          }
-        ];
+        languages = {
+          language-server = {
+            nil = {
+              command = getExe pkgs.nil;
+              config.nil.formatting.command = ["${getExe pkgs.alejandra}" "-q"];
+            };
+          };
+        };
       };
     };
   };

modules/styling/stylix.nix

@@ -7,6 +7,7 @@
 }: let
   cfg = config.modules.usrEnv.style.stylix;
   inherit (config.modules.usrEnv.style.stylix) scheme image cursor fontsizes;
+  inherit (config.modules.other.system) username;
   inherit (lib) mkIf;
 in {
   imports = [inputs.stylix.nixosModules.stylix];
@@ -66,13 +67,25 @@ in {
         fish.enable = true;
         grub.enable = false;
         grub.useImage = true;
-        #gtk.enable = true;
+        gtk.enable = true;
         lightdm.enable = true;
         nixos-icons.enable = true;
-        nixvim.enable = true;
         plymouth.enable = true;
         plymouth.logoAnimated = true;
       };
     };
+    home-manager.users.${username} = {
+      stylix.targets = {
+        btop.enable = true;
+        helix.enable = false;
+        dunst.enable = true;
+        firefox.enable = true;
+        foot.enable = true;
+        fzf.enable = true;
+        hyprland.enable = true;
+        lazygit.enable = true;
+        zellij.enable = true;
+      };
+    };
   };
 }

modules/wms/wayland/hypr/land.nix

@@ -124,11 +124,11 @@ in {
           ];
           # Input settings
           input = {
-            kb_layout = "de,us";
-            kb_variant = ",cmk_ed_dh";
-            kb_model = ",pc105awide";
-            kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu";
-            kb_rules = ",evdev";
+            kb_layout = "de";
+            kb_variant = "";
+            kb_model = "";
+            # kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu";
+            # kb_rules = ",evdev";
 
             follow_mouse = true;