Neovim: Switch from rnix-lsp to nixd
This commit is contained in:
parent
554c16b739
commit
f89d5b0f6e
2 changed files with 30 additions and 26 deletions
|
@ -7,6 +7,34 @@
|
|||
}: let
|
||||
vars = import ../../../../vars.nix;
|
||||
colors = config.colorScheme.colors;
|
||||
stableExtraPkgs = with pkgs; [
|
||||
# LSP
|
||||
lua-language-server
|
||||
lua
|
||||
|
||||
# Formatters
|
||||
stylua # lua
|
||||
black # pyton
|
||||
alejandra # nix
|
||||
clang-tools_16 # c/c++
|
||||
rustfmt
|
||||
yamlfmt
|
||||
|
||||
# Linters
|
||||
ruff # python
|
||||
nodePackages.jsonlint # json
|
||||
nodePackages.eslint_d # javascript
|
||||
|
||||
# Tools
|
||||
xclip
|
||||
wl-clipboard
|
||||
fzf
|
||||
gcc
|
||||
];
|
||||
unstableExtraPkgs = with pkgs.unstable; [
|
||||
# LSP
|
||||
nixd
|
||||
];
|
||||
in {
|
||||
home.sessionVariables.EDITOR = "nvim";
|
||||
|
||||
|
@ -17,31 +45,7 @@ in {
|
|||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
# LSP
|
||||
lua-language-server
|
||||
lua
|
||||
rnix-lsp # nix
|
||||
|
||||
# Formatters
|
||||
stylua # lua
|
||||
black # pyton
|
||||
alejandra # nix
|
||||
clang-tools_16 # c/c++
|
||||
rustfmt
|
||||
yamlfmt
|
||||
|
||||
# Linters
|
||||
ruff # python
|
||||
nodePackages.jsonlint # json
|
||||
nodePackages.eslint_d # javascript
|
||||
|
||||
# Tools
|
||||
xclip
|
||||
wl-clipboard
|
||||
fzf
|
||||
gcc
|
||||
];
|
||||
extraPackages = stableExtraPkgs ++ unstableExtraPkgs;
|
||||
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
{
|
||||
|
|
|
@ -39,7 +39,7 @@ require("lspconfig").lua_ls.setup({
|
|||
},
|
||||
})
|
||||
|
||||
require("lspconfig").rnix.setup({
|
||||
require("lspconfig").nixd.setup({
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue