No...make it a module

This commit is contained in:
Peter Selby 2023-11-06 15:45:46 -08:00
parent 4fe890b0a3
commit 1593539fea
4 changed files with 15 additions and 10 deletions

View File

@ -25,8 +25,13 @@
]; ];
}; };
mkHomeManagerConfiguration = { username, user-email, home-dir, enable-gui, pkgs, ... }: mkHomeManagerConfiguration = { username, user-email, home-dir, enable-gui, pkgs, ... }:
home-manager.lib.homeManagerConfiguration (import ./niten.nix { home-manager.lib.homeManagerConfiguration {
inherit username user-email home-dir enable-gui doom-emacs niten-doom-config pkgs; inherit pkgs;
modules = [
(import ./niten.nix {
inherit username user-email home-dir enable-gui doom-emacs niten-doom-config;
}); });
];
};
}; };
} }

View File

@ -38,7 +38,7 @@ in {
user-email = if (user-cfg.email != null) then user-email = if (user-cfg.email != null) then
user-cfg.email else "${username}@${config.instance.local-domain}"; user-cfg.email else "${username}@${config.instance.local-domain}";
home-dir = config.users.users.${username}.home; home-dir = config.users.users.${username}.home;
in (import user-configs.${username} { in ((import user-configs.${username} {
inherit inherit
doom-emacs doom-emacs
niten-doom-config niten-doom-config
@ -46,9 +46,7 @@ in {
user-email user-email
home-dir home-dir
enable-gui enable-gui
lib, }) { inherit pkgs; });
pkgs;
});
in mapAttrs generate-config local-users; in mapAttrs generate-config local-users;
}; };
} }

View File

@ -5,10 +5,11 @@
user-email, user-email,
home-dir, home-dir,
enable-gui, enable-gui,
pkgs,
... ...
}: }:
{ pkgs, ... }:
with pkgs.lib; with pkgs.lib;
let let

View File

@ -1,6 +1,7 @@
{ config, lib, pkgs, username, user-email, home-dir, enable-gui, ... }: { username, user-email, home-dir, enable-gui, ... }:
{ pkgs, ... }:
with lib; if !enable-gui then {} else { with pkgs.lib; if !enable-gui then {} else {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
fcitx5-configtool fcitx5-configtool