From c56f06bbfbaa419205479e0a6b21845cdab039a5 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 10 Aug 2024 13:01:56 -0400 Subject: [PATCH] Decoupled home-manager --- modules/home-manager.nix | 6 +++++- modules/lib.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 317a12d..f226ca1 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -67,13 +67,17 @@ in }; makeCommonUser = - { enableDevelopmentKit + { enableDevelopmentKit ? false , fullName , email , extraGitConfigs ? [ ] + , name + , homeDirectory ? null , ... }: { pkgs, ... }: { home = { + username = name; + homeDirectory = if (builtins.isNull homeDirectory) then "/home/${name}" else homeDirectory; stateVersion = stateVersion; shellAliases = { cat = "bat"; diff --git a/modules/lib.nix b/modules/lib.nix index 4519200..8aa92c0 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -66,7 +66,7 @@ let , system ? "x86_64-linux" }: let - hm = (import ../home-manager.nix { + hm = (import ./home-manager.nix { stateVersion = homeManagerVersion; }); pkgs = allPkgs."${system}";