From 181ea090922589d9e4067ef2f24c59aa56cbe6e9 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 16 Jun 2023 08:12:58 -0400
Subject: [PATCH] meta: Use separate directory for home-manager modules

---
 containers/dev.nix                          |  2 +-
 home/default.nix                            | 16 ++++++++++++++++
 {modules => home}/dunst/default.nix         |  0
 {modules => home}/feh/default.nix           |  0
 {modules => home}/git/default.nix           |  0
 {modules => home}/gpg/default.nix           |  0
 {modules => home}/kitty/default.nix         |  0
 {modules => home}/mime-apps/default.nix     |  0
 {modules => home}/mpv/default.nix           |  0
 {modules => home}/ncmpcpp/default.nix       |  0
 {modules => home}/ncmpcpp/on-song-change.sh |  0
 {modules => home}/qutebrowser/default.nix   |  0
 {modules => home}/rofi/default.nix          |  0
 {modules => home}/rofi/launchpad.rasi       |  0
 {modules => home}/waybar/default.nix        |  0
 {modules => home}/zathura/default.nix       |  0
 modules/default.nix                         | 15 ---------------
 src/main.nix                                |  1 +
 tests/main.cr                               |  1 +
 19 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 home/default.nix
 rename {modules => home}/dunst/default.nix (100%)
 rename {modules => home}/feh/default.nix (100%)
 rename {modules => home}/git/default.nix (100%)
 rename {modules => home}/gpg/default.nix (100%)
 rename {modules => home}/kitty/default.nix (100%)
 rename {modules => home}/mime-apps/default.nix (100%)
 rename {modules => home}/mpv/default.nix (100%)
 rename {modules => home}/ncmpcpp/default.nix (100%)
 rename {modules => home}/ncmpcpp/on-song-change.sh (100%)
 rename {modules => home}/qutebrowser/default.nix (100%)
 rename {modules => home}/rofi/default.nix (100%)
 rename {modules => home}/rofi/launchpad.rasi (100%)
 rename {modules => home}/waybar/default.nix (100%)
 rename {modules => home}/zathura/default.nix (100%)

diff --git a/containers/dev.nix b/containers/dev.nix
index 3591530d..a622cf07 100644
--- a/containers/dev.nix
+++ b/containers/dev.nix
@@ -24,7 +24,7 @@ in
       ];
 
       home-manager.sharedModules = [
-        ../modules/git
+        ../home/git
       ];
 
       users = {
diff --git a/home/default.nix b/home/default.nix
new file mode 100644
index 00000000..cd80e508
--- /dev/null
+++ b/home/default.nix
@@ -0,0 +1,16 @@
+{
+  home-manager.sharedModules = [
+    ./dunst
+    ./feh
+    ./git
+    ./gpg
+    ./kitty
+    ./mime-apps
+    ./mpv
+    ./ncmpcpp
+    ./qutebrowser
+    ./rofi
+    ./waybar
+    ./zathura
+  ];
+}
diff --git a/modules/dunst/default.nix b/home/dunst/default.nix
similarity index 100%
rename from modules/dunst/default.nix
rename to home/dunst/default.nix
diff --git a/modules/feh/default.nix b/home/feh/default.nix
similarity index 100%
rename from modules/feh/default.nix
rename to home/feh/default.nix
diff --git a/modules/git/default.nix b/home/git/default.nix
similarity index 100%
rename from modules/git/default.nix
rename to home/git/default.nix
diff --git a/modules/gpg/default.nix b/home/gpg/default.nix
similarity index 100%
rename from modules/gpg/default.nix
rename to home/gpg/default.nix
diff --git a/modules/kitty/default.nix b/home/kitty/default.nix
similarity index 100%
rename from modules/kitty/default.nix
rename to home/kitty/default.nix
diff --git a/modules/mime-apps/default.nix b/home/mime-apps/default.nix
similarity index 100%
rename from modules/mime-apps/default.nix
rename to home/mime-apps/default.nix
diff --git a/modules/mpv/default.nix b/home/mpv/default.nix
similarity index 100%
rename from modules/mpv/default.nix
rename to home/mpv/default.nix
diff --git a/modules/ncmpcpp/default.nix b/home/ncmpcpp/default.nix
similarity index 100%
rename from modules/ncmpcpp/default.nix
rename to home/ncmpcpp/default.nix
diff --git a/modules/ncmpcpp/on-song-change.sh b/home/ncmpcpp/on-song-change.sh
similarity index 100%
rename from modules/ncmpcpp/on-song-change.sh
rename to home/ncmpcpp/on-song-change.sh
diff --git a/modules/qutebrowser/default.nix b/home/qutebrowser/default.nix
similarity index 100%
rename from modules/qutebrowser/default.nix
rename to home/qutebrowser/default.nix
diff --git a/modules/rofi/default.nix b/home/rofi/default.nix
similarity index 100%
rename from modules/rofi/default.nix
rename to home/rofi/default.nix
diff --git a/modules/rofi/launchpad.rasi b/home/rofi/launchpad.rasi
similarity index 100%
rename from modules/rofi/launchpad.rasi
rename to home/rofi/launchpad.rasi
diff --git a/modules/waybar/default.nix b/home/waybar/default.nix
similarity index 100%
rename from modules/waybar/default.nix
rename to home/waybar/default.nix
diff --git a/modules/zathura/default.nix b/home/zathura/default.nix
similarity index 100%
rename from modules/zathura/default.nix
rename to home/zathura/default.nix
diff --git a/modules/default.nix b/modules/default.nix
index 111ed443..78d0644c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -16,19 +16,4 @@
     ./waycorner
     ./xdg-user-dirs
   ];
-
-  home-manager.sharedModules = [
-    ./dunst
-    ./feh
-    ./git
-    ./gpg
-    ./kitty
-    ./mime-apps
-    ./mpv
-    ./ncmpcpp
-    ./qutebrowser
-    ./rofi
-    ./waybar
-    ./zathura
-  ];
 }
diff --git a/src/main.nix b/src/main.nix
index 27ec8126..b812984a 100644
--- a/src/main.nix
+++ b/src/main.nix
@@ -13,6 +13,7 @@ let VARIABLES = import ./variables.nix; in {
     "${VARIABLES.hostHardwareConfiguration}"
     ../overlays
     ../modules
+    ../home
     ../containers/rar.nix
     ../containers/wine.nix
     ../containers/dev.nix
diff --git a/tests/main.cr b/tests/main.cr
index ecff726b..28f85ac7 100644
--- a/tests/main.cr
+++ b/tests/main.cr
@@ -3,6 +3,7 @@ require "./methods/*"
 
 check_top_level_imports("modules")
 check_top_level_imports("overlays")
+check_top_level_imports("home")
 
 describe "./overlays/joshuto/default.nix", tags: "online" do
   it "uses the latest joshuto commit" do