Skip to content

Commit 5eb2c4b

Browse files
committed
lsp servers have default package and packageFallback=true
1 parent 27f919d commit 5eb2c4b

9 files changed

Lines changed: 14 additions & 36 deletions

File tree

modules/languages/bash.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
flake.modules.nixvim.base = {
33
lsp.servers.bashls = {
44
enable = true;
5-
package = null;
5+
packageFallback = true;
66
};
77
};
88
}

modules/languages/clang.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
flake.modules.nixvim.base = {
33
lsp.servers.clangd = {
44
enable = true;
5-
package = null;
5+
packageFallback = true;
66
};
77
};
88
}

modules/languages/javascript.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
flake.modules.nixvim.base = {
33
lsp.servers.eslint = {
44
enable = true;
5-
package = null;
5+
packageFallback = true;
66
};
77
plugins.typescript-tools.enable = true;
88
};

modules/languages/lua.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
flake.modules.nixvim.base = {
33
lsp.servers.lua_ls = {
44
enable = true;
5-
package = null;
5+
packageFallback = true;
66
};
77
};
88
}

modules/languages/nix/linting.nix

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,9 @@
88
};
99

1010
flake.modules = {
11-
nixvim.base = {
12-
lsp.servers.statix = {
13-
enable = true;
14-
package = null;
15-
};
11+
nixvim.base.lsp.servers.statix = {
12+
enable = true;
13+
packageFallback = true;
1614
};
17-
homeManager.base =
18-
{ pkgs, ... }:
19-
{
20-
home.packages = [ pkgs.statix ];
21-
};
2215
};
2316
}

modules/languages/nix/lsp.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
flake.modules.nixvim.base = {
33
lsp.servers.nixd = {
44
enable = true;
5-
package = null;
5+
packageFallback = true;
66
};
77
};
8-
9-
flake.modules.homeManager.base =
10-
{ pkgs, ... }:
11-
{
12-
home.packages = [ pkgs.nixd ];
13-
};
148
}

modules/languages/typst.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
flake.modules.nixvim.base = {
33
lsp.servers.tinymist = {
44
enable = true;
5-
package = null;
5+
packageFallback = true;
66
};
77
plugins.typst-preview.enable = true;
88
};

modules/languages/yaml.nix

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
{
22
perSystem.treefmt.programs.yamlfmt.enable = true;
33

4-
flake.modules = {
5-
nixvim.base = {
6-
lsp.servers.yamlls = {
7-
enable = true;
8-
package = null;
9-
};
4+
flake.modules.nixvim.base = {
5+
lsp.servers.yamlls = {
6+
enable = true;
7+
packageFallback = true;
108
};
11-
12-
homeManager.base =
13-
{ pkgs, ... }:
14-
{
15-
home.packages = [ pkgs.yaml-language-server ];
16-
};
179
};
18-
1910
}

modules/shells/nushell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
nixvim.base = {
77
lsp.servers.nushell = {
88
enable = true;
9-
package = null;
9+
packageFallback = true;
1010
};
1111
};
1212
};

0 commit comments

Comments
 (0)