flake: cleanup and add hostname definition

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "all this does now is pass inputs to other modules and set the system variable";
+  description = "My configuration(s) for the NixOS Linux Distribution";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
@@ -39,18 +39,21 @@
   outputs = inputs@{ ... }:
     let
       system = inputs.nixpkgs.lib.mkDefault "x86_64-linux";
-      nixosSystem =
+      mkHost =
         hostName:
         inputs.nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit hostName inputs system; };
+          specialArgs = { inherit inputs system; };
-          modules = [ ./hosts/${hostName} ];
+          modules = [
+            { networking.hostName = hostName; }
+            ./hosts/${hostName}
+          ];
         };
     in {
       nixosConfigurations = {
-        Swordsmachine = nixosSystem "Swordsmachine";
+        Swordsmachine = mkHost "Swordsmachine";
-        Earthmover = nixosSystem "Earthmover";
+        Earthmover = mkHost "Earthmover";
-        Drone = nixosSystem "Drone";
+        Drone = mkHost "Drone";
-        Mindflayer = nixosSystem "Mindflayer";
+        Mindflayer = mkHost "Mindflayer";
       };
   };
 }

hosts/Drone/default.nix

@@ -1,4 +1,4 @@
-{ hostName, inputs, config, lib, pkgs, ... }:
+{ inputs, config, lib, pkgs, ... }:
 
 {
   imports = [
@@ -60,14 +60,11 @@
 
   services.zfs.autoScrub.enable = true;
 
-  networking = {
+  networking.firewall = lib.mkForce {
-    hostName = "${hostName}";
+    allowedTCPPorts = [];
-    firewall = lib.mkForce {
+    allowedTCPPortRanges = [];
-      allowedTCPPorts = [];
+    allowedUDPPorts = [];
-      allowedTCPPortRanges = [];
+    allowedUDPPortRanges = [];
-      allowedUDPPorts = [];
-      allowedUDPPortRanges = [];
-    };
   };
 
   # for cloudflare browser ssh

modules/common/default.nix

@@ -1,11 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ config, ... }:
 
 {
   imports = [
     ./boot.nix
     ./default-packages.nix
     ./locales.nix
-    ./networking.nix
     ./nix.nix
     ./users.nix
   ];

modules/common/networking.nix

@@ -1,5 +0,0 @@
-{ hostName, config, ... }:
-
-{
-  networking.hostName = "${hostName}";
-}

modules/common/users.nix

@@ -1,9 +1,9 @@
-{ hostName, config, ... }:
+{ config, ... }:
 
 {
   users.users.wo2w = {
     isNormalUser = true;
-    description = "${hostName}";
+    description = config.networking.hostName;
     extraGroups = [ "networkmanager" "wheel" ];
 
     # make new user logins (iso/vm/new machine) use a default password