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

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

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