mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 02:52:37 +00:00 
			
		
		
		
	feat: add diffview.nvim to inputs
This commit is contained in:
		
					parent
					
						
							
								ef1b4d88bc
							
						
					
				
			
			
				commit
				
					
						a8f972701c
					
				
			
		
					 8 changed files with 66 additions and 0 deletions
				
			
		|  | @ -140,6 +140,7 @@ inputs: let | ||||||
|         colorizer.enable = true; |         colorizer.enable = true; | ||||||
|         icon-picker.enable = true; |         icon-picker.enable = true; | ||||||
|         venn-nvim.enable = false; # FIXME throws an error when its commands are ran manually |         venn-nvim.enable = false; # FIXME throws an error when its commands are ran manually | ||||||
|  |         diffview-nvim.enable = true; | ||||||
|       }; |       }; | ||||||
| 
 | 
 | ||||||
|       vim.notes = { |       vim.notes = { | ||||||
|  |  | ||||||
							
								
								
									
										17
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										17
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							|  | @ -272,6 +272,22 @@ | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|  |     "diffview-nvim": { | ||||||
|  |       "flake": false, | ||||||
|  |       "locked": { | ||||||
|  |         "lastModified": 1677593773, | ||||||
|  |         "narHash": "sha256-CMURShXn0RjZW3dc96o1usaLwWC+gOPAkIn3D9YPyBg=", | ||||||
|  |         "owner": "sindrets", | ||||||
|  |         "repo": "diffview.nvim", | ||||||
|  |         "rev": "009beb8054e510e7e2df122ee3ddb2b46bef542b", | ||||||
|  |         "type": "github" | ||||||
|  |       }, | ||||||
|  |       "original": { | ||||||
|  |         "owner": "sindrets", | ||||||
|  |         "repo": "diffview.nvim", | ||||||
|  |         "type": "github" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|     "dirt-samples-src": { |     "dirt-samples-src": { | ||||||
|       "flake": false, |       "flake": false, | ||||||
|       "locked": { |       "locked": { | ||||||
|  | @ -1235,6 +1251,7 @@ | ||||||
|         "copilot-lua": "copilot-lua", |         "copilot-lua": "copilot-lua", | ||||||
|         "crates-nvim": "crates-nvim", |         "crates-nvim": "crates-nvim", | ||||||
|         "dashboard-nvim": "dashboard-nvim", |         "dashboard-nvim": "dashboard-nvim", | ||||||
|  |         "diffview-nvim": "diffview-nvim", | ||||||
|         "dressing-nvim": "dressing-nvim", |         "dressing-nvim": "dressing-nvim", | ||||||
|         "fidget-nvim": "fidget-nvim", |         "fidget-nvim": "fidget-nvim", | ||||||
|         "flake-parts": "flake-parts", |         "flake-parts": "flake-parts", | ||||||
|  |  | ||||||
|  | @ -345,6 +345,11 @@ | ||||||
|       flake = false; |       flake = false; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|  |     diffview-nvim = { | ||||||
|  |       url = "github:sindrets/diffview.nvim"; | ||||||
|  |       flake = false; | ||||||
|  |     }; | ||||||
|  | 
 | ||||||
|     venn-nvim = { |     venn-nvim = { | ||||||
|       url = "github:jbyuki/venn.nvim"; |       url = "github:jbyuki/venn.nvim"; | ||||||
|       flake = false; |       flake = false; | ||||||
|  |  | ||||||
|  | @ -70,6 +70,7 @@ with lib; let | ||||||
|     "kommentary" |     "kommentary" | ||||||
|     "mind-nvim" |     "mind-nvim" | ||||||
|     "fidget-nvim" |     "fidget-nvim" | ||||||
|  |     "diffview-nvim" | ||||||
|   ]; |   ]; | ||||||
|   # You can either use the name of the plugin or a package. |   # You can either use the name of the plugin or a package. | ||||||
|   pluginsType = with types; listOf (nullOr (either (enum availablePlugins) package)); |   pluginsType = with types; listOf (nullOr (either (enum availablePlugins) package)); | ||||||
|  |  | ||||||
|  | @ -7,5 +7,6 @@ _: { | ||||||
|     ./icon-picker |     ./icon-picker | ||||||
|     ./telescope |     ./telescope | ||||||
|     ./venn |     ./venn | ||||||
|  |     ./diffview | ||||||
|   ]; |   ]; | ||||||
| } | } | ||||||
|  |  | ||||||
							
								
								
									
										21
									
								
								modules/utility/diffview/config.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								modules/utility/diffview/config.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,21 @@ | ||||||
|  | { | ||||||
|  |   pkgs, | ||||||
|  |   config, | ||||||
|  |   lib, | ||||||
|  |   ... | ||||||
|  | }: | ||||||
|  | with lib; | ||||||
|  | with builtins; let | ||||||
|  |   cfg = config.vim.utility.diffview-nvim; | ||||||
|  | in { | ||||||
|  |   config = mkIf (cfg.enable) { | ||||||
|  |     vim.startPlugins = [ | ||||||
|  |       "diffview-nvim" | ||||||
|  |       "plenary-nvim" | ||||||
|  |     ]; | ||||||
|  | 
 | ||||||
|  |     vim.luaConfigRC.diffview-nvim = | ||||||
|  |       nvim.dag.entryAnywhere '' | ||||||
|  |       ''; | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										6
									
								
								modules/utility/diffview/default.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								modules/utility/diffview/default.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,6 @@ | ||||||
|  | _: { | ||||||
|  |   imports = [ | ||||||
|  |     ./config.nix | ||||||
|  |     ./diffview.nix | ||||||
|  |   ]; | ||||||
|  | } | ||||||
							
								
								
									
										14
									
								
								modules/utility/diffview/diffview.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								modules/utility/diffview/diffview.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,14 @@ | ||||||
|  | { | ||||||
|  |   pkgs, | ||||||
|  |   config, | ||||||
|  |   lib, | ||||||
|  |   ... | ||||||
|  | }: | ||||||
|  | with lib; | ||||||
|  | with builtins; let | ||||||
|  |   cfg = config.vim.utility.diffview-nvim; | ||||||
|  | in { | ||||||
|  |   options.vim.utility.diffview-nvim = { | ||||||
|  |     enable = mkEnableOption "Enable diffview-nvim"; | ||||||
|  |   }; | ||||||
|  | } | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 NotAShelf
				NotAShelf