Code refactor

machines/bomba/configuration.nix

@@ -8,18 +8,7 @@
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.efi.canTouchEfiVariables = true;
 
-	networking.networkmanager.enable = true;
-
 	time.timeZone = "Europe/Rome";
 
 	nixpkgs.config.allowUnfree = true;
-
-	services = {
-		openssh.enable = true;
-		udisks2.enable = true;
-	};
-
-	networking.firewall.allowedTCPPorts = [ 22 ];
-	networking.firewall.allowedUDPPorts = [ ];
-	networking.firewall.enable = true;
 }

machines/bomba/default.nix

@@ -3,6 +3,8 @@
 	imports = [ 
 		./configuration.nix
 		./hardware.nix
+		./networking.nix
+		./services.nix
 		./virtualisation.nix
 	];
 

machines/bomba/networking.nix

@@ -0,0 +1,11 @@
+{ ... }: 
+{
+	networking = {
+		networkmanager.enable = true;
+		firewall = { 
+			allowedTCPPorts = [ 22 ];
+			allowedUDPPorts = [ ];
+			enable = true;
+		};
+	};
+}

machines/bomba/services.nix

@@ -0,0 +1,6 @@
+{ ... }: 
+{
+	services = {
+		openssh.enable = true;
+	};
+}

machines/katana/networking.nix

@@ -1,12 +1,16 @@
 { ... }: 
 {
-	networking.networkmanager.enable = true;
-	networking.firewall = {
+	networking = {
+		networkmanager.enable = true;
+		wireguard.enable = true;
+		firewall = {
 			checkReversePath = false;
-		allowedUDPPorts = [ 25565 1194 ];
-		allowedTCPPorts = [ 25565 443 ];
+			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,7 +1,8 @@
 { config, ... }:
 {
-	hardware.graphics.enable = true;
-	hardware.nvidia = {
+	hardware = {
+		graphics.enable = true;
+		nvidia = {
 			modesetting.enable = true;	
 			package = config.boot.kernelPackages.nvidiaPackages.beta;
 			open = true;
@@ -15,4 +16,5 @@
 				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;
-
+	services = {
+		flatpak.enable = true;
+		printing.enable = true;
 		# Required for piper to work
-	services.ratbagd.enable = true;
+		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;
+	};
 }

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,10 +1,11 @@
 { ... }:
 {
-	services.flatpak.enable = true;
+	services = {
+		flatpak.enable = true;
 
 		# Enable CUPS to print documents.
-	services.printing.enable = true;
-	services.openssh = {
+		printing.enable = true;
+		openssh = {
 			enable = true;
 			ports = [ 22 ];
 			settings = {
@@ -12,4 +13,5 @@
 				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;
+	};
 }

modules/packages.nix

@@ -60,6 +60,7 @@
 		mpv
 		nextcloud-client
 		piper
+		spotube
 		telegram-desktop
 		thunderbird
 	] else [])