Refactor user management functions to use inputs
Removed the `lib.nix` file and refactored various modules to utilize `inputs.self.lib` for user package and attribute management. This change enhances consistency and maintainability across the configuration files.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -14,11 +15,9 @@
|
||||
description = "The shell to use system-wide (bash or zsh)";
|
||||
};
|
||||
config = {
|
||||
users.users = let
|
||||
userLib = import ../lib.nix { inherit lib; };
|
||||
in lib.mkMerge (map (user: {
|
||||
users.users = lib.mkMerge (map (user: {
|
||||
${user}.shell = pkgs.${config.my.shell.type};
|
||||
}) (userLib.normalizeUsers config.my.toggleUsers.shell));
|
||||
}) (inputs.self.lib.normalizeUsers config.my.toggleUsers.shell));
|
||||
programs.zsh.enable = config.my.shell.type == "zsh";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user