mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 02:52:37 +00:00 
			
		
		
		
	convert hcl module
This commit is contained in:
		
					parent
					
						
							
								39efdc7990
							
						
					
				
			
			
				commit
				
					
						c4bf1b63cc
					
				
			
		
					 1 changed files with 21 additions and 16 deletions
				
			
		|  | @ -8,22 +8,19 @@ | ||||||
|   inherit (lib.options) mkEnableOption mkOption; |   inherit (lib.options) mkEnableOption mkOption; | ||||||
|   inherit (lib.meta) getExe; |   inherit (lib.meta) getExe; | ||||||
|   inherit (lib.modules) mkIf mkMerge; |   inherit (lib.modules) mkIf mkMerge; | ||||||
|   inherit (lib.types) package bool enum; |   inherit (lib.types) package bool enum listOf; | ||||||
|   inherit (lib.nvim.types) mkGrammarOption; |   inherit (lib.nvim.types) mkGrammarOption; | ||||||
|  |   inherit (lib.nvim.attrsets) mapListToAttrs; | ||||||
| 
 | 
 | ||||||
|   cfg = config.vim.languages.hcl; |   cfg = config.vim.languages.hcl; | ||||||
| 
 | 
 | ||||||
|   defaultServer = "terraform-ls"; |   defaultServers = ["terraform-ls"]; | ||||||
|   servers = { |   servers = { | ||||||
|     terraform-ls = { |     terraform-ls = { | ||||||
|       package = pkgs.terraform-ls; |       enable = true; | ||||||
|       lspConfig = '' |       cmd = [(getExe pkgs.terraform-ls) "serve"]; | ||||||
|         lspconfig.terraformls.setup { |       filetypes = ["terraform" "terraform-vars"]; | ||||||
|           capabilities = capabilities, |       root_markers = [".terraform" ".git"]; | ||||||
|           on_attach=default_on_attach, |  | ||||||
|           cmd = {"${lib.getExe cfg.lsp.package}", "serve"}, |  | ||||||
|         } |  | ||||||
|       ''; |  | ||||||
|     }; |     }; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|  | @ -43,12 +40,11 @@ in { | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     lsp = { |     lsp = { | ||||||
|       enable = mkEnableOption "HCL LSP support (terraform-ls)" // {default = config.vim.lsp.enable;}; |       enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;}; | ||||||
|       # TODO: (maybe, is it better?) it would be cooler to use vscode-extensions.hashicorp.hcl probably, shouldn't be too hard |       servers = mkOption { | ||||||
|       package = mkOption { |         description = "HCL LSP server to use"; | ||||||
|         type = package; |         type = listOf (enum (attrNames servers)); | ||||||
|         default = servers.${defaultServer}.package; |         default = defaultServers; | ||||||
|         description = "HCL language server package (terraform-ls)"; |  | ||||||
|       }; |       }; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|  | @ -95,6 +91,15 @@ in { | ||||||
|       vim.treesitter.grammars = [cfg.treesitter.package]; |       vim.treesitter.grammars = [cfg.treesitter.package]; | ||||||
|     }) |     }) | ||||||
| 
 | 
 | ||||||
|  |     (mkIf cfg.lsp.enable { | ||||||
|  |       vim.lsp.servers = | ||||||
|  |         mapListToAttrs (n: { | ||||||
|  |           name = n; | ||||||
|  |           value = servers.${n}; | ||||||
|  |         }) | ||||||
|  |         cfg.lsp.servers; | ||||||
|  |     }) | ||||||
|  | 
 | ||||||
|     (mkIf cfg.lsp.enable { |     (mkIf cfg.lsp.enable { | ||||||
|       vim.lsp.lspconfig.enable = true; |       vim.lsp.lspconfig.enable = true; | ||||||
|       vim.lsp.lspconfig.sources = lib.optionalAttrs (! config.vim.languages.terraform.lsp.enable) { |       vim.lsp.lspconfig.sources = lib.optionalAttrs (! config.vim.languages.terraform.lsp.enable) { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 sjcobb
				sjcobb