From 5b8781694711a167aad62bd2915aa1055eccf069 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 29 Jan 2024 08:18:06 +0800
Subject: [PATCH] treewide: modules: simplify

---
 darwin/modules/default.nix                             |  4 ++--
 darwin/modules/networking/default.nix                  |  5 -----
 .../networking/{proxy/default.nix => proxy.nix}        |  0
 .../modules/services/{clash/default.nix => clash.nix}  |  0
 darwin/modules/services/default.nix                    |  5 -----
 nixos/modules/default.nix                              | 10 ++++++++--
 nixos/modules/myFlake/{boot => }/boot.nix              |  0
 nixos/modules/myFlake/boot/default.nix                 |  5 -----
 nixos/modules/myFlake/default.nix                      |  6 ------
 nixos/modules/myFlake/hardware/accessories/default.nix |  7 -------
 nixos/modules/myFlake/hardware/components/default.nix  |  7 -------
 nixos/modules/myFlake/hardware/default.nix             |  6 ------
 nixos/modules/services/default.nix                     |  5 -----
 13 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 darwin/modules/networking/default.nix
 rename darwin/modules/networking/{proxy/default.nix => proxy.nix} (100%)
 rename darwin/modules/services/{clash/default.nix => clash.nix} (100%)
 delete mode 100644 darwin/modules/services/default.nix
 rename nixos/modules/myFlake/{boot => }/boot.nix (100%)
 delete mode 100644 nixos/modules/myFlake/boot/default.nix
 delete mode 100644 nixos/modules/myFlake/default.nix
 delete mode 100644 nixos/modules/myFlake/hardware/accessories/default.nix
 delete mode 100644 nixos/modules/myFlake/hardware/components/default.nix
 delete mode 100644 nixos/modules/myFlake/hardware/default.nix
 delete mode 100755 nixos/modules/services/default.nix

diff --git a/darwin/modules/default.nix b/darwin/modules/default.nix
index 4a9b810..f2041a9 100644
--- a/darwin/modules/default.nix
+++ b/darwin/modules/default.nix
@@ -1,6 +1,6 @@
 {...}: {
   imports = [
-    ./networking
-    ./services
+    ./networking/proxy.nix
+    ./services/clash.nix
   ];
 }
diff --git a/darwin/modules/networking/default.nix b/darwin/modules/networking/default.nix
deleted file mode 100644
index a2cf971..0000000
--- a/darwin/modules/networking/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./proxy
-  ];
-}
diff --git a/darwin/modules/networking/proxy/default.nix b/darwin/modules/networking/proxy.nix
similarity index 100%
rename from darwin/modules/networking/proxy/default.nix
rename to darwin/modules/networking/proxy.nix
diff --git a/darwin/modules/services/clash/default.nix b/darwin/modules/services/clash.nix
similarity index 100%
rename from darwin/modules/services/clash/default.nix
rename to darwin/modules/services/clash.nix
diff --git a/darwin/modules/services/default.nix b/darwin/modules/services/default.nix
deleted file mode 100644
index 044fd10..0000000
--- a/darwin/modules/services/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./clash
-  ];
-}
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index 9dd373f..3729419 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -1,9 +1,15 @@
 {...}: {
   imports = [
     # utils that is used internally
-    ./myFlake
+    ./myFlake/boot.nix
+    ./myFlake/hardware/accessories/logitech-wireless.nix
+    ./myFlake/hardware/accessories/piper.nix
+    ./myFlake/hardware/accessories/xbox-one-controller.nix
+    ./myFlake/hardware/components/audio.nix
+    ./myFlake/hardware/components/bluetooth.nix
+    ./myFlake/hardware/components/tpm.nix
 
     # nixpkgs styled options
-    ./services
+    ./services/clash.nix
   ];
 }
diff --git a/nixos/modules/myFlake/boot/boot.nix b/nixos/modules/myFlake/boot.nix
similarity index 100%
rename from nixos/modules/myFlake/boot/boot.nix
rename to nixos/modules/myFlake/boot.nix
diff --git a/nixos/modules/myFlake/boot/default.nix b/nixos/modules/myFlake/boot/default.nix
deleted file mode 100644
index 99a4a16..0000000
--- a/nixos/modules/myFlake/boot/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./boot.nix
-  ];
-}
diff --git a/nixos/modules/myFlake/default.nix b/nixos/modules/myFlake/default.nix
deleted file mode 100644
index e1e327f..0000000
--- a/nixos/modules/myFlake/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./boot
-    ./hardware
-  ];
-}
diff --git a/nixos/modules/myFlake/hardware/accessories/default.nix b/nixos/modules/myFlake/hardware/accessories/default.nix
deleted file mode 100644
index 084d0c8..0000000
--- a/nixos/modules/myFlake/hardware/accessories/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  imports = [
-    ./logitech-wireless.nix
-    ./piper.nix
-    ./xbox-one-controller.nix
-  ];
-}
diff --git a/nixos/modules/myFlake/hardware/components/default.nix b/nixos/modules/myFlake/hardware/components/default.nix
deleted file mode 100644
index ca4fda4..0000000
--- a/nixos/modules/myFlake/hardware/components/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  imports = [
-    ./audio.nix
-    ./bluetooth.nix
-    ./tpm.nix
-  ];
-}
diff --git a/nixos/modules/myFlake/hardware/default.nix b/nixos/modules/myFlake/hardware/default.nix
deleted file mode 100644
index 71d00cb..0000000
--- a/nixos/modules/myFlake/hardware/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./accessories
-    ./components
-  ];
-}
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
deleted file mode 100755
index ac1fa35..0000000
--- a/nixos/modules/services/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./clash.nix
-  ];
-}