Code refactor

machines/workstation/default.nix

@@ -9,8 +9,10 @@
 
 	networking.hostName = "workstation"; # Define your hostname.
 
-	boot.loader.systemd-boot.enable = true;
-  	boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader = {
+		systemd-boot.enable = true;
+		efi.canTouchEfiVariables = true;
+	};
 
 	system.stateVersion = "24.11"; # Did you read the comment?
 }

machines/workstation/networking.nix

@@ -1,16 +1,9 @@
 { ... }: 
 {
-	networking.networkmanager.enable = true;
-	networking.firewall.allowedUDPPorts = [ 8000 23 ];
-	networking.firewall.allowedTCPPorts = [ 8000 23 ];
-	# networking.bridges = {
-	# 	"br0" = {
-	# 		interfaces = [ "eno1" ];
-	# 	};
-	# };
-	# networking.interfaces.br0.ipv4.addresses = [{
-	# 	address = "192.168.1.235";
-	# 	prefixLength = 24;
-	# }];
-	networking.nameservers = [ "1.1.1.1" "1.0.0.1" ];
+	networking = {
+		networkmanager.enable = true;
+		firewall.allowedUDPPorts = [ 8000 ];
+		firewall.allowedTCPPorts = [ 8000 ];
+		nameservers = [ "1.1.1.1" "1.0.0.1" ];
+	};
 }

machines/workstation/services.nix

@@ -1,15 +1,17 @@
 { ... }:
 {
-	services.flatpak.enable = true;
+	services = {
+		flatpak.enable = true;
 
-	# Enable CUPS to print documents.
-	services.printing.enable = true;
-	services.openssh = {
-		enable = true;
-		ports = [ 22 ];
-		settings = {
-			PasswordAuthentication = true;
-			PermitRootLogin = "no";
+		# Enable CUPS to print documents.
+		printing.enable = true;
+		openssh = {
+			enable = true;
+			ports = [ 22 ];
+			settings = {
+				PasswordAuthentication = true;
+				PermitRootLogin = "no";
+			};
 		};
 	};
 }

machines/workstation/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;
+	};
 }