Add extra package repos as nixpkgs overrides instead of independent references
This commit is contained in:
		
							parent
							
								
									7899127c05
								
							
						
					
					
						commit
						3e9901bd2a
					
				
					 3 changed files with 36 additions and 36 deletions
				
			
		|  | @ -8,10 +8,6 @@ in { | |||
|     tags = [ "local" ]; | ||||
|   }; | ||||
| 
 | ||||
|   nixpkgs.config.packageOverrides = pkgs: { | ||||
|     agenix = (import "${sources.agenix}" { inherit pkgs; }).agenix; | ||||
|   }; | ||||
| 
 | ||||
|   environment.systemPackages = with pkgs; [ | ||||
|     agenix | ||||
|     colmena | ||||
|  |  | |||
							
								
								
									
										13
									
								
								hive.nix
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								hive.nix
									
										
									
									
									
								
							|  | @ -6,7 +6,18 @@ in { | |||
|     deployment.replaceUnknownProfiles = false; | ||||
|     networking.hostName = name; | ||||
| 
 | ||||
|     nixpkgs.config.allowUnfree = true; | ||||
|     nixpkgs.config = { | ||||
|       allowUnfree = true; | ||||
|       packageOverrides = pkgs: { | ||||
|         agenix = (import sources.agenix { inherit pkgs; }).agenix; | ||||
|         vscode-extensions = (import sources.nix-vscode-extensions).extensions.x86_64-linux; # TODO: This should check the host architecture | ||||
|       }; | ||||
|     }; | ||||
| 
 | ||||
|     home-manager = { | ||||
|       useUserPackages = true; | ||||
|       useGlobalPkgs = true; | ||||
|     }; | ||||
| 
 | ||||
|     imports = [ | ||||
|       (import "${sources.home-manager}/nixos") | ||||
|  |  | |||
|  | @ -1,39 +1,32 @@ | |||
| { config, lib, pkgs, ... }: | ||||
| 
 | ||||
| { | ||||
|   programs.vscode = | ||||
|     let | ||||
|       system = builtins.currentSystem; | ||||
|       sources = import ../npins; | ||||
|       extensions = (import sources.nix-vscode-extensions).extensions.${system}; | ||||
|     in | ||||
|     { | ||||
|       enable = true; | ||||
|       enableExtensionUpdateCheck = false; | ||||
|       enableUpdateCheck = false; | ||||
|       package = pkgs.vscodium; | ||||
|       extensions = (with pkgs.vscode-extensions; [ | ||||
|         jnoortheen.nix-ide | ||||
|         ms-python.python | ||||
|       ]) ++ (with extensions.open-vsx; [ | ||||
|         robbowen.synthwave-vscode | ||||
|       ]); | ||||
|       mutableExtensionsDir = false; | ||||
|       userSettings = { | ||||
|         "extensions.autoUpdate" = false; | ||||
|         "git.autofetch" = true; | ||||
|         "git.confirmSync" = false; | ||||
|         "git.enableSmartCommit" = true; | ||||
|         "javascript.updateImportsOnFileMove.enabled" = "always"; | ||||
|         "nix.enableLanguageServer" = true; | ||||
|         "nix.serverPath" = "nil"; | ||||
|         "nix.serverSettings".nil = { | ||||
|           diagnostics.ignored = [ "unused_binding" "unused_with" ]; | ||||
|           formatting.command = [ "nixpkgs-fmt" ]; | ||||
|         }; | ||||
|         "workbench.colorTheme" = "SynthWave '84"; | ||||
|   programs.vscode = { | ||||
|     enable = true; | ||||
|     enableExtensionUpdateCheck = false; | ||||
|     enableUpdateCheck = false; | ||||
|     package = pkgs.vscodium; | ||||
|     extensions = (with pkgs.vscode-extensions; [ | ||||
|       open-vsx.jnoortheen.nix-ide | ||||
|       open-vsx.ms-python.python | ||||
|       open-vsx.robbowen.synthwave-vscode | ||||
|     ]); | ||||
|     mutableExtensionsDir = false; | ||||
|     userSettings = { | ||||
|       "extensions.autoUpdate" = false; | ||||
|       "git.autofetch" = true; | ||||
|       "git.confirmSync" = false; | ||||
|       "git.enableSmartCommit" = true; | ||||
|       "javascript.updateImportsOnFileMove.enabled" = "always"; | ||||
|       "nix.enableLanguageServer" = true; | ||||
|       "nix.serverPath" = "nil"; | ||||
|       "nix.serverSettings".nil = { | ||||
|         diagnostics.ignored = [ "unused_binding" "unused_with" ]; | ||||
|         formatting.command = [ "nixpkgs-fmt" ]; | ||||
|       }; | ||||
|       "workbench.colorTheme" = "SynthWave '84"; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|   # Language servers etc | ||||
|   home.packages = with pkgs; [ | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue