replace nil ls with nixd language server

remove nixlang dedicated module
This commit is contained in:
Noah Masur 2024-04-25 13:25:15 -04:00
parent f59c228803
commit 760a016842
No known key found for this signature in database
7 changed files with 2 additions and 37 deletions

View File

@ -300,16 +300,6 @@
packages =
let
arrow =
system:
import ./hosts/arrow {
inherit
inputs
globals
overlays
system
;
};
staff =
system:
import ./hosts/staff {

View File

@ -45,7 +45,6 @@ inputs.nixpkgs.lib.nixosSystem {
mail.aerc.enable = true;
mail.himalaya.enable = true;
dotfiles.enable = true;
nixlang.enable = true;
lua.enable = true;
}
];

View File

@ -43,7 +43,6 @@ inputs.darwin.lib.darwinSystem {
discord.enable = true;
firefox.enable = true;
dotfiles.enable = true;
nixlang.enable = true;
terraform.enable = true;
python.enable = true;
rust.enable = true;

View File

@ -110,7 +110,6 @@ inputs.nixpkgs.lib.nixosSystem {
mail.himalaya.enable = true;
keybase.enable = true;
mullvad.enable = false;
nixlang.enable = true;
rust.enable = true;
terraform.enable = true;
yt-dlp.enable = true;

View File

@ -37,8 +37,8 @@
cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
};
use.lspconfig.nil_ls.setup = dsl.callWith {
cmd = [ "${pkgs.nil}/bin/nil" ];
use.lspconfig.nixd.setup = dsl.callWith {
cmd = [ "${pkgs.nixd}/bin/nixd" ];
capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
};

View File

@ -5,7 +5,6 @@
./haskell.nix
./kubernetes.nix
./lua.nix
./nix.nix
./python.nix
./rust.nix
./terraform.nix

View File

@ -1,21 +0,0 @@
{
config,
pkgs,
lib,
...
}:
{
options.nixlang.enable = lib.mkEnableOption "Nix programming language.";
config = lib.mkIf config.nixlang.enable {
home-manager.users.${config.user} = {
home.packages = with pkgs; [
nixfmt-rfc-style # Nix file formatter
nil # Nix language server
];
};
};
}