use overlay from zerforschen, re-rename homeModules
This commit is contained in:
		
							parent
							
								
									29d96e90a4
								
							
						
					
					
						commit
						232728a053
					
				
					 3 changed files with 11 additions and 10 deletions
				
			
		
							
								
								
									
										8
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							|  | @ -358,11 +358,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1755431984, |         "lastModified": 1757847061, | ||||||
|         "narHash": "sha256-iBgSdzkta6zQ2eIRWjmJTLZ3b1e1EZiCyCPcgCdqPGU=", |         "narHash": "sha256-YW8fpD35tD+1zTkxk0WhP7FJSL15JlFfG7tscgkdI+A=", | ||||||
|         "ref": "refs/heads/main", |         "ref": "refs/heads/main", | ||||||
|         "rev": "31abcb7a9583c4ed931f658eca3e3c1970e60814", |         "rev": "ddff8c9b206564dd9b9007e4e894afa6f7860fc8", | ||||||
|         "revCount": 28, |         "revCount": 30, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus" |         "url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus" | ||||||
|       }, |       }, | ||||||
|  |  | ||||||
							
								
								
									
										13
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								flake.nix
									
										
									
									
									
								
							|  | @ -120,7 +120,6 @@ | ||||||
| 
 | 
 | ||||||
|               nixpkgs.overlays = [ |               nixpkgs.overlays = [ | ||||||
|                 self.overlays.unstable-packages |                 self.overlays.unstable-packages | ||||||
|                 self.overlays.zerforschen |  | ||||||
|               ]; |               ]; | ||||||
| 
 | 
 | ||||||
|               nix.settings.experimental-features = [ |               nix.settings.experimental-features = [ | ||||||
|  | @ -141,6 +140,8 @@ | ||||||
|             self.nixosModules.allowed-unfree-list |             self.nixosModules.allowed-unfree-list | ||||||
|             self.nixosModules.extra-caches |             self.nixosModules.extra-caches | ||||||
|             ./modules/nixpkgs.nix |             ./modules/nixpkgs.nix | ||||||
|  | 
 | ||||||
|  |             zerforschen-plus.nixosModules.default | ||||||
|           ] |           ] | ||||||
|           ++ (nixpkgs.lib.optionals (builtins.elem device homeDevices) [ |           ++ (nixpkgs.lib.optionals (builtins.elem device homeDevices) [ | ||||||
|             { |             { | ||||||
|  | @ -154,6 +155,7 @@ | ||||||
|             } |             } | ||||||
| 
 | 
 | ||||||
|             self.nixosModules.pkgs-unstable |             self.nixosModules.pkgs-unstable | ||||||
|  |             self.nixosModules.pkgs-vscode-extensions | ||||||
|             self.nixosModules.niri |             self.nixosModules.niri | ||||||
|             self.nixosModules.kdeconnect |             self.nixosModules.kdeconnect | ||||||
|             self.nixosModules.en-de |             self.nixosModules.en-de | ||||||
|  | @ -174,10 +176,6 @@ | ||||||
|             config = prev.config; |             config = prev.config; | ||||||
|           }; |           }; | ||||||
|         }; |         }; | ||||||
| 
 |  | ||||||
|         zerforschen = final: prev: { |  | ||||||
|           zerforschen-plus-content = zerforschen-plus.packages."${prev.system}".zerforschen-plus-content; |  | ||||||
|         }; |  | ||||||
|       }; |       }; | ||||||
| 
 | 
 | ||||||
|       nixosModules = (self.lib.importDir ./nixosModules) // { |       nixosModules = (self.lib.importDir ./nixosModules) // { | ||||||
|  | @ -186,11 +184,14 @@ | ||||||
|           nixpkgs.overlays = [ niri.overlays.niri ]; |           nixpkgs.overlays = [ niri.overlays.niri ]; | ||||||
|         }; |         }; | ||||||
|         pkgs-unstable = { |         pkgs-unstable = { | ||||||
|  |           nixpkgs.overlays = [ self.overlays.unstable-packages ]; | ||||||
|  |         }; | ||||||
|  |         pkgs-vscode-extensions = { | ||||||
|           nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ]; |           nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ]; | ||||||
|         }; |         }; | ||||||
|       }; |       }; | ||||||
| 
 | 
 | ||||||
|       homeManagerModules = self.lib.importDir ./homeManagerModules; |       homeModules = self.lib.importDir ./homeModules; | ||||||
| 
 | 
 | ||||||
|       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); |       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Vinzenz Schroeter
						Vinzenz Schroeter