forked from fabian/nix
		
	remove redundant functions from pkgs that are in trivionomicon
This commit is contained in:
		
							parent
							
								
									739fcca51a
								
							
						
					
					
						commit
						9f9bb57797
					
				
					 7 changed files with 8 additions and 31 deletions
				
			
		|  | @ -41,14 +41,14 @@ | ||||||
|       doctrinePrefix = "local"; |       doctrinePrefix = "local"; | ||||||
| 
 | 
 | ||||||
|       paths = { |       paths = { | ||||||
|         # localOverlay = "pkgs"; |         localOverlay = "pkgs"; | ||||||
|         nixpkgsConfig = "pkgs/config"; |         nixpkgsConfig = "pkgs/config"; | ||||||
| 
 | 
 | ||||||
|         nixosSource = "sys"; |         nixosSource = "sys"; | ||||||
|         nixosPlatforms = "sys/platform"; |         nixosPlatforms = "sys/platforms"; | ||||||
| 
 | 
 | ||||||
|         hmSource = "home"; |         hmSource = "home"; | ||||||
|         hmPlatforms = "home/platform"; |         hmPlatforms = "home/platforms"; | ||||||
|       }; |       }; | ||||||
|     }; |     }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -9,5 +9,6 @@ with lib; { | ||||||
|   imports = [ |   imports = [ | ||||||
|     ./modules |     ./modules | ||||||
|     flakes.trivionomicon.homeManagerModules.default |     flakes.trivionomicon.homeManagerModules.default | ||||||
|  |     flakes.hm-isolation.homeManagerModule | ||||||
|   ]; |   ]; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| lib: | {lib}: | ||||||
| with lib; { | with lib; { | ||||||
|   android_sdk.accept_license = true; #TODO: what the fuck is this |   android_sdk.accept_license = true; #TODO: what the fuck is this | ||||||
|   allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg); |   allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg); | ||||||
|  |  | ||||||
|  | @ -1,14 +1,13 @@ | ||||||
| { | { | ||||||
|   final, |   final, | ||||||
|   prev, |   prev, | ||||||
|  |   flakes, | ||||||
| }: | }: | ||||||
| with prev.lib; let | with prev.lib; let | ||||||
|   inherit (final) callPackage fetchpatch; |   inherit (final) callPackage fetchpatch; | ||||||
| in { | in { | ||||||
|   lib = callPackage ./lib {}; |  | ||||||
| 
 |  | ||||||
|   override = |   override = | ||||||
|     { |     {# add python modules here to make them available in all versions | ||||||
|     } |     } | ||||||
|     // ( |     // ( | ||||||
|       let |       let | ||||||
|  |  | ||||||
|  | @ -1,3 +0,0 @@ | ||||||
| {callPackage}: { |  | ||||||
|   importAll = callPackage ./importAll.nix {}; |  | ||||||
| } |  | ||||||
|  | @ -1,20 +0,0 @@ | ||||||
| {lib}: { |  | ||||||
|   root, |  | ||||||
|   exclude ? [], |  | ||||||
| }: |  | ||||||
| with builtins; |  | ||||||
| with lib; |  | ||||||
| # http://chriswarbo.net/projects/nixos/useful_hacks.html |  | ||||||
|   let |  | ||||||
|     basename = removeSuffix ".nix"; |  | ||||||
| 
 |  | ||||||
|     isMatch = name: type: |  | ||||||
|       (hasSuffix ".nix" name || type == "directory") |  | ||||||
|       && ! elem name (map basename exclude); |  | ||||||
| 
 |  | ||||||
|     entry = name: _: { |  | ||||||
|       name = basename name; |  | ||||||
|       value = import (root + "/${name}"); |  | ||||||
|     }; |  | ||||||
|   in |  | ||||||
|     mapAttrs' entry (filterAttrs isMatch (readDir root)) |  | ||||||
|  | @ -30,7 +30,7 @@ | ||||||
|     }; |     }; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   trivium.sway.enable = true; |   local.sway.enable = true; | ||||||
| 
 | 
 | ||||||
|   networking = { |   networking = { | ||||||
|     hostName = "yuki"; |     hostName = "yuki"; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue