From 0574ac1eb12c75ec06e262b07c798b89c05c7039 Mon Sep 17 00:00:00 2001
From: aethrvmn <me@aethrvmn.gr>
Date: Tue, 2 Dec 2025 22:30:45 +0100
Subject: made home-manager modules explicit per system

---
 flake.nix                | 60 +++++++++++++++++++++++++++++++++++++++++++++---
 home-manager/default.nix | 15 +-----------
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9670486..613675b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,9 @@
           useGlobalPkgs = true;
           useUserPackages = true;
 
-          users.aethrvmn = import ./home-manager;
+          users.aethrvmn = { 
+            imports = [ ./home-manager ];
+          };
 
           backupFileExtension = "backup";
         };
@@ -101,6 +103,25 @@
           ./modules/intel
           ./modules/nginx
           ./modules/searx
+          {
+            home-manager = {
+              users.aethrvmn = {
+                imports = [
+                  ./home-manager/browser
+                  ./home-manager/dotfiles
+                  ./home-manager/fish
+                  ./home-manager/git
+                  ./home-manager/gnupg
+                  ./home-manager/gtk
+                  ./home-manager/kanshi
+                  ./home-manager/mail
+                  ./home-manager/nextcloud
+                  ./home-manager/ssh-agent
+                  ./home-manager/zsh
+                ];
+              };
+            };
+          }
         ];
       };
 
@@ -111,7 +132,7 @@
           ./modules/1password
           ./modules/adguard
           ./modules/amd
-          # ./modules/calibre
+          ./modules/calibre
           ./modules/cinnamon
           ./modules/flatpak
           ./modules/monero
@@ -119,6 +140,24 @@
           ./modules/ollama
           ./modules/open-webui
           ./modules/searx
+          {
+            home-manager = {
+              users.aethrvmn = {
+                imports = [
+                  ./home-manager/browser
+                  ./home-manager/dotfiles
+                  ./home-manager/fish
+                  ./home-manager/git
+                  ./home-manager/gnupg
+                  ./home-manager/gtk
+                  ./home-manager/mail
+                  ./home-manager/nextcloud
+                  ./home-manager/ssh-agent
+                  ./home-manager/zsh
+                ];
+              };
+            };
+          }
         ];
       };
 
@@ -134,8 +173,23 @@
           ./modules/nginx
           ./modules/nvidia
           ./modules/ollama
-          ./modules/searx
           ./modules/open-webui
+          ./modules/searx
+          {
+            home-manager = {
+              users.aethrvmn = {
+                imports = [
+                  ./home-manager/browser
+                  ./home-manager/fish
+                  ./home-manager/git
+                  ./home-manager/gnupg
+                  ./home-manager/gtk
+                  ./home-manager/ssh-agent
+                  ./home-manager/zsh
+                ];
+              };
+            };
+          }
         ];
       };
 
diff --git a/home-manager/default.nix b/home-manager/default.nix
index daa9eec..acd0494 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,19 +1,6 @@
 { pkgs, ...}:
 {
-  imports = [
-    ./browser
-    ./dotfiles
-    ./fish
-    ./git
-    ./gnupg
-    ./gtk
-    ./kanshi
-    ./mail
-    ./nextcloud
-    ./ssh-agent
-    ./zsh
-  ];
-  
+ 
   home = {
     username = "aethrvmn";
 
-- 
cgit v1.2.3