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:
Danilo Reyes
2026-01-16 10:55:15 -06:00
parent b89d193445
commit 495f6e2e25
31 changed files with 67 additions and 122 deletions

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -31,8 +32,6 @@ in
};
};
config = lib.mkIf config.my.dev.cc.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
};
}

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -29,9 +30,7 @@ in
};
config = lib.mkMerge [
(lib.mkIf config.my.dev.docker.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";

View File

@@ -8,9 +8,7 @@
{
options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
config = lib.mkIf config.my.emacs.enable {
home-manager.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
xdg.dataFile = {
"doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
"doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
@@ -25,7 +23,6 @@
};
});
users.users = let
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs.xorg) xwininfo;
inherit (pkgs)
@@ -49,7 +46,7 @@
prettier # multi-language linter
;
};
in userLib.mkUserPackages config.my.toggleUsers.dev packages;
in inputs.self.lib.mkUserPackages lib config.my.toggleUsers.dev packages;
services.emacs = {
enable = true;
defaultEditor = true;
@@ -60,7 +57,7 @@
extraPackages =
epkgs:
let
inherit (config.home-manager.users.${(import ../lib.nix { inherit lib; }).getFirstUser config.my.toggleUsers.dev}.programs.emacs)
inherit (config.home-manager.users.${inputs.self.lib.getFirstUser config.my.toggleUsers.dev}.programs.emacs)
extraPackages
extraConfig
;

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -38,9 +39,7 @@ in
environment.variables = { inherit GOPATH; };
}
(lib.mkIf config.my.dev.go.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
];
}

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -33,9 +34,7 @@ in
};
config = lib.mkMerge [
(lib.mkIf config.my.dev.haskell.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables = {

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -27,14 +28,10 @@ in
};
config = lib.mkMerge [
(lib.mkIf config.my.dev.javascript.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
{
home-manager.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
xdg.configFile = {
"npm/npmrc".source = ../../dotfiles/npmrc;
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -25,8 +26,6 @@ in
};
};
config = lib.mkIf config.my.dev.julia.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
};
}

View File

@@ -33,12 +33,8 @@ in
};
};
config = lib.mkIf config.my.dev.nix.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
home-manager.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
programs.${shellType}.shellAliases =
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
{

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -46,14 +47,10 @@ in
};
config = lib.mkMerge [
(lib.mkIf config.my.dev.python.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
{
home-manager.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.toggleUsers.dev (user: {
xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
});
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -27,9 +28,7 @@ in
};
config = lib.mkMerge [
(lib.mkIf config.my.dev.ruby.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables = {

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -32,9 +33,7 @@ in
};
config = lib.mkMerge [
(lib.mkIf config.my.dev.rust.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables.CARGO_HOME = "\${XDG_DATA_HOME}/cargo";

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -30,8 +31,6 @@ in
};
};
config = lib.mkIf config.my.dev.sh.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
};
}

View File

@@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@@ -28,8 +29,6 @@ in
};
};
config = lib.mkIf config.my.dev.zig.enable {
users.users = let
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
users.users = inputs.self.lib.mkUserAttrs lib config.my.toggleUsers.dev { inherit packages; };
};
}