jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add helper functions for multi-user toggle support

Browse Source 
Introduced a new file `lib.nix` containing helper functions to streamline user package management and attributes for multi-user configurations. Updated various modules to utilize these functions, enhancing code maintainability and readability.
This commit is contained in:
Danilo Reyes
2026-01-16 10:36:02 -06:00
parent 4e835aca1b
commit b89d193445
30 changed files with 196 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/dev/cc.nix
View File

@@ -32,9 +32,7 @@ in
};
config = lib.mkIf config.my.dev.cc.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
};
}

6
modules/dev/docker.nix
View File

@@ -30,10 +30,8 @@ in
config = lib.mkMerge [
(lib.mkIf config.my.dev.docker.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";

15
modules/dev/emacs.nix
View File

@@ -9,9 +9,8 @@
options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
config = lib.mkIf config.my.emacs.enable {
home-manager.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = {
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers 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;
@@ -24,9 +23,9 @@
edit = "emacsclient -t";
e = "edit";
};
}) users));
});
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs.xorg) xwininfo;
inherit (pkgs)
@@ -50,9 +49,7 @@
prettier # multi-language linter
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.dev packages;
services.emacs = {
enable = true;
defaultEditor = true;
@@ -63,7 +60,7 @@
extraPackages =
epkgs:
let
inherit (config.home-manager.users.${(if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev)[0]}.programs.emacs)
inherit (config.home-manager.users.${(import ../lib.nix { inherit lib; }).getFirstUser config.my.toggleUsers.dev}.programs.emacs)
extraPackages
extraConfig
;

6
modules/dev/go.nix
View File

@@ -39,10 +39,8 @@ in
}
(lib.mkIf config.my.dev.go.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
];
}

6
modules/dev/haskell.nix
View File

@@ -34,10 +34,8 @@ in
config = lib.mkMerge [
(lib.mkIf config.my.dev.haskell.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables = {

24
modules/dev/javascript.nix
View File

@@ -28,23 +28,21 @@ in
config = lib.mkMerge [
(lib.mkIf config.my.dev.javascript.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
{
home-manager.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user}.xdg.configFile = {
"npm/npmrc".source = ../../dotfiles/npmrc;
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {
optOut = false;
lastUpdateCheck = 1646662583446;
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
xdg.configFile = {
"npm/npmrc".source = ../../dotfiles/npmrc;
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {
optOut = false;
lastUpdateCheck = 1646662583446;
};
};
};
}) users);
});
environment.variables = {
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";

6
modules/dev/julia.nix
View File

@@ -26,9 +26,7 @@ in
};
config = lib.mkIf config.my.dev.julia.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
};
}

40
modules/dev/nix.nix
View File

@@ -34,27 +34,25 @@ in
};
config = lib.mkIf config.my.dev.nix.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
home-manager.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user}.programs.${shellType}.shellAliases =
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
{
nixformat = ''
deadnix -e && \
nix run nixpkgs#nixfmt-tree && \
statix fix
'';
nix-push-cache = ''
nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
--print-out-paths --fallback --max-jobs 100 --cores 0 |
nix run nixpkgs#attic-client -- push lan:nixos --stdin
'';
};
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
programs.${shellType}.shellAliases =
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
{
nixformat = ''
deadnix -e && \
nix run nixpkgs#nixfmt-tree && \
statix fix
'';
nix-push-cache = ''
nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
--print-out-paths --fallback --max-jobs 100 --cores 0 |
nix run nixpkgs#attic-client -- push lan:nixos --stdin
'';
};
});
};
}

14
modules/dev/python.nix
View File

@@ -47,17 +47,15 @@ in
config = lib.mkMerge [
(lib.mkIf config.my.dev.python.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
{
home-manager.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user}.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.dev (user: {
xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
});
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
}
];

6
modules/dev/ruby.nix
View File

@@ -28,10 +28,8 @@ in
config = lib.mkMerge [
(lib.mkIf config.my.dev.ruby.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables = {

6
modules/dev/rust.nix
View File

@@ -33,10 +33,8 @@ in
config = lib.mkMerge [
(lib.mkIf config.my.dev.rust.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
})
{
environment.variables.CARGO_HOME = "\${XDG_DATA_HOME}/cargo";

6
modules/dev/sh.nix
View File

@@ -31,9 +31,7 @@ in
};
config = lib.mkIf config.my.dev.sh.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
};
}

6
modules/dev/zig.nix
View File

@@ -29,9 +29,7 @@ in
};
config = lib.mkIf config.my.dev.zig.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
in lib.mkMerge (map (user: {
${user} = { inherit packages; };
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkUserAttrs config.my.toggleUsers.dev { inherit packages; };
};
}