diff --git a/hosts/servers/default.nix b/hosts/servers/default.nix
index 6d27012..3ab6c7e 100644
--- a/hosts/servers/default.nix
+++ b/hosts/servers/default.nix
@@ -28,19 +28,6 @@
     };
   };
 
-  system.autoUpgrade = {
-    enable = true;
-    flake = inputs.self.outPath;
-    flags = [
-      "--update-input"
-      "nixpkgs"
-      "-L"
-    ];
-    dates = "Sat *-*-* 06:00:00";
-    randomizedDelaySec = "45min";
-    allowReboot = true;
-  };
-
   security = {
     sudo.enable = lib.mkDefault false;
     doas = {
@@ -55,8 +42,26 @@
     polkit.enable = true;
   };
 
+  networking = {
+    firewall.enable = true;
+    networkmanager.enable = true;
+  };
+
   time.timeZone = "America/Detroit";
 
+  system.autoUpgrade = {
+    enable = true;
+    flake = inputs.self.outPath;
+    flags = [
+      "--update-input"
+      "nixpkgs"
+      "-L"
+    ];
+    dates = "Sat *-*-* 06:00:00";
+    randomizedDelaySec = "45min";
+    allowReboot = true;
+  };
+
   programs = {
     git.enable = true;
     htop.enable = true;
diff --git a/hosts/servers/eden/default.nix b/hosts/servers/eden/default.nix
index 7d3d138..b2154b0 100644
--- a/hosts/servers/eden/default.nix
+++ b/hosts/servers/eden/default.nix
@@ -15,7 +15,6 @@
   networking = {
     hostId = "bd03847d"; # Required for ZFS support.
     hostName = "eden";
-    networkmanager.enable = true;
   };
 
   motd = {
diff --git a/hosts/servers/hive/default.nix b/hosts/servers/hive/default.nix
index 9170487..0f61645 100644
--- a/hosts/servers/hive/default.nix
+++ b/hosts/servers/hive/default.nix
@@ -9,10 +9,7 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName = "hive";
-    networkmanager.enable = true;
-  };
+  networking.hostName = "hive";
 
   motd = {
     networkInterfaces = lib.lists.singleton "eno1";
diff --git a/hosts/servers/oasis/default.nix b/hosts/servers/oasis/default.nix
index fa55903..a859c5d 100644
--- a/hosts/servers/oasis/default.nix
+++ b/hosts/servers/oasis/default.nix
@@ -15,7 +15,6 @@
   networking = {
     hostId = "7a7d723a"; # Required for ZFS support.
     hostName = "oasis";
-    networkmanager.enable = true;
   };
 
   motd = {
diff --git a/hosts/servers/raindog/default.nix b/hosts/servers/raindog/default.nix
index 84a194f..308c854 100644
--- a/hosts/servers/raindog/default.nix
+++ b/hosts/servers/raindog/default.nix
@@ -9,10 +9,7 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName = "raindog";
-    networkmanager.enable = true;
-  };
+  networking.hostName = "raindog";
 
   motd = {
     networkInterfaces = lib.lists.singleton "eno1";
diff --git a/hosts/workstations/default.nix b/hosts/workstations/default.nix
index 5600da0..5984259 100644
--- a/hosts/workstations/default.nix
+++ b/hosts/workstations/default.nix
@@ -42,6 +42,11 @@
     polkit.enable = true;
   };
 
+  networking = {
+    firewall.enable = true;
+    networkmanager.enable = true;
+  };
+
   time.timeZone = "America/Detroit";
 
   hardware.graphics.enable32Bit = true;
diff --git a/hosts/workstations/sparrow/default.nix b/hosts/workstations/sparrow/default.nix
index aa477b7..212e238 100644
--- a/hosts/workstations/sparrow/default.nix
+++ b/hosts/workstations/sparrow/default.nix
@@ -9,10 +9,7 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName = "sparrow";
-    networkmanager.enable = true;
-  };
+  networking.hostName = "sparrow";
 
   services = {
     xserver.xkb.options = "ctrl:swapcaps";
diff --git a/hosts/workstations/woodpecker/default.nix b/hosts/workstations/woodpecker/default.nix
index 1c4a52a..2a13891 100644
--- a/hosts/workstations/woodpecker/default.nix
+++ b/hosts/workstations/woodpecker/default.nix
@@ -9,10 +9,7 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName = "woodpecker";
-    networkmanager.enable = true;
-  };
+  networking.hostName = "woodpecker";
 
   environment.systemPackages = with pkgs; [
     mesa