From 8f8d23fb62b53231563a4cf7d9d39a2b45508b85 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 10 Aug 2024 22:39:54 -0400 Subject: [PATCH] more refactoring of home manager --- modules/home/default.nix | 11 +++++++---- modules/skyg/core.nix | 1 - modules/skyg/user.nix | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index d8f142f..365e6b4 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,8 +1,8 @@ { stateVersion }: let - makeCommonGitConfigs = (import ./git).makeCommonGitConfigs; - programsModule = (import ./programs); - servicesModule = (import ./services); + makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs; + programsModule = (import ./programs.nix); + servicesModule = (import ./services.nix); homeModule = { stateVersion = stateVersion; shellAliases = { @@ -24,13 +24,16 @@ in }; makeCommonUser = - { enableDevelopmentKit + { enableDevelopmentKit ? false , fullName , email , extraGitConfigs ? [ ] + , name , ... }: { pkgs, ... }: { home = homeModule // { + username = name; + homeDirectory = "/home/${name}"; packages = with pkgs; [ jq nixpkgs-fmt ipfetch nixd ] ++ (if enableDevelopmentKit then [ diff --git a/modules/skyg/core.nix b/modules/skyg/core.nix index 812bfba..f6ccef7 100644 --- a/modules/skyg/core.nix +++ b/modules/skyg/core.nix @@ -17,7 +17,6 @@ in config = { users.users.root.shell = pkgs.zsh; - home-manager.users.root.programs.git.userEmail = "root@${cfg.hostName}"; networking.hostName = cfg.hostName; }; } diff --git a/modules/skyg/user.nix b/modules/skyg/user.nix index f822ff5..fcd055c 100644 --- a/modules/skyg/user.nix +++ b/modules/skyg/user.nix @@ -45,7 +45,9 @@ in mkIf cfg.user.enabled { programs.zsh.enable = true; - home-manager.users.root = hm.makeRootUser { pkgs = pkgs; }; - home-manager.users.${cfg.user.name} = (hm.makeCommonUser cfg.user) { pkgs = pkgs; }; + home-manager.users.root = + (hm.makeRootUser { hostName = config.skyg.core.hostName; }) { pkgs = pkgs; }; + home-manager.users.${cfg.user.name} = + (hm.makeCommonUser cfg.user) { pkgs = pkgs; }; }; }