fix: deprecated view.hide-root-folder opt

This commit is contained in:
NotAShelf 2023-04-15 12:43:45 +03:00
parent bbb58c8d51
commit 918070aeeb
No known key found for this signature in database
GPG Key ID: F0D14CCB5ED5AA22
3 changed files with 25 additions and 18 deletions

View File

@ -33,6 +33,7 @@ inputs: let
nvimCodeActionMenu.enable = true; nvimCodeActionMenu.enable = true;
trouble.enable = true; trouble.enable = true;
lspSignature.enable = true; lspSignature.enable = true;
elixir.enable = isMaximal;
rust.enable = isMaximal; rust.enable = isMaximal;
python = isMaximal; python = isMaximal;
clang.enable = isMaximal; clang.enable = isMaximal;

View File

@ -19,25 +19,20 @@ in {
[ [
"nvim-lspconfig" "nvim-lspconfig"
"null-ls" "null-ls"
(
if (config.vim.autocomplete.enable && (config.vim.autocomplete.type == "nvim-cmp"))
then "cmp-nvim-lsp"
else null
)
(
if cfg.sql
then "sqls-nvim"
else null
)
] ]
++ ( ++ optionals (cfg.rust.enable) [
if cfg.rust.enable "crates-nvim"
then [ "rust-tools"
"crates-nvim" ]
"rust-tools" ++ optionals (cfg.elixir.enable) [
] "elixir-ls"
else [] ]
); ++ optionals ((config.vim.autocomplete.enable) && (config.vim.autocomplete.type == "nvim-cmp")) [
"cmp-nvim-lsp"
]
++ optionals (cfg.sql) [
"sqls-nvim"
];
vim.configRC.lsp = nvim.dag.entryAnywhere '' vim.configRC.lsp = nvim.dag.entryAnywhere ''
${ ${
@ -346,6 +341,13 @@ in {
cmd = { "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", "--stdio" } cmd = { "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", "--stdio" }
} }
''} ''}
${writeIf cfg.elixir.enable ''
lspconfig.elixirls.setup {
cmd = { "${pkgs.elixir-ls}/language_server.sh" },
on_attach = on_attach
}
''}
''; '';
} }
); );

View File

@ -65,6 +65,10 @@ in {
}; };
}; };
elixir = {
enable = mkEnableOption "Elixir LSP";
};
sql = mkEnableOption "SQL Language LSP"; sql = mkEnableOption "SQL Language LSP";
go = mkEnableOption "Go language LSP"; go = mkEnableOption "Go language LSP";
ts = mkEnableOption "TS language LSP"; ts = mkEnableOption "TS language LSP";