mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 11:02:37 +00:00 
			
		
		
		
	Merge branch 'main' into clipboard-module
This commit is contained in:
		
				commit
				
					
						ce08bf8d2c
					
				
			
		
					 6 changed files with 8 additions and 9 deletions
				
			
		
							
								
								
									
										2
									
								
								.github/labels.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/labels.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -24,7 +24,7 @@ | ||||||
|       - any-glob-to-any-file: |       - any-glob-to-any-file: | ||||||
|         - .github/workflows/*.yml |         - .github/workflows/*.yml | ||||||
|         - .github/typos.toml |         - .github/typos.toml | ||||||
|         . .github/dependabot.yml |         - .github/dependabot.yml | ||||||
| 
 | 
 | ||||||
| "topic: meta": | "topic: meta": | ||||||
|   - any: |   - any: | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								.github/workflows/labeler.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/labeler.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -17,5 +17,5 @@ jobs: | ||||||
|       - uses: actions/labeler@v5 |       - uses: actions/labeler@v5 | ||||||
|         with: |         with: | ||||||
|           repo-token: ${{ secrets.GITHUB_TOKEN }} |           repo-token: ${{ secrets.GITHUB_TOKEN }} | ||||||
|           configuration-path: .github/labeler.yml |           configuration-path: .github/labels.yml | ||||||
|           sync-labels: true |           sync-labels: true | ||||||
|  |  | ||||||
|  | @ -143,8 +143,6 @@ in { | ||||||
|     }) |     }) | ||||||
| 
 | 
 | ||||||
|     (mkIf ftcfg.enable { |     (mkIf ftcfg.enable { | ||||||
|       lsp.enable = true; |  | ||||||
| 
 |  | ||||||
|       startPlugins = [ |       startPlugins = [ | ||||||
|         ( |         ( | ||||||
|           if ftcfg.enableNoResolvePatch |           if ftcfg.enableNoResolvePatch | ||||||
|  |  | ||||||
|  | @ -101,6 +101,7 @@ | ||||||
|           "eslint.config.js" |           "eslint.config.js" | ||||||
|           "eslint.config.mjs" |           "eslint.config.mjs" | ||||||
|           ".eslintrc" |           ".eslintrc" | ||||||
|  |           ".eslintrc.cjs" | ||||||
|           ".eslintrc.json" |           ".eslintrc.json" | ||||||
|           ".eslintrc.js" |           ".eslintrc.js" | ||||||
|           ".eslintrc.yml" |           ".eslintrc.yml" | ||||||
|  |  | ||||||
|  | @ -84,13 +84,13 @@ in { | ||||||
|               group = augroup, |               group = augroup, | ||||||
|               buffer = bufnr, |               buffer = bufnr, | ||||||
|               callback = function() |               callback = function() | ||||||
|  |                 if vim.b.disableFormatSave then | ||||||
|  |                   return | ||||||
|  |                 end | ||||||
|  | 
 | ||||||
|                 ${ |                 ${ | ||||||
|           if config.vim.lsp.null-ls.enable |           if config.vim.lsp.null-ls.enable | ||||||
|           then '' |           then '' | ||||||
|             if vim.b.disableFormatSave then |  | ||||||
|               return |  | ||||||
|             end |  | ||||||
| 
 |  | ||||||
|             local function is_null_ls_formatting_enabled(bufnr) |             local function is_null_ls_formatting_enabled(bufnr) | ||||||
|                 local file_type = vim.api.nvim_buf_get_option(bufnr, "filetype") |                 local file_type = vim.api.nvim_buf_get_option(bufnr, "filetype") | ||||||
|                 local generators = require("null-ls.generators").get_available( |                 local generators = require("null-ls.generators").get_available( | ||||||
|  |  | ||||||
|  | @ -109,7 +109,7 @@ in { | ||||||
|             type = nullOr str; |             type = nullOr str; | ||||||
|             default = null; |             default = null; | ||||||
|             description = '' |             description = '' | ||||||
|               The indicatotor icon to use for the current buffer. |               The indicator icon to use for the current buffer. | ||||||
| 
 | 
 | ||||||
|               ::: {.warning} |               ::: {.warning} | ||||||
|               This **must** be omitted while style is not `icon` |               This **must** be omitted while style is not `icon` | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 GitHub
					GitHub