Code refactor

machines/katana/networking.nix

@@ -1,12 +1,16 @@
 { ... }: 
 {
-	networking.networkmanager.enable = true;
-	networking.firewall = {
-		checkReversePath = false;
-		allowedUDPPorts = [ 25565 1194 ];
-		allowedTCPPorts = [ 25565 443 ];
+	networking = {
+		networkmanager.enable = true;
+		wireguard.enable = true;
+		firewall = {
+			checkReversePath = false;
+			allowedUDPPorts = [ 25565 ];
+			allowedTCPPorts = [ 25565 ];
+		};
+	};
+	hardware.bluetooth = {
+		enable = true;	
+		powerOnBoot = true;
 	};
-	hardware.bluetooth.enable = true;
-	hardware.bluetooth.powerOnBoot = true;
-	networking.wireguard.enable = true;
 }

machines/katana/nvidia.nix

@@ -1,18 +1,20 @@
 { config, ... }:
 {
-	hardware.graphics.enable = true;
-	hardware.nvidia = {
-		modesetting.enable = true;	
-		package = config.boot.kernelPackages.nvidiaPackages.beta;
-		open = true;
-		prime = {
-			offload = {
-				enable = true;
-				enableOffloadCmd = true;
-			};
+	hardware = {
+		graphics.enable = true;
+		nvidia = {
+			modesetting.enable = true;	
+			package = config.boot.kernelPackages.nvidiaPackages.beta;
+			open = true;
+			prime = {
+				offload = {
+					enable = true;
+					enableOffloadCmd = true;
+				};
 
-			intelBusId = "PCI:0:2:0";
-			nvidiaBusId = "PCI:1:0:0";
+				intelBusId = "PCI:0:2:0";
+				nvidiaBusId = "PCI:1:0:0";
+			};
 		};
 	};
 }

machines/katana/services.nix

@@ -1,11 +1,10 @@
 { ... }:
 {
-	services.flatpak.enable = true;
-	services.xserver.videoDrivers = ["nvidia"];
-
-	# Enable CUPS to print documents.
-	services.printing.enable = true;
-
-	# Required for piper to work
-	services.ratbagd.enable = true;
+	services = {
+		flatpak.enable = true;
+		printing.enable = true;
+		# Required for piper to work
+		ratbagd.enable = true;
+		xserver.videoDrivers = ["nvidia"];
+	};
 }

machines/katana/virtualisation.nix

@@ -1,11 +1,10 @@
 { currentSystemUser, ... }:
 {
-	# virtualisation.podman.enable = true;
-	# virtualisation.podman.dockerCompat = true;
-	virtualisation.docker.enable = true;
-	#
 	programs.virt-manager.enable = true;
 	users.groups.libvirtd.members = ["${currentSystemUser}"];
-	virtualisation.libvirtd.enable = true;
-	virtualisation.spiceUSBRedirection.enable = true;
+	virtualisation = {
+		docker.enable = true;
+		libvirtd.enable = true;
+		spiceUSBRedirection.enable = true;
+	};
 }