From 75965ffeb963a8d6db0bf0d658193b225aed78c1 Mon Sep 17 00:00:00 2001
From: Patrick Neff <odie86@gmail.com>
Date: Sun, 14 Apr 2024 16:56:21 +0200
Subject: [PATCH] Get mediacenter running

---
 lib/default.nix                        |  3 +--
 lib/mkHomeManagerDefaults.nix          |  6 ------
 lib/mkHomeNixosModule.nix              | 10 ----------
 lib/mkNixosHomeConfiguration.nix       |  2 +-
 modules/nixos/home-manager/default.nix |  4 +++-
 profiles/nixos/pi0/configuration.nix   | 16 +++-------------
 profiles/nixos/vm/configuration.nix    |  2 +-
 7 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 lib/mkHomeNixosModule.nix

diff --git a/lib/default.nix b/lib/default.nix
index 1b9a3a4..6a9de84 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,7 +5,6 @@
   mkNixVimModule = import ./mkNixVimModule.nix;
   mkNixosConfiguration = import ./mkNixosConfiguration.nix;
   mkHomeConfiguration = import ./mkHomeConfiguration.nix;
-  mkHomeNixosModule = import ./mkHomeNixosModule.nix;
   mkHomeManagerDefaults = import ./mkHomeManagerDefaults.nix;
-  mkNixosHomeconfiguration = import ./mkNixosHomeconfiguration.nix;
+  mkNixosHomeConfiguration = import ./mkNixosHomeConfiguration.nix;
 }
diff --git a/lib/mkHomeManagerDefaults.nix b/lib/mkHomeManagerDefaults.nix
index e4acdec..12d2aaa 100644
--- a/lib/mkHomeManagerDefaults.nix
+++ b/lib/mkHomeManagerDefaults.nix
@@ -3,18 +3,12 @@
   outputs,
   vars,
   flakeLib,
-  nixpkgs,
-  system,
-  overlays,
   ...
 }: {
   extraSpecialArgs = {
     inherit inputs outputs vars flakeLib;
     inherit (inputs) nix-colors;
   };
-  pkgs = flakeLib.mkPkgs {
-    inherit nixpkgs system overlays;
-  };
   useGlobalPkgs = true;
   useUserPackages = true;
 }
diff --git a/lib/mkHomeNixosModule.nix b/lib/mkHomeNixosModule.nix
deleted file mode 100644
index f0a0df2..0000000
--- a/lib/mkHomeNixosModule.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-moduleInputs @ {
-  flakeLib,
-  users ? {},
-  ...
-}: let
-  config = flakeLib.mkHomeManagerDefaults moduleInputs;
-in {
-  inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
-  inherit users;
-}
diff --git a/lib/mkNixosHomeConfiguration.nix b/lib/mkNixosHomeConfiguration.nix
index e02c593..15fdeb0 100644
--- a/lib/mkNixosHomeConfiguration.nix
+++ b/lib/mkNixosHomeConfiguration.nix
@@ -4,7 +4,7 @@
 in {
   ${username} = {
     imports = [
-      ../../home-manager/${profile}/home.nix
+      ../profiles/home-manager/${profile}/home.nix
     ];
   };
 }
diff --git a/modules/nixos/home-manager/default.nix b/modules/nixos/home-manager/default.nix
index 520f588..cc222c1 100644
--- a/modules/nixos/home-manager/default.nix
+++ b/modules/nixos/home-manager/default.nix
@@ -1,5 +1,7 @@
 moduleInputs @ {flakeLib, ...}: let
   config = flakeLib.mkHomeManagerDefaults moduleInputs;
 in {
-  inherit (config) extraSpecialArgs pkgs useGlobalPkgs useUserPackages system;
+  home-manager = {
+    inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
+  };
 }
diff --git a/profiles/nixos/pi0/configuration.nix b/profiles/nixos/pi0/configuration.nix
index ef6ae00..ff8ebf3 100644
--- a/profiles/nixos/pi0/configuration.nix
+++ b/profiles/nixos/pi0/configuration.nix
@@ -1,15 +1,12 @@
 {
-  inputs,
   outputs,
   flakeLib,
   vars,
   ...
-}: let
-  inherit (vars) username hostName;
-  profile = "${username}@${hostName}";
-in {
+}: {
   imports = [
     outputs.nixosModules.base
+    outputs.nixosModules.home-manager
     ./hardware-configuration.nix
   ];
 
@@ -17,12 +14,5 @@ in {
     inherit (vars) hostName domain;
   };
 
-  home-manager = flakeLib.mkHomeNixosModule {
-    inherit inputs outputs vars flakeLib;
-    users.${vars.username} = {
-      imports = [
-        ../../home-manager/${profile}/home.nix
-      ];
-    };
-  };
+  home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;};
 }
diff --git a/profiles/nixos/vm/configuration.nix b/profiles/nixos/vm/configuration.nix
index 7177dae..125cfb4 100644
--- a/profiles/nixos/vm/configuration.nix
+++ b/profiles/nixos/vm/configuration.nix
@@ -20,7 +20,7 @@
     flakeLib.mkNixosHomeConfiguration {
       inherit vars system;
     }
-    // flakeLib.mkNixosUserConfiguration {
+    // flakeLib.mkNixosHomeConfiguration {
       inherit system;
       vars = vars // {username = "kodi";};
     };