mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 19:12:38 +00:00 
			
		
		
		
	languages/markdown: added marksman LSP
This commit is contained in:
		
					parent
					
						
							
								4ded86d1ff
							
						
					
				
			
			
				commit
				
					
						75d553bf64
					
				
			
		
					 3 changed files with 61 additions and 2 deletions
				
			
		|  | @ -25,3 +25,5 @@ Release notes for release 0.6 | |||
| [donnerinoern](https://github.com/donnerinoern): | ||||
| 
 | ||||
| - Added Gruvbox theme | ||||
| 
 | ||||
| - Added marksman LSP for Markdown | ||||
|  |  | |||
|  | @ -4,9 +4,25 @@ | |||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
|   inherit (lib) nvim mkIf mkMerge; | ||||
|   inherit (lib) nvim mkIf mkMerge isList; | ||||
| 
 | ||||
|   cfg = config.vim.languages.markdown; | ||||
|   servers = { | ||||
|     marksman = { | ||||
|       package = pkgs.marksman; | ||||
|       lspConfig = '' | ||||
|         lspconfig.marksman.setup{ | ||||
|           capabilities = capabilities; | ||||
|           on_attach = default_on_attach; | ||||
|           cmd = ${ | ||||
|           if isList cfg.lsp.package | ||||
|           then nvim.lua.expToLua cfg.lsp.package | ||||
|           else ''{"${cfg.lsp.package}/bin/marksman", "server"}'' | ||||
|         }, | ||||
|         } | ||||
|       ''; | ||||
|     }; | ||||
|   }; | ||||
| in { | ||||
|   config = mkIf cfg.enable (mkMerge [ | ||||
|     (mkIf cfg.treesitter.enable { | ||||
|  | @ -26,5 +42,11 @@ in { | |||
|         autocmd FileType markdown noremap <leader>p :Glow<CR> | ||||
|       ''; | ||||
|     }) | ||||
| 
 | ||||
|     (mkIf cfg.lsp.enable { | ||||
|       vim.lsp.lspconfig.enable = true; | ||||
| 
 | ||||
|       vim.lsp.lspconfig.sources.markdown-lsp = servers.${cfg.lsp.server}.lspConfig; | ||||
|     }) | ||||
|   ]); | ||||
| } | ||||
|  |  | |||
|  | @ -4,9 +4,27 @@ | |||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
|   inherit (lib) mkEnableOption mkOption types nvim; | ||||
|   inherit (builtins) attrNames; | ||||
|   inherit (lib) mkEnableOption mkOption types nvim isList; | ||||
| 
 | ||||
|   cfg = config.vim.languages.markdown; | ||||
|   defaultServer = "marksman"; | ||||
|   servers = { | ||||
|     marksman = { | ||||
|       package = pkgs.marksman; | ||||
|       lspConfig = '' | ||||
|         lspconfig.marksman.setup{ | ||||
|           capabilities = capabilities; | ||||
|           on_attach = default_on_attach; | ||||
|           cmd = ${ | ||||
|           if isList cfg.lsp.package | ||||
|           then nvim.lua.expToLua cfg.lsp.package | ||||
|           else ''{"${cfg.lsp.package}/bin/marksman", "server"}'' | ||||
|         }, | ||||
|         } | ||||
|       ''; | ||||
|     }; | ||||
|   }; | ||||
| in { | ||||
|   options.vim.languages.markdown = { | ||||
|     enable = mkEnableOption "Markdown markup language support"; | ||||
|  | @ -26,5 +44,22 @@ in { | |||
|       mdPackage = nvim.types.mkGrammarOption pkgs "markdown"; | ||||
|       mdInlinePackage = nvim.types.mkGrammarOption pkgs "markdown-inline"; | ||||
|     }; | ||||
| 
 | ||||
|     lsp = { | ||||
|       enable = mkEnableOption "Enable Markdown LSP support" // {default = config.vim.languages.enableLSP;}; | ||||
| 
 | ||||
|       server = mkOption { | ||||
|         description = "Markdown LSP server to use"; | ||||
|         type = with types; enum (attrNames servers); | ||||
|         default = defaultServer; | ||||
|       }; | ||||
| 
 | ||||
|       package = mkOption { | ||||
|         description = "Markdown LSP server package, or the command to run as a list of strings"; | ||||
|         example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]''; | ||||
|         type = with types; either package (listOf str); | ||||
|         default = servers.${cfg.lsp.server}.package; | ||||
|       }; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Donnerinoern
				Donnerinoern