mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 11:02:37 +00:00 
			
		
		
		
	convert nim module
This commit is contained in:
		
					parent
					
						
							
								1f3b417469
							
						
					
				
			
			
				commit
				
					
						16c7c28ba1
					
				
			
		
					 2 changed files with 60 additions and 59 deletions
				
			
		|  | @ -6,32 +6,34 @@ | |||
| }: let | ||||
|   inherit (builtins) attrNames; | ||||
|   inherit (lib.options) mkEnableOption mkOption; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.meta) getExe'; | ||||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.lists) isList; | ||||
|   inherit (lib.types) enum either listOf package str; | ||||
|   inherit (lib.types) enum listOf package; | ||||
|   inherit (lib.nvim.types) mkGrammarOption; | ||||
|   inherit (lib.nvim.lua) expToLua; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.attrsets) mapListToAttrs; | ||||
| 
 | ||||
|   cfg = config.vim.languages.nim; | ||||
| 
 | ||||
|   defaultServer = "nimlsp"; | ||||
|   defaultServers = ["nimlsp"]; | ||||
|   servers = { | ||||
|     nimlsp = { | ||||
|       package = pkgs.nimlsp; | ||||
|       lspConfig = '' | ||||
|         lspconfig.nimls.setup{ | ||||
|           capabilities = capabilities; | ||||
|           on_attach = default_on_attach; | ||||
|           cmd = ${ | ||||
|           if isList cfg.lsp.package | ||||
|           then expToLua cfg.lsp.package | ||||
|           else '' | ||||
|             {"${cfg.lsp.package}/bin/nimlsp"} | ||||
|           '' | ||||
|         }; | ||||
|         } | ||||
|       ''; | ||||
|       enable = true; | ||||
|       cmd = [(getExe' pkgs.nimlsp "nimlsp")]; | ||||
|       filetypes = ["nim"]; | ||||
|       root_dir = | ||||
|         mkLuaInline | ||||
|         /* | ||||
|         lua | ||||
|         */ | ||||
|         '' | ||||
|           function(bufnr, on_dir) | ||||
|               local fname = vim.api.nvim_buf_get_name(bufnr) | ||||
|               on_dir( | ||||
|                 util.root_pattern '*.nimble'(fname) or vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1]) | ||||
|               ) | ||||
|           end | ||||
|         ''; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|  | @ -55,17 +57,11 @@ in { | |||
| 
 | ||||
|     lsp = { | ||||
|       enable = mkEnableOption "Nim LSP support" // {default = config.vim.lsp.enable;}; | ||||
|       server = mkOption { | ||||
|         description = "Nim LSP server to use"; | ||||
|         type = str; | ||||
|         default = defaultServer; | ||||
|       }; | ||||
| 
 | ||||
|       package = mkOption { | ||||
|         description = "Nim LSP server package, or the command to run as a list of strings"; | ||||
|         example = ''[lib.getExe pkgs.nimlsp]''; | ||||
|         type = either package (listOf str); | ||||
|         default = servers.${cfg.lsp.server}.package; | ||||
|       servers = mkOption { | ||||
|         description = "Nim LSP server to use"; | ||||
|         type = listOf (enum (attrNames servers)); | ||||
|         default = defaultServers; | ||||
|       }; | ||||
|     }; | ||||
| 
 | ||||
|  | @ -101,8 +97,12 @@ in { | |||
|     }) | ||||
| 
 | ||||
|     (mkIf cfg.lsp.enable { | ||||
|       vim.lsp.lspconfig.enable = true; | ||||
|       vim.lsp.lspconfig.sources.nim-lsp = servers.${cfg.lsp.server}.lspConfig; | ||||
|       vim.lsp.servers = | ||||
|         mapListToAttrs (n: { | ||||
|           name = n; | ||||
|           value = servers.${n}; | ||||
|         }) | ||||
|         cfg.lsp.servers; | ||||
|     }) | ||||
| 
 | ||||
|     (mkIf cfg.format.enable { | ||||
|  |  | |||
|  | @ -5,27 +5,30 @@ | |||
|   ... | ||||
| }: let | ||||
|   inherit (lib.options) mkEnableOption mkOption; | ||||
|   inherit (lib.types) str either package listOf; | ||||
|   inherit (lib.types) enum listOf; | ||||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.nvim.lua) expToLua; | ||||
|   inherit (lib.nvim.types) mkGrammarOption; | ||||
|   inherit (builtins) isList; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.attrsets) mapListToAttrs; | ||||
|   inherit (builtins) attrNames; | ||||
| 
 | ||||
|   defaultServer = "nushell"; | ||||
|   defaultServers = ["nushell"]; | ||||
|   servers = { | ||||
|     nushell = { | ||||
|       package = pkgs.nushell; | ||||
|       lspConfig = '' | ||||
|         lspconfig.nushell.setup{ | ||||
|           capabilities = capabilities, | ||||
|           on_attach = default_on_attach, | ||||
|           cmd = ${ | ||||
|           if isList cfg.lsp.package | ||||
|           then expToLua cfg.lsp.package | ||||
|           else ''{"${cfg.lsp.package}/bin/nu", "--no-config-file", "--lsp"}'' | ||||
|         } | ||||
|         } | ||||
|       ''; | ||||
|       enable = true; | ||||
|       cmd = [(getExe pkgs.nushell) "--no-config-file" "--lsp"]; | ||||
|       filetypes = ["nu"]; | ||||
|       root_dir = | ||||
|         mkLuaInline | ||||
|         /* | ||||
|         lua | ||||
|         */ | ||||
|         '' | ||||
|           function(bufnr, on_dir) | ||||
|             on_dir(vim.fs.root(bufnr, { '.git' }) or vim.fs.dirname(vim.api.nvim_buf_get_name(bufnr))) | ||||
|           end | ||||
|         ''; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|  | @ -41,17 +44,11 @@ in { | |||
| 
 | ||||
|     lsp = { | ||||
|       enable = mkEnableOption "Nu LSP support" // {default = config.vim.lsp.enable;}; | ||||
|       server = mkOption { | ||||
|         type = str; | ||||
|         default = defaultServer; | ||||
|         description = "Nu LSP server to use"; | ||||
|       }; | ||||
| 
 | ||||
|       package = mkOption { | ||||
|         type = either package (listOf str); | ||||
|         default = servers.${cfg.lsp.server}.package; | ||||
|         example = ''[(lib.getExe pkgs.nushell) "--lsp"]''; | ||||
|         description = "Nu LSP server package, or the command to run as a list of strings"; | ||||
|       servers = mkOption { | ||||
|         description = "Nu LSP server to use"; | ||||
|         type = listOf (enum (attrNames servers)); | ||||
|         default = defaultServers; | ||||
|       }; | ||||
|     }; | ||||
|   }; | ||||
|  | @ -63,8 +60,12 @@ in { | |||
|     }) | ||||
| 
 | ||||
|     (mkIf cfg.lsp.enable { | ||||
|       vim.lsp.lspconfig.enable = true; | ||||
|       vim.lsp.lspconfig.sources.nu-lsp = servers.${cfg.lsp.server}.lspConfig; | ||||
|       vim.lsp.servers = | ||||
|         mapListToAttrs (n: { | ||||
|           name = n; | ||||
|           value = servers.${n}; | ||||
|         }) | ||||
|         cfg.lsp.servers; | ||||
|     }) | ||||
|   ]); | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 sjcobb
				sjcobb