Combine unfreepkgs list for stable and unstable
This commit is contained in:
		
							parent
							
								
									4f45a4dd53
								
							
						
					
					
						commit
						d1fe31d416
					
				
					 1 changed files with 12 additions and 11 deletions
				
			
		|  | @ -30,17 +30,21 @@ | ||||||
|     ... }: |     ... }: | ||||||
|     let |     let | ||||||
|       system = "x86_64-linux"; |       system = "x86_64-linux"; | ||||||
|  | 
 | ||||||
|  |       unfreePackages = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ | ||||||
|  |         "corefonts" | ||||||
|  |         "nvidia-settings" "nvidia-x11" | ||||||
|  |         "obsidian" | ||||||
|  |         "Oracle_VM_VirtualBox_Extension_Pack" | ||||||
|  |         "spotify" | ||||||
|  |         "steam" "steam-original" "steam-run" | ||||||
|  |         "vista-fonts" | ||||||
|  |       ]; | ||||||
|     in |     in | ||||||
|     utils.lib.mkFlake { |     utils.lib.mkFlake { | ||||||
|       inherit self inputs; |       inherit self inputs; | ||||||
| 
 | 
 | ||||||
|       channelsConfig.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ |       channelsConfig.allowUnfreePredicate = unfreePackages; | ||||||
|         "corefonts" |  | ||||||
|         "nvidia-settings" |  | ||||||
|         "nvidia-x11" |  | ||||||
|         "Oracle_VM_VirtualBox_Extension_Pack" |  | ||||||
|         "vista-fonts" |  | ||||||
|       ]; |  | ||||||
| 
 | 
 | ||||||
|       sharedOverlays = [ |       sharedOverlays = [ | ||||||
|         (import ./overlays/cmdtime) |         (import ./overlays/cmdtime) | ||||||
|  | @ -56,10 +60,7 @@ | ||||||
|         specialArgs = { |         specialArgs = { | ||||||
|           pkgs-unstable = import nixpkgs-unstable { |           pkgs-unstable = import nixpkgs-unstable { | ||||||
|             inherit system; |             inherit system; | ||||||
|             config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ |             config.allowUnfreePredicate = unfreePackages; | ||||||
|               "obsidian" |  | ||||||
|               "spotify" |  | ||||||
|             ]; |  | ||||||
|           }; |           }; | ||||||
|         }; |         }; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue