From 9b8a74aa60afc3e1769728571971dc9ad08152c3 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Thu, 5 Oct 2023 12:53:41 +0800
Subject: [PATCH] flake: seperate entrypoint from machines

---
 darwin/default.nix                          | 10 ++++++++++
 darwin/main.nix                             |  7 -------
 flake.nix                                   |  5 ++++-
 machines/darwin/imac-2017.nix               |  3 ---
 machines/nixos/81fw-lenovo-legion-y7000.nix |  2 --
 machines/nixos/imac-2017.nix                |  2 --
 6 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 darwin/default.nix

diff --git a/darwin/default.nix b/darwin/default.nix
new file mode 100644
index 0000000..c86e6fe
--- /dev/null
+++ b/darwin/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  imports = [
+    ./networking
+    ./packages
+    ./main.nix
+    ./input.nix
+  ];
+}
\ No newline at end of file
diff --git a/darwin/main.nix b/darwin/main.nix
index 14daa93..959e1a8 100644
--- a/darwin/main.nix
+++ b/darwin/main.nix
@@ -1,13 +1,6 @@
 { lib, pkgs, ... }:
 
 {
-  imports = [
-    ./networking
-    ./packages
-
-    ./input.nix
-  ];
-
   fonts.fonts = with pkgs; [
     (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; })
   ];
diff --git a/flake.nix b/flake.nix
index add207d..9956ed9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -44,6 +44,7 @@
       "iMac-macOS" = nix-darwin.lib.darwinSystem {
         system = "x86_64-darwin";
         modules = [
+          ./darwin
           ./machines/darwin/imac-2017.nix
           ./users/guanranwang/darwin.nix
           ./flakes/darwin/home-manager.nix
@@ -59,7 +60,8 @@
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          ./machines/nixos/81fw-lenovo-legion-y7000.nix # Entrypoint, this .nix file imports ./nixos
+          ./nixos # Entrypoint
+          ./machines/nixos/81fw-lenovo-legion-y7000.nix
           ./users/guanranwang/nixos.nix
           ./flakes/nixos/berberman.nix
           ./flakes/nixos/home-manager.nix
@@ -74,6 +76,7 @@
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
+          ./nixos
           ./machines/nixos/imac-2017.nix
           ./users/guanranwag/nixos.nix
           ./flakes/nixos/berberman.nix
diff --git a/machines/darwin/imac-2017.nix b/machines/darwin/imac-2017.nix
index 87b04c0..abc76a8 100644
--- a/machines/darwin/imac-2017.nix
+++ b/machines/darwin/imac-2017.nix
@@ -1,9 +1,6 @@
 { ... }:
 
 {
-  imports = [
-    ../../darwin/main.nix
-  ];
   networking.knownNetworkServices = [
     "Ethernet"
     "Wi-Fi"
diff --git a/machines/nixos/81fw-lenovo-legion-y7000.nix b/machines/nixos/81fw-lenovo-legion-y7000.nix
index c10c3e0..2915788 100755
--- a/machines/nixos/81fw-lenovo-legion-y7000.nix
+++ b/machines/nixos/81fw-lenovo-legion-y7000.nix
@@ -2,8 +2,6 @@
 
 {
   imports = [
-    ../../nixos
-
     ./hardware/misc/audio.nix
     ./hardware/misc/bluetooth.nix
     ./hardware/misc/opengl.nix
diff --git a/machines/nixos/imac-2017.nix b/machines/nixos/imac-2017.nix
index 34e5444..d95cfd2 100755
--- a/machines/nixos/imac-2017.nix
+++ b/machines/nixos/imac-2017.nix
@@ -2,8 +2,6 @@
 
 {
   imports = [
-    ../../nixos
-
     ./hardware/misc/audio.nix
     ./hardware/misc/bluetooth.nix
     ./hardware/misc/opengl.nix