diff --git a/darwin/default.nix b/darwin/default.nix
index ba74608c..74c44bbd 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -12,7 +12,7 @@ builtins.listToAttrs (builtins.map (device: {
       system = device.system;
       modules = [
         {nixpkgs.overlays = overlays;}
-        ./configuration.nix
+        ./${device.name}/configuration.nix
         home-manager.darwinModules.home-manager
         {
           nixpkgs.config.allowUnfree = true;
diff --git a/darwin/configuration.nix b/darwin/kuro/configuration.nix
similarity index 85%
rename from darwin/configuration.nix
rename to darwin/kuro/configuration.nix
index 71607b86..c7829172 100644
--- a/darwin/configuration.nix
+++ b/darwin/kuro/configuration.nix
@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: {
-  imports = [./yabai.nix ./skhd.nix];
+  imports = [./services];
 
   # environment.systemPackages = with pkgs; [nix neovim];
   nix = {
@@ -11,8 +11,14 @@
       experimental-features = "nix-command flakes auto-allocate-uids";
       max-jobs = 8;
       trusted-users = ["root" "fs0c131y"];
-      substituters = ["https://sh.darksailor.dev"];
-      trusted-public-keys = ["mirai:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM="];
+      substituters = [
+        "https://nix-community.cachix.org"
+        "https://sh.darksailor.dev"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "mirai:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM="
+      ];
     };
     extraOptions = ''
       build-users-group = nixbld
@@ -53,7 +59,6 @@
   programs.fish.enable = true;
 
   services.nix-daemon.enable = true;
-  services.tailscale.enable = true;
   system.stateVersion = 4;
 
   system.keyboard.enableKeyMapping = true;
diff --git a/darwin/kuro/services/default.nix b/darwin/kuro/services/default.nix
new file mode 100644
index 00000000..b99c8d34
--- /dev/null
+++ b/darwin/kuro/services/default.nix
@@ -0,0 +1,7 @@
+{...}: {
+  imports = [
+    ./yabai.nix
+    ./skhd.nix
+    ./tailscale.nix
+  ];
+}
diff --git a/darwin/skhd.nix b/darwin/kuro/services/skhd.nix
similarity index 100%
rename from darwin/skhd.nix
rename to darwin/kuro/services/skhd.nix
diff --git a/darwin/kuro/services/tailscale.nix b/darwin/kuro/services/tailscale.nix
new file mode 100644
index 00000000..44ce5785
--- /dev/null
+++ b/darwin/kuro/services/tailscale.nix
@@ -0,0 +1,5 @@
+{...}: {
+  services.tailscale = {
+    enable = true;
+  };
+}
diff --git a/darwin/yabai.nix b/darwin/kuro/services/yabai.nix
similarity index 100%
rename from darwin/yabai.nix
rename to darwin/kuro/services/yabai.nix