mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-11-03 20:22:21 +00:00 
			
		
		
		
	Fixing conflits
This commit is contained in:
		
					parent
					
						
							
								2f33732bed
							
						
					
				
			
			
				commit
				
					
						1643b5262b
					
				
			
		
					 2 changed files with 7 additions and 8 deletions
				
			
		| 
						 | 
					@ -392,11 +392,3 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Add `rubylsp` option in `vim.languages.ruby.lsp.server` to use shopify's
 | 
					- Add `rubylsp` option in `vim.languages.ruby.lsp.server` to use shopify's
 | 
				
			||||||
  ruby-lsp language server
 | 
					  ruby-lsp language server
 | 
				
			||||||
 | 
					 | 
				
			||||||
[Haskex](https://github.com/haskex):
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and
 | 
					 | 
				
			||||||
  `setupOpts`
 | 
					 | 
				
			||||||
- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										7
									
								
								temp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								temp
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,7 @@
 | 
				
			||||||
 | 
					[Haskex](https://github.com/haskex):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and
 | 
				
			||||||
 | 
					  `setupOpts`
 | 
				
			||||||
 | 
					- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue