From 41c4362136f42d8611dd7fb9c97585c32f86a0dc Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Wed, 2 Feb 2022 00:27:17 +0700
Subject: [PATCH] treewide: decouple home-manager

---
 flake.nix                       |  3 +--
 hosts/apricot/default.nix       |  5 ++++-
 hosts/blossom/default.nix       |  5 ++++-
 hosts/fondue/default.nix        |  5 ++++-
 modules/default.nix             |  1 +
 modules/system/base.nix         |  9 ---------
 modules/system/home-manager.nix | 12 ++++++++++++
 7 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 modules/system/home-manager.nix

diff --git a/flake.nix b/flake.nix
index bbfc791..5fb7c75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
     zelk = { url = "github:schnensch0/zelk"; flake = false; };
   };
 
-  outputs = { self, agenix, nixpkgs, home-manager, ... } @ inputs:
+  outputs = { self, agenix, nixpkgs, ... } @ inputs:
     let
       overlays = (import ./overlays)
         ++ [inputs.neovim-nightly.overlay]
@@ -68,7 +68,6 @@
           system = arch;
           modules = [
             { nixpkgs.overlays = overlays; }
-            home-manager.nixosModules.home-manager
             agenix.nixosModules.age
             (./hosts + "/${name}")
           ];
diff --git a/hosts/apricot/default.nix b/hosts/apricot/default.nix
index 1132864..4b68e46 100644
--- a/hosts/apricot/default.nix
+++ b/hosts/apricot/default.nix
@@ -1,4 +1,4 @@
-{ config, modules, overlays, pkgs, ... }: {
+{ config, inputs, modules, overlays, pkgs, ... }: {
   networking.hostName = "apricot";
   system.stateVersion = "21.05";
   time.timeZone = "Asia/Phnom_Penh";
@@ -9,6 +9,9 @@
     wpa_conf.file = ../../secrets/wpa_conf.age;
   };
   imports = with modules.system; [
+    inputs.home-manager.nixosModule
+    home-manager
+
     base
     input
     kernel
diff --git a/hosts/blossom/default.nix b/hosts/blossom/default.nix
index 25a4316..d8a589c 100644
--- a/hosts/blossom/default.nix
+++ b/hosts/blossom/default.nix
@@ -1,4 +1,4 @@
-{ config, modules, overlays, pkgs, ... }: {
+{ config, inputs, modules, overlays, pkgs, ... }: {
   networking.hostName = "blossom";
   system.stateVersion = "21.11";
   time.timeZone = "Asia/Phnom_Penh";
@@ -9,6 +9,9 @@
     wpa_conf.file = ../../secrets/wpa_conf.age;
   };
   imports = with modules.system; [
+    inputs.home-manager.nixosModule
+    home-manager
+
     audio
     base
     greetd
diff --git a/hosts/fondue/default.nix b/hosts/fondue/default.nix
index af9b698..e19089d 100644
--- a/hosts/fondue/default.nix
+++ b/hosts/fondue/default.nix
@@ -1,4 +1,4 @@
-{ config, modules, modulesPath, overlays, pkgs, ... }: {
+{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: {
   networking.hostName = "fondue";
   system.stateVersion = "21.05";
   time.timeZone = "Australia/Melbourne";
@@ -9,6 +9,9 @@
   };
   imports = with modules.system; [
     (modulesPath + "/profiles/qemu-guest.nix")
+    inputs.home-manager.nixosModule
+    home-manager
+
     base
     input
     kernel
diff --git a/modules/default.nix b/modules/default.nix
index ac9ef11..327a548 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -19,6 +19,7 @@ in {
     ./system/base.nix
     ./system/greetd.nix
     ./system/gui.nix
+    ./system/home-manager.nix
     ./system/input.nix
     ./system/kernel.nix
     ./system/nix.nix
diff --git a/modules/system/base.nix b/modules/system/base.nix
index cdcc838..af1106a 100644
--- a/modules/system/base.nix
+++ b/modules/system/base.nix
@@ -21,13 +21,4 @@
   nix.registry.config.flake = inputs.self;
   nix.registry.nixpkgs.flake = inputs.nixpkgs;
   nix.registry.shells.flake = inputs.self;
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit enableGUI inputs modules;
-      sysConfig = config;
-    };
-  };
 }
diff --git a/modules/system/home-manager.nix b/modules/system/home-manager.nix
new file mode 100644
index 0000000..e496ac0
--- /dev/null
+++ b/modules/system/home-manager.nix
@@ -0,0 +1,12 @@
+{ config, enableGUI, inputs, modules, ... }: {
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit enableGUI inputs modules;
+      sysConfig = config;
+    };
+    # uncomment to prevent nmd IFD
+    # sharedModules = [ { manual.manpages.enable = false; } ];
+  };
+}