Compare commits
	
		
			No commits in common. "9cc07cdfaffb46dc3ef973967de8704e81d902ec" and "e1cc2342b24a0d6e07901dc9c273f3e2ce8d39de" have entirely different histories.
		
	
	
		
			9cc07cdfaf
			...
			e1cc2342b2
		
	
		
| @ -8,28 +8,18 @@ | ||||
|   networking.hostName = "20212060"; | ||||
| 
 | ||||
|   # Admin users | ||||
|   users.users.jan.extraGroups = [ | ||||
|     "wheel" | ||||
|     "wireshark" | ||||
|   ]; | ||||
|   users.users.jan.extraGroups = [ "wheel" ]; | ||||
| 
 | ||||
|   # Enable virtualisation for VMs | ||||
|   virtualisation.libvirtd.enable = true; | ||||
| 
 | ||||
|   # Enable wireshark | ||||
|   programs.wireshark = { | ||||
|     enable = true; | ||||
|     dumpcap.enable = true; | ||||
|     usbmon.enable = true; | ||||
|   }; | ||||
| 
 | ||||
|   # Set up wstunnel client | ||||
|   services.wstunnel = { | ||||
|     enable = true; | ||||
|     clients.wg-tunnel = { | ||||
|       connectTo = "wss://tunnel.bulthuis.dev:443"; | ||||
|       localToRemote = [ | ||||
|         "udp://51820:10.10.40.100:51820?timeout_sec=0" | ||||
|         "udp://51820:10.10.40.100:51820" | ||||
|       ]; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
| @ -1,44 +0,0 @@ | ||||
| { | ||||
|   lib, | ||||
|   pkgs, | ||||
|   config, | ||||
|   inputs, | ||||
|   ... | ||||
| }: | ||||
| 
 | ||||
| { | ||||
|   # State version | ||||
|   system.stateVersion = "24.11"; | ||||
| 
 | ||||
|   # Import the nix-minecraft modules | ||||
|   imports = [ | ||||
|     inputs.nix-minecraft.nixosModules.minecraft-servers | ||||
|   ]; | ||||
| 
 | ||||
|   # Machine hostname | ||||
|   networking.hostName = "vm-minecraft"; | ||||
| 
 | ||||
|   # Enabled modules | ||||
|   modules = { | ||||
|     profiles.vm.enable = true; | ||||
|   }; | ||||
| 
 | ||||
|   # Set up minecraft servers | ||||
|   services.minecraft-servers = { | ||||
|     enable = true; | ||||
|     eula = true; | ||||
|     openFirewall = true; | ||||
|     servers = { | ||||
|       modpack = { | ||||
|         enable = true; | ||||
|         autoStart = true; | ||||
|         serverProperties = { }; | ||||
|         package = inputs.nix-modpack.packages.${pkgs.system}.mkModpackServer { | ||||
|           packUrl = "https://raw.githubusercontent.com/Jan-Bulthuis/Modpack/refs/heads/master/pack.toml"; | ||||
|           server = inputs.nix-minecraft.legacyPackages.${pkgs.system}.neoForgeServers.neoforge-20_1_106; | ||||
|         }; | ||||
|         jvmOpts = "-Xms6144M -Xmx8192M"; | ||||
|       }; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
| @ -1,7 +0,0 @@ | ||||
| { ... }: | ||||
| 
 | ||||
| { | ||||
|   home.stateVersion = "24.11"; | ||||
| 
 | ||||
|   modules.profiles.base.enable = true; | ||||
| } | ||||
| @ -38,7 +38,6 @@ in | ||||
|       bottles | ||||
|       prismlauncher | ||||
|       foliate | ||||
|       wireshark | ||||
|     ]; | ||||
| 
 | ||||
|     modules = { | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user