Get mediacenter running

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;
 }

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;
 }

lib/mkHomeNixosModule.nix

@@ -1,10 +0,0 @@
-moduleInputs @ {
-  flakeLib,
-  users ? {},
-  ...
-}: let
-  config = flakeLib.mkHomeManagerDefaults moduleInputs;
-in {
-  inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
-  inherit users;
-}

lib/mkNixosHomeConfiguration.nix

@@ -4,7 +4,7 @@
 in {
   ${username} = {
     imports = [
-      ../../home-manager/${profile}/home.nix
+      ../profiles/home-manager/${profile}/home.nix
     ];
   };
 }

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;
+  };
 }

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;};
 }

profiles/nixos/vm/configuration.nix

@@ -20,7 +20,7 @@
     flakeLib.mkNixosHomeConfiguration {
       inherit vars system;
     }
-    // flakeLib.mkNixosUserConfiguration {
+    // flakeLib.mkNixosHomeConfiguration {
       inherit system;
       vars = vars // {username = "kodi";};
     };