diff --git a/darwin/systems/sumireko.nix b/darwin/systems/sumireko.nix
new file mode 100644
index 00000000..efe70297
--- /dev/null
+++ b/darwin/systems/sumireko.nix
@@ -0,0 +1,2 @@
+{ config, ... }: {
+}
diff --git a/default.nix b/default.nix
index e1c41ca5..1b5bafa7 100644
--- a/default.nix
+++ b/default.nix
@@ -1,2 +1,30 @@
-{ inputs }: {
+{ nixpkgs, darwin, ... }@inputs: let
+  tree = (inputs.tree.tree {
+    inherit inputs;
+    folder = ./.;
+    config = {
+      "/" = {
+        excludes = [
+          "flake"
+          "default"
+        ];
+      };
+    };
+  }).impure;
+  lib = inputs.nixpkgs.lib;
+  inherit (lib.attrsets) mapAttrs;
+in {
+  inherit tree;
+  nixosConfigurations = mapAttrs (name: path: nixpkgs.lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [
+      path
+    ];
+    } ) tree.nixos.systems;
+  darwinConfigurations = mapAttrs (name: path: darwin.lib.darwinSystem {
+    system = "x86_64-linux";
+    modules = [
+      path
+    ];
+    } ) tree.darwin.systems;
 }
diff --git a/flake.lock b/flake.lock
index 7ba75ae7..0bf55d7f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1668784520,
+        "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -37,27 +58,6 @@
         "type": "github"
       }
     },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1668784520,
-        "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1669791787,
@@ -76,9 +76,9 @@
     },
     "root": {
       "inputs": {
+        "darwin": "darwin",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs",
         "tree": "tree"
       }
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669922156,
-        "narHash": "sha256-KT3ztF5pG66tK/Abm9bmQW7ZXiG5SCP2hKDG8LoqOsQ=",
+        "lastModified": 1669922720,
+        "narHash": "sha256-xzoKL4RtKRECdrWHAM14OBaNdJRToc+AA9zmUWuo5eY=",
         "owner": "kittywitch",
         "repo": "tree",
-        "rev": "0b70e9abe81005a39351ff7341d4adb5b37bc6fe",
+        "rev": "fbe8ae96d7f4fb369d32dbbe8434606b23354caf",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a898021d..be742d2a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-darwin = {
+    darwin = {
       url = "github:lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -16,5 +16,5 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = { ... }@inputs: import ./default.nix { inherit inputs; };
+  outputs = { ... }@inputs: import ./default.nix inputs;
 }
diff --git a/nixos/systems/koishi.nix b/nixos/systems/koishi.nix
new file mode 100644
index 00000000..efe70297
--- /dev/null
+++ b/nixos/systems/koishi.nix
@@ -0,0 +1,2 @@
+{ config, ... }: {
+}