From 3fcf1952b77f4bea7069819181d0a5b8989cf2e5 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Thu, 5 Oct 2023 16:34:20 +0200
Subject: [PATCH] Fix home-manager module imports

---
 flake.nix | 12 ++++++++++--
 home.nix  |  3 ---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8bdf11d..2a804db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,12 +76,14 @@
     homeConfigurations = {
       "tristand" = inputs.home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
-        inherit inputs;
 
         modules = [
           ./home.nix
+          inputs.plasma-manager.homeManagerModules.plasma-manager
+          inputs.nix-index-database.hmModules.nix-index
+          inputs.nur.hmModules.nur
           {
-            nixpkgs.pkgs = customPkgs;
+            _module.args.inputs = inputs;
           }
         ];
       };
@@ -105,6 +107,12 @@
             nixpkgs.pkgs = customPkgs;
             home-manager.useUserPackages = true;
             home-manager.useGlobalPkgs = true;
+            home-manager.sharedModules = [
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+              inputs.nix-index-database.hmModules.nix-index
+              inputs.nur.hmModules.nur
+            ];
+
             hardware.tuxedo-control-center.enable = true;
             hardware.tuxedo-control-center.package = inputs.tuxedo-nixos.packages.x86_64-linux.default;
           }
diff --git a/home.nix b/home.nix
index 248c077..3c1af26 100644
--- a/home.nix
+++ b/home.nix
@@ -11,9 +11,6 @@
   wallpaperPath = "${wallpaper}/share/wallpapers/nixos-wallpaper.png";
 in {
   imports = [
-    inputs.plasma-manager.homeManagerModules.plasma-manager
-    inputs.nix-index-database.hmModules.nix-index
-    inputs.nur.hmModules.nur
     ./plasma.nix
   ];