diff --git a/flake.nix b/flake.nix
index 7456076..f76cfb5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,7 +88,7 @@
           modules = [
             home-manager.darwinModules.home-manager
             ./machines/common.nix
-            ./machines/sashimi/darwin.nix
+            ./machines/sashimi
 
             ({config, ...}: {
               config = {
diff --git a/machines/sashimi/darwin.nix b/machines/sashimi/default.nix
similarity index 69%
rename from machines/sashimi/darwin.nix
rename to machines/sashimi/default.nix
index e560a7f..850d53f 100644
--- a/machines/sashimi/darwin.nix
+++ b/machines/sashimi/default.nix
@@ -4,15 +4,21 @@
   pkgs,
   ...
 }: {
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  users.users.winston.home = "/Users/winston";
-
   imports = [
     ./brew.nix
     ./wm.nix
   ];
 
+  users.users.winston.home = "/Users/winston";
+
+  networking = let
+    name = "sashimi";
+  in {
+    computerName = name;
+    hostName = name;
+    localHostName = name;
+  };
+
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system.stateVersion = 4;
@@ -26,5 +32,7 @@
       addresses."test" = "127.0.0.1";
       bind = "127.0.0.1";
     };
+    # Auto upgrade nix package and the daemon service.
+    nix-daemon.enable = true;
   };
 }