NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-02-05 11:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

changes from review

Browse source
This commit is contained in:
ppenguin 2026-01-09 10:05:53 +01:00
commit 6a8325639f
No known key found for this signature in database
GPG key ID: 7E7143B546BB17A7
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/plugins/languages/hcl.nix
View file

@ -14,17 +14,17 @@
cfg = config.vim.languages.hcl; cfg = config.vim.languages.hcl;
defaultServers = ["tofuls"]; defaultServers = ["tofuls-hcl"];
servers = { servers = {
terraformls = { terraformls-hcl = {
enable = true; enable = true;
cmd = mkDefault [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs cmd = [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
filetypes = ["hcl"]; filetypes = ["hcl"];
root_markers = [".git"]; root_markers = [".git"];
}; };
tofuls = { tofuls-hcl = {
enable = true; enable = true;
cmd = mkDefault [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs cmd = [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
filetypes = ["hcl"]; filetypes = ["hcl"];
root_markers = [".terraform" ".git"]; root_markers = [".terraform" ".git"];
}; };
@ -47,14 +47,12 @@ in {
enable = mkEnableOption "HCL support"; enable = mkEnableOption "HCL support";
treesitter = { treesitter = {
enable = enable = mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "hcl"; package = mkGrammarOption pkgs "hcl";
}; };
lsp = { lsp = {
enable = enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum (attrNames servers));
default = defaultServers; default = defaultServers;
@ -109,9 +107,6 @@ in {
value = servers.${n}; value = servers.${n};
}) })
cfg.lsp.servers; cfg.lsp.servers;
extraPackages =
(lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
}; };
}) })

16
modules/plugins/languages/terraform.nix
View file

@ -14,15 +14,15 @@
cfg = config.vim.languages.terraform; cfg = config.vim.languages.terraform;
defaultServers = ["tofuls"]; defaultServers = ["tofuls-tf"];
servers = { servers = {
terraformls = { terraformls-tf = {
enable = true; enable = true;
cmd = [(getExe pkgs.terraform-ls) "serve"]; cmd = [(getExe pkgs.terraform-ls) "serve"];
filetypes = ["terraform" "terraform-vars" "tf"]; filetypes = ["terraform" "terraform-vars" "tf"];
root_markers = [".terraform" ".git"]; root_markers = [".terraform" ".git"];
}; };
tofuls = { tofuls-tf = {
enable = true; enable = true;
cmd = [(getExe pkgs.tofu-ls) "serve"]; cmd = [(getExe pkgs.tofu-ls) "serve"];
filetypes = ["terraform" "terraform-vars" "tf"]; filetypes = ["terraform" "terraform-vars" "tf"];
@ -48,15 +48,12 @@ in {
enable = mkEnableOption "Terraform support"; enable = mkEnableOption "Terraform support";
treesitter = { treesitter = {
enable = enable = mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "terraform"; package = mkGrammarOption pkgs "terraform";
}; };
lsp = { lsp = {
enable = enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum (attrNames servers));
default = defaultServers; default = defaultServers;
@ -92,9 +89,6 @@ in {
value = servers.${n}; value = servers.${n};
}) })
cfg.lsp.servers; cfg.lsp.servers;
extraPackages =
(lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
}; };
}) })