4 files changed, 4 insertions, 5 deletions
diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index e5bdc60..3c3727b 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -8,6 +8,9 @@
   ];
 
   config = {
+    networking.hostName = "himeji";
+    system.stateVersion = "24.05";
+
     modules = {
       nix.extend = false;
 
@@ -20,7 +23,5 @@
         ];
       };
     };
-
-    system.stateVersion = "24.05";
   };
 }
diff --git a/hosts/kansai/default.nix b/hosts/kansai/default.nix
index ebca9a8..164f0d5 100644
--- a/hosts/kansai/default.nix
+++ b/hosts/kansai/default.nix
@@ -6,5 +6,6 @@
     ../../modules/options
   ];
 
+  networking.hostName = "kansai";
   system.stateVersion = "24.05";
 }
diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix
index a848e1c..e6f5b03 100644
--- a/modules/desktop/networking/default.nix
+++ b/modules/desktop/networking/default.nix
@@ -18,6 +18,4 @@
 
   # https://discourse.nixos.org/t/how-to-disable-networkmanager-wait-online-service-in-the-configuration-file/19963/2
   systemd.services.NetworkManager-wait-online.enable = false;
-
-  networking.hostName = "kansai";
 }
diff --git a/modules/server/networking/default.nix b/modules/server/networking/default.nix
index 3706116..386e961 100644
--- a/modules/server/networking/default.nix
+++ b/modules/server/networking/default.nix
@@ -5,7 +5,6 @@
   ];
 
   networking = {
-    hostName = "himeji";
     domain = "";
 
     firewall = {