treewide: ./{darwin,nixos}/hosts -> ./hosts

README.md

@@ -7,12 +7,14 @@ It just works™
 ```
  .
 │   # Darwin configuration is not actively maintained and sometimes it might break.
+├── 󱂵 home
 ├──  darwin
 ├──  nixos
 │  ├──  hosts
 │  ├──  modules
 │  └──  profiles
 │ 
+├──  hosts
 ├──  flake.nix
 ├──  flake.lock
 │

flake.nix

@@ -182,12 +182,12 @@
 
     ### NixOS
     nixosConfigurations = {
-      "Aristotle" = mkNixOS "x86_64-linux" [./nixos/hosts/Aristotle];
+      "Aristotle" = mkNixOS "x86_64-linux" [./hosts/Aristotle];
     };
 
     ### Darwin
     darwinConfigurations = {
-      "Plato" = mkDarwin "x86_64-darwin" [./darwin/hosts/Plato];
+      "Plato" = mkDarwin "x86_64-darwin" [./hosts/Plato];
     };
   };
 }

hosts/Aristotle/default.nix

@@ -0,0 +1,20 @@
+{...}: {
+  imports = [
+    # OS
+    ../../nixos/profiles/laptop
+    ../../nixos/profiles/common/opt-in/zram-generator.nix
+    ../../nixos/profiles/common/opt-in/clash-meta-client
+    ../../nixos/profiles/common/opt-in/gaming
+    ../../nixos/profiles/common/opt-in/torrenting
+
+    # Hardware
+    ./hardware-configuration.nix
+    ../../nixos/profiles/common/opt-in/lanzaboote.nix
+    ../../nixos/profiles/common/opt-in/impermanence.nix
+    ../../nixos/profiles/common/opt-in/disko.nix
+  ];
+
+  networking.hostName = "Aristotle";
+  time.timeZone = "Asia/Shanghai";
+  _module.args.disks = ["/dev/nvme0n1"]; # Disko
+}

hosts/Plato/default.nix

@@ -1,8 +1,8 @@
 # iMac 18,3 (2017)
 {...}: {
   imports = [
-    ../../profiles/desktop
-    ../../profiles/common/opt-in/clash-meta-client.nix
+    ../../darwin/profiles/desktop
+    ../../darwin/profiles/common/opt-in/clash-meta-client.nix
 
     ./hardware-configuration.nix
   ];

nixos/hosts/Aristotle/default.nix

@@ -1,20 +0,0 @@
-{...}: {
-  imports = [
-    # OS
-    ../../profiles/laptop
-    ../../profiles/common/opt-in/zram-generator.nix
-    ../../profiles/common/opt-in/clash-meta-client
-    ../../profiles/common/opt-in/gaming
-    ../../profiles/common/opt-in/torrenting
-
-    # Hardware
-    ./hardware-configuration.nix
-    ../../profiles/common/opt-in/lanzaboote.nix
-    ../../profiles/common/opt-in/impermanence.nix
-    ../../profiles/common/opt-in/disko.nix
-  ];
-
-  networking.hostName = "Aristotle";
-  time.timeZone = "Asia/Shanghai";
-  _module.args.disks = ["/dev/nvme0n1"]; # Disko
-}