merge default.nix and configuration.nix
This commit is contained in:
		
							parent
							
								
									8fc672bfcf
								
							
						
					
					
						commit
						9cf6333f4b
					
				
					 10 changed files with 140 additions and 146 deletions
				
			
		|  | @ -1,15 +0,0 @@ | |||
| { ... }: | ||||
| { | ||||
|   # uncomment for build check on non arm system (requires --impure) | ||||
|   # nixpkgs.buildPlatform = builtins.currentSystem; | ||||
|   services.tailscale.useRoutingFeatures = "both"; | ||||
|   system.autoUpgrade.allowReboot = true; | ||||
| 
 | ||||
|   users.users = { | ||||
|     root.openssh.authorizedKeys.keys = [ | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
|  | @ -1,7 +1,21 @@ | |||
| { | ||||
|   imports = [ | ||||
|     ./configuration.nix | ||||
|     ./hardware.nix | ||||
|     ./forgejo-runner.nix | ||||
|   ]; | ||||
| 
 | ||||
|   config = { | ||||
|     # uncomment for build check on non arm system (requires --impure) | ||||
|     # nixpkgs.buildPlatform = builtins.currentSystem; | ||||
|     services.tailscale.useRoutingFeatures = "both"; | ||||
|     system.autoUpgrade.allowReboot = true; | ||||
| 
 | ||||
|     users.users = { | ||||
|       root.openssh.authorizedKeys.keys = [ | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' | ||||
|       ]; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -1,21 +0,0 @@ | |||
| { ... }: | ||||
| { | ||||
|   # uncomment for build check on non arm system (requires --impure) | ||||
|   # nixpkgs.buildPlatform = builtins.currentSystem; | ||||
| 
 | ||||
|   services.tailscale.useRoutingFeatures = "both"; | ||||
| 
 | ||||
|   users.users = { | ||||
|     root.openssh.authorizedKeys.keys = [ | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' | ||||
|     ]; | ||||
|     #ronja.openssh.authorizedKeys.keys = [ | ||||
|     #  ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key'' | ||||
|     #]; | ||||
|   }; | ||||
| 
 | ||||
|   system.autoUpgrade.allowReboot = true; | ||||
| } | ||||
|  | @ -1,7 +1,27 @@ | |||
| { | ||||
|   imports = [ | ||||
|     ./configuration.nix | ||||
|     ./hardware.nix | ||||
|     ./nginx.nix | ||||
|   ]; | ||||
| 
 | ||||
|   config = { | ||||
|     # uncomment for build check on non arm system (requires --impure) | ||||
|     # nixpkgs.buildPlatform = builtins.currentSystem; | ||||
| 
 | ||||
|     services.tailscale.useRoutingFeatures = "both"; | ||||
| 
 | ||||
|     users.users = { | ||||
|       root.openssh.authorizedKeys.keys = [ | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf'' | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' | ||||
|         ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' | ||||
|       ]; | ||||
|       #ronja.openssh.authorizedKeys.keys = [ | ||||
|       #  ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key'' | ||||
|       #]; | ||||
|     }; | ||||
| 
 | ||||
|     system.autoUpgrade.allowReboot = true; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -1,26 +0,0 @@ | |||
| { | ||||
|   config, | ||||
|   pkgs, | ||||
|   ... | ||||
| }: | ||||
| { | ||||
|   # Configure keymap in X11 | ||||
|   services.xserver.xkb = { | ||||
|     layout = "de"; | ||||
|     variant = ""; | ||||
|   }; | ||||
| 
 | ||||
|   # Configure console keymap | ||||
|   console.keyMap = "de"; | ||||
| 
 | ||||
|   # List packages installed in system profile. To search, run: | ||||
|   # $ nix search wget | ||||
|   environment.systemPackages = with pkgs; [ | ||||
|     #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. | ||||
|     #  wget | ||||
|   ]; | ||||
| 
 | ||||
|   # Open ports in the firewall. | ||||
|   # networking.firewall.allowedTCPPorts = [ ... ]; | ||||
|   # networking.firewall.allowedUDPPorts = [ ... ]; | ||||
| } | ||||
|  | @ -1,6 +1,32 @@ | |||
| { | ||||
|   config, | ||||
|   pkgs, | ||||
|   ... | ||||
| }: | ||||
| { | ||||
|   imports = [ | ||||
|     ./configuration.nix | ||||
|     ./hardware.nix | ||||
|   ]; | ||||
| 
 | ||||
|   config = { | ||||
|     # Configure keymap in X11 | ||||
|     services.xserver.xkb = { | ||||
|       layout = "de"; | ||||
|       variant = ""; | ||||
|     }; | ||||
| 
 | ||||
|     # Configure console keymap | ||||
|     console.keyMap = "de"; | ||||
| 
 | ||||
|     # List packages installed in system profile. To search, run: | ||||
|     # $ nix search wget | ||||
|     environment.systemPackages = with pkgs; [ | ||||
|       #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. | ||||
|       #  wget | ||||
|     ]; | ||||
| 
 | ||||
|     # Open ports in the firewall. | ||||
|     # networking.firewall.allowedTCPPorts = [ ... ]; | ||||
|     # networking.firewall.allowedUDPPorts = [ ... ];}; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -1,45 +0,0 @@ | |||
| { ... }: | ||||
| { | ||||
|   imports = [ ./nginx.nix ]; | ||||
| 
 | ||||
|   config = { | ||||
|     nix.settings.extra-platforms = [ | ||||
|       "aarch64-linux" | ||||
|       "i686-linux" | ||||
|     ]; | ||||
| 
 | ||||
|     services.xserver.xkb = { | ||||
|       # Configure keymap in X11 | ||||
|       layout = "de"; | ||||
|       variant = ""; | ||||
|     }; | ||||
| 
 | ||||
|     # Configure console keymap | ||||
|     console.keyMap = "de"; | ||||
| 
 | ||||
|     users.users.vinzenz.openssh.authorizedKeys.keys = [ | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' | ||||
|     ]; | ||||
| 
 | ||||
|     #users.users.ronja.openssh.authorizedKeys.keys = [ | ||||
|     #  ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key'' | ||||
|     #]; | ||||
| 
 | ||||
|     programs = { | ||||
|       adb.enable = true; | ||||
|       light = { | ||||
|         enable = true; | ||||
|         brightnessKeys = { | ||||
|           enable = true; | ||||
|           step = 5; | ||||
|         }; | ||||
|       }; | ||||
|     }; | ||||
| 
 | ||||
|     networking.firewall.allowedTCPPorts = [ | ||||
|       8776 | ||||
|       1337 | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
|  | @ -1,6 +1,47 @@ | |||
| { | ||||
|   imports = [ | ||||
|     ./configuration.nix | ||||
|     ./hardware.nix | ||||
|     ./nginx.nix | ||||
|   ]; | ||||
| 
 | ||||
|   config = { | ||||
|     nix.settings.extra-platforms = [ | ||||
|       "aarch64-linux" | ||||
|       "i686-linux" | ||||
|     ]; | ||||
| 
 | ||||
|     services.xserver.xkb = { | ||||
|       # Configure keymap in X11 | ||||
|       layout = "de"; | ||||
|       variant = ""; | ||||
|     }; | ||||
| 
 | ||||
|     # Configure console keymap | ||||
|     console.keyMap = "de"; | ||||
| 
 | ||||
|     users.users.vinzenz.openssh.authorizedKeys.keys = [ | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' | ||||
|     ]; | ||||
| 
 | ||||
|     #users.users.ronja.openssh.authorizedKeys.keys = [ | ||||
|     #  ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key'' | ||||
|     #]; | ||||
| 
 | ||||
|     programs = { | ||||
|       adb.enable = true; | ||||
|       light = { | ||||
|         enable = true; | ||||
|         brightnessKeys = { | ||||
|           enable = true; | ||||
|           step = 5; | ||||
|         }; | ||||
|       }; | ||||
|     }; | ||||
| 
 | ||||
|     networking.firewall.allowedTCPPorts = [ | ||||
|       8776 | ||||
|       1337 | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -1,34 +0,0 @@ | |||
| { pkgs, ... }: | ||||
| { | ||||
|   nix.settings.extra-platforms = [ | ||||
|     "aarch64-linux" | ||||
|     "i686-linux" | ||||
|   ]; | ||||
| 
 | ||||
|   services.xserver.xkb = { | ||||
|     # Configure keymap in X11 | ||||
|     layout = "de"; | ||||
|     variant = ""; | ||||
|   }; | ||||
| 
 | ||||
|   # Configure console keymap | ||||
|   console.keyMap = "de"; | ||||
| 
 | ||||
|   users.users.vinzenz.openssh.authorizedKeys.keys = [ | ||||
|     ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming'' | ||||
|     ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|     ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' | ||||
|   ]; | ||||
| 
 | ||||
|   users.users.ronja.openssh.authorizedKeys.keys = [ | ||||
|     ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key'' | ||||
|     ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius'' | ||||
|   ]; | ||||
| 
 | ||||
|   environment.systemPackages = with pkgs; [ lact ]; | ||||
| 
 | ||||
|   networking.firewall.allowedUDPPorts = [ | ||||
|     # Factorio | ||||
|     34197 | ||||
|   ]; | ||||
| } | ||||
|  | @ -1,8 +1,42 @@ | |||
| { pkgs, ... }: | ||||
| { | ||||
|   imports = [ | ||||
|     ./configuration.nix | ||||
|     ./hardware.nix | ||||
|     ./vscode-server.nix | ||||
|     ./hass.nix | ||||
|   ]; | ||||
| 
 | ||||
|   config = { | ||||
|     nix.settings.extra-platforms = [ | ||||
|       "aarch64-linux" | ||||
|       "i686-linux" | ||||
|     ]; | ||||
| 
 | ||||
|     services.xserver.xkb = { | ||||
|       # Configure keymap in X11 | ||||
|       layout = "de"; | ||||
|       variant = ""; | ||||
|     }; | ||||
| 
 | ||||
|     # Configure console keymap | ||||
|     console.keyMap = "de"; | ||||
| 
 | ||||
|     users.users.vinzenz.openssh.authorizedKeys.keys = [ | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming'' | ||||
|     ]; | ||||
| 
 | ||||
|     users.users.ronja.openssh.authorizedKeys.keys = [ | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key'' | ||||
|       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius'' | ||||
|     ]; | ||||
| 
 | ||||
|     environment.systemPackages = with pkgs; [ lact ]; | ||||
| 
 | ||||
|     networking.firewall.allowedUDPPorts = [ | ||||
|       # Factorio | ||||
|       34197 | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Vinzenz Schroeter
						Vinzenz Schroeter