From 75423d76c840540cdbc157ca33b334744cf6ccca Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Fri, 22 Jul 2022 18:42:56 +0900
Subject: feat(home)!: 22.11 mkHome

---
 lib/mk_home.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'lib/mk_home.nix')

diff --git a/lib/mk_home.nix b/lib/mk_home.nix
index 6682d78..b2f87dc 100644
--- a/lib/mk_home.nix
+++ b/lib/mk_home.nix
@@ -1,16 +1,9 @@
 { self, home-manager, ... } @ inputs:
 
-{ username, hostname, system ? "x86_64-linux", pkgs, version, extraModules ? null }:
+{ username, hostname, pkgs, version, extraModules ? null }:
 let
   entrypoint = "${self}/home/${hostname}/${username}.nix";
-in
-home-manager.lib.homeManagerConfiguration {
-  inherit username system;
-  homeDirectory = "/home/${username}";
-  stateVersion = version;
-  pkgs = pkgs;
-
-  configuration = { lib, ... }: {
+  defaultModule = { lib, ... }: {
     _module.args.inputs = self.inputs;
     _module.args.self = self;
 
@@ -20,8 +13,17 @@ home-manager.lib.homeManagerConfiguration {
       json.enable = false;
     };
 
-    imports = [
-      entrypoint
-    ] ++ lib.optionals (extraModules != null) extraModules;
+    home = {
+      inherit username;
+      homeDirectory = "/home/${username}";
+      stateVersion = version;
+    };
   };
+in
+home-manager.lib.homeManagerConfiguration {
+  pkgs = pkgs;
+  modules = [
+    defaultModule
+    entrypoint
+  ] ++ pkgs.lib.optionals (extraModules != null) extraModules;
 }
-- 
cgit 1.4.1