From 5f751ffa5b20d39248645dcff79194773b418b05 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Thu, 3 Apr 2025 18:43:37 +0200
Subject: [PATCH] home: import modules in flake.nix

---
 flake.nix     | 22 +++++++++++-----------
 home/home.nix | 12 ------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 677ae5d..a541e15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -142,17 +142,17 @@
     };
 
     homeModules = {
-      uidGid = ./home/modules/uidGid.nix;
-      shellAliases = ./home/modules/shellAliases.nix;
-      colors = ./home/modules/colors.nix;
-      gpg = ./home/modules/programs/gpg;
-      neovim-auto-clean-swapfiles = ./home/modules/programs/neovim/auto-clean-swapfiles.nix;
-      nix-index-auto-update-database = ./home/modules/programs/nix-index/auto-update-database.nix;
-      direnv-auto-prune = ./home/modules/programs/direnv/auto-prune.nix;
-      newsboat = ./home/modules/programs/newsboat;
-      mpd-auto-updater = ./home/modules/services/mpd.nix;
       cargo = ./home/modules/programs/cargo;
+      colors = ./home/modules/colors.nix;
+      direnv-auto-prune = ./home/modules/programs/direnv/auto-prune.nix;
+      gpg = ./home/modules/programs/gpg;
+      mpd-auto-updater = ./home/modules/services/mpd.nix;
+      neovim-auto-clean-swapfiles = ./home/modules/programs/neovim/auto-clean-swapfiles.nix;
+      newsboat = ./home/modules/programs/newsboat;
+      nix-index-auto-update-database = ./home/modules/programs/nix-index/auto-update-database.nix;
+      shellAliases = ./home/modules/shellAliases.nix;
       systemd-tmpfiles = ./home/modules/systemd-tmpfiles.nix;
+      uidGid = ./home/modules/uidGid.nix;
     };
 
     homeConfigurations = {
@@ -167,7 +167,7 @@
           imports = [
             ./home/home.nix
             ./modules/machineVars.nix
-          ];
+          ] ++ (builtins.attrValues self.homeModules);
 
           machineVars = {
             headless = false;
@@ -221,7 +221,7 @@
                   sharedModules = [
                     inputs.sops-nix.homeManagerModules.sops
                     inputs.anyrun.homeManagerModules.default
-                  ];
+                  ] ++ (builtins.attrValues self.homeModules);
 
                   users.h7x4.imports = [
                     ./home/home.nix
diff --git a/home/home.nix b/home/home.nix
index 925846d..e83cce9 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -46,18 +46,6 @@ in {
 
     ./services/nix-channel-update.nix
     ./services/pueue.nix
-
-    ./modules/colors.nix
-    ./modules/shellAliases.nix
-    ./modules/uidGid.nix
-    ./modules/systemd-tmpfiles.nix
-    ./modules/programs/cargo
-    ./modules/programs/gpg
-    ./modules/programs/neovim/auto-clean-swapfiles.nix
-    ./modules/programs/nix-index/auto-update-database.nix
-    ./modules/programs/direnv/auto-prune.nix
-    ./modules/programs/newsboat
-    ./modules/services/mpd.nix
   ] ++ (optionals graphics [
     ./config/gtk.nix