Merge branch 'master' of ssh://ssh.nx2.site:20022/nx2/dotfiles

configuration.nix

@@ -25,6 +25,7 @@
     ./system-modules/kanata.nix
     ./system-modules/kodi.nix
     ./system-modules/networking.nix
+    ./system-modules/nixd.nix
     ./system-modules/nvidia.nix 
     ./system-modules/nx2site.nix
     ./system-modules/ollama.nix

home-modules/helix.nix

@@ -2,8 +2,9 @@
 {
   home = {
     packages = with pkgs; [
-      nixfmt-classic # nix formater
+      # nixfmt-classic # nix formater
-      nil # nix language server
+      # nil # nix language server
+      # nixd # specified in nixd.nix
       python311Packages.python-lsp-server
       ruff
       ruff-lsp
@@ -13,7 +14,8 @@
       marksman # markdown
       vale-ls # style-checker lsp (needs vale)
       ltex-ls # Ltex (language tool)
-     ] ++ (with pkgs-unstable; [
+    ] ++ (with pkgs-unstable; [
+      bash-language-server
       helix
     ]);
     sessionVariables = {
@@ -60,7 +62,7 @@
         };
       };
       keys.normal = {
-        "C-g" = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"];
+        "C-g" = [ ":new" ":insert-output lazygit" ":buffer-close!" ":redraw" ];
         "A-`" = [ "no_op" ];
         "`"   = [ "no_op" ];
       };
@@ -72,9 +74,13 @@
     };
     languages = {
       language = [
+        {
+          name = "nix";
+          language-servers = [ "nixd" "nil" ]; 
+        }
         {
           name = "latex";
-          language-servers = ["texlab" "language-tool"]; 
+          language-servers = [ "texlab" "language-tool" ]; 
         }
         {
           name = "markdown";
@@ -118,6 +124,9 @@
         }
       ];
       language-server = {
+        "nixd" = {
+          command = "nixd";
+        };
         "style-check" = {
           command = lib.getExe pkgs.vale-ls; 
         };

home-modules/nixd.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+	home.packages = with pkgs; [
+    nixd
+  ];
+}

home.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, lib, host, user, inputs, ... }:
+{ pkgs, pkgs-unstable, host, user, inputs, ... }:
 {
   imports = [
     ./home-modules/auto-mount.nix
@@ -26,6 +26,7 @@
     # ./home-modules/matrix.nix
     # ./home-modules/nm.nix
     ./home-modules/nh.nix
+    ./home-modules/nixd.nix
     ./home-modules/nvidia.nix
     ./home-modules/nx-gcal-event.nix
     ./home-modules/obs.nix

system-modules/nixd.nix

@@ -0,0 +1,4 @@
+{ inputs, ... }:
+{
+	nix.nixPath = [ "nixpgs=${inputs.nixpkgs}" ];  
+}