diff --git a/configuration.nix b/configuration.nix index 50de93d..03c45e4 100755 --- a/configuration.nix +++ b/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 diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 9543f6a..56f3477 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -2,8 +2,9 @@ { home = { packages = with pkgs; [ - nixfmt-classic # nix formater - nil # nix language server + # nixfmt-classic # nix formater + # 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; }; diff --git a/home-modules/nixd.nix b/home-modules/nixd.nix new file mode 100644 index 0000000..f2ac5e3 --- /dev/null +++ b/home-modules/nixd.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + nixd + ]; +} diff --git a/home.nix b/home.nix index 5d4b1a6..548a09c 100755 --- a/home.nix +++ b/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 diff --git a/system-modules/nixd.nix b/system-modules/nixd.nix new file mode 100644 index 0000000..78cad0b --- /dev/null +++ b/system-modules/nixd.nix @@ -0,0 +1,4 @@ +{ inputs, ... }: +{ + nix.nixPath = [ "nixpgs=${inputs.nixpkgs}" ]; +}