Switch how this works again

This commit is contained in:
Peter Selby 2023-11-06 15:34:48 -08:00
parent bcdafb7994
commit b0bd0f05a0
3 changed files with 9 additions and 8 deletions

View File

@ -24,8 +24,8 @@
(import ./module.nix { inherit doom-emacs niten-doom-config; }) (import ./module.nix { inherit doom-emacs niten-doom-config; })
]; ];
}; };
mkHomeManagerConfiguration = { username, user-email, home-dir, enable-gui, ... }: import ./niten.nix { mkHomeManagerConfiguration = { username, user-email, home-dir, enable-gui, pkgs, ... }: import ./niten.nix {
inherit username user-email home-dir enable-gui doom-emacs niten-doom-config; inherit username user-email home-dir enable-gui doom-emacs niten-doom-config pkgs;
}; };
}; };
} }

View File

@ -38,15 +38,17 @@ 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
username username
user-email user-email
home-dir home-dir
enable-gui; enable-gui
}) { inherit config, lib, pgks, ...}); lib,
pkgs;
});
in mapAttrs generate-config local-users; in mapAttrs generate-config local-users;
}; };
} }

View File

@ -5,12 +5,11 @@
user-email, user-email,
home-dir, home-dir,
enable-gui, enable-gui,
pkgs,
... ...
}: }:
{ config, lib, pkgs, }: with pkgs.lib;
with lib;
let let
doom-emacs-package = pkgs.callPackage doom-emacs { doom-emacs-package = pkgs.callPackage doom-emacs {