mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 19:12:38 +00:00 
			
		
		
		
	lsp/lsp-aga: add catppuccin integration (#779)
	
		
			
	
		
	
	
		
	
		
			Some checks are pending
		
		
	
	
		
			
				
	
				Set up binary cache / cachix (default) (push) Waiting to run
				
			
		
			
				
	
				Set up binary cache / cachix (maximal) (push) Waiting to run
				
			
		
			
				
	
				Set up binary cache / cachix (nix) (push) Waiting to run
				
			
		
			
				
	
				Treewide Checks / Validate flake (push) Waiting to run
				
			
		
			
				
	
				Treewide Checks / Check formatting (push) Waiting to run
				
			
		
			
				
	
				Treewide Checks / Check source tree for typos (push) Waiting to run
				
			
		
			
				
	
				Treewide Checks / Validate documentation builds (push) Waiting to run
				
			
		
			
				
	
				Treewide Checks / Validate hyperlinks in documentation sources (push) Waiting to run
				
			
		
			
				
	
				Treewide Checks / Validate Editorconfig conformance (push) Waiting to run
				
			
		
			
				
	
				Build and deploy documentation / Check latest commit (push) Waiting to run
				
			
		
			
				
	
				Build and deploy documentation / publish (push) Blocked by required conditions
				
			
		
		
	
	
		
	
		
			Some checks are pending
		
		
	
	Set up binary cache / cachix (default) (push) Waiting to run
				
			Set up binary cache / cachix (maximal) (push) Waiting to run
				
			Set up binary cache / cachix (nix) (push) Waiting to run
				
			Treewide Checks / Validate flake (push) Waiting to run
				
			Treewide Checks / Check formatting (push) Waiting to run
				
			Treewide Checks / Check source tree for typos (push) Waiting to run
				
			Treewide Checks / Validate documentation builds (push) Waiting to run
				
			Treewide Checks / Validate hyperlinks in documentation sources (push) Waiting to run
				
			Treewide Checks / Validate Editorconfig conformance (push) Waiting to run
				
			Build and deploy documentation / Check latest commit (push) Waiting to run
				
			Build and deploy documentation / publish (push) Blocked by required conditions
				
			Co-authored-by: raf <raf@notashelf.dev>
This commit is contained in:
		
					parent
					
						
							
								95c991e48d
							
						
					
				
			
			
				commit
				
					
						94b5838175
					
				
			
		
					 3 changed files with 36 additions and 19 deletions
				
			
		|  | @ -292,6 +292,7 @@ | ||||||
| 
 | 
 | ||||||
| - Add lint (luacheck) and formatting (stylua) support for Lua. | - Add lint (luacheck) and formatting (stylua) support for Lua. | ||||||
| - Add lint (markdownlint-cli2) support for Markdown. | - Add lint (markdownlint-cli2) support for Markdown. | ||||||
|  | - Add catppuccin integration for Lspsaga. | ||||||
| 
 | 
 | ||||||
| [tebuevd](https://github.com/tebuevd): | [tebuevd](https://github.com/tebuevd): | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -6,6 +6,19 @@ | ||||||
|   inherit (lib.modules) mkRemovedOptionModule; |   inherit (lib.modules) mkRemovedOptionModule; | ||||||
|   inherit (lib.options) mkOption mkEnableOption; |   inherit (lib.options) mkOption mkEnableOption; | ||||||
|   inherit (lib.nvim.types) borderType mkPluginSetupOption; |   inherit (lib.nvim.types) borderType mkPluginSetupOption; | ||||||
|  |   inherit (lib.nvim.lua) mkLuaInline; | ||||||
|  | 
 | ||||||
|  |   uiKindSetupOpts = | ||||||
|  |     if config.vim.theme.enable && config.vim.theme.name == "catppuccin" | ||||||
|  |     then { | ||||||
|  |       ui.kind = | ||||||
|  |         mkLuaInline | ||||||
|  |         # lua | ||||||
|  |         '' | ||||||
|  |           require("catppuccin.groups.integrations.lsp_saga").custom_kind() | ||||||
|  |         ''; | ||||||
|  |     } | ||||||
|  |     else {}; | ||||||
| in { | in { | ||||||
|   imports = [ |   imports = [ | ||||||
|     (mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] '' |     (mkRemovedOptionModule ["vim" "lsp" "lspsaga" "mappings"] '' | ||||||
|  | @ -21,12 +34,14 @@ in { | ||||||
|   options.vim.lsp.lspsaga = { |   options.vim.lsp.lspsaga = { | ||||||
|     enable = mkEnableOption "LSP Saga"; |     enable = mkEnableOption "LSP Saga"; | ||||||
| 
 | 
 | ||||||
|     setupOpts = mkPluginSetupOption "lspsaga" { |     setupOpts = | ||||||
|  |       mkPluginSetupOption "lspsaga" { | ||||||
|         border_style = mkOption { |         border_style = mkOption { | ||||||
|           type = borderType; |           type = borderType; | ||||||
|           default = config.vim.ui.borders.globalStyle; |           default = config.vim.ui.borders.globalStyle; | ||||||
|           description = "Border type, see {command}`:help nvim_open_win`"; |           description = "Border type, see {command}`:help nvim_open_win`"; | ||||||
|         }; |         }; | ||||||
|     }; |       } | ||||||
|  |       // uiKindSetupOpts; | ||||||
|   }; |   }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -81,6 +81,7 @@ in { | ||||||
|           fidget = true, |           fidget = true, | ||||||
|           alpha = true, |           alpha = true, | ||||||
|           leap = true, |           leap = true, | ||||||
|  |           lsp_saga = true, | ||||||
|           markdown = true, |           markdown = true, | ||||||
|           noice = true, |           noice = true, | ||||||
|           notify = true, -- nvim-notify |           notify = true, -- nvim-notify | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Venkatesan Ravi
				Venkatesan Ravi