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/apps/art.nix
View File

@@ -40,9 +40,7 @@ in
dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
};
config.users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = artPackages ++ gameDevPackages;
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
}

6
modules/apps/dictionaries.nix
View File

@@ -5,7 +5,7 @@
...
}:
let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
hunspell
@@ -20,8 +20,6 @@ in
{
options.my.apps.dictionaries.enable = lib.mkEnableOption "dictionaries and language tools";
config = lib.mkIf config.my.apps.dictionaries.enable {
users.users = lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
users.users = userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

6
modules/apps/gaming.nix
View File

@@ -51,7 +51,7 @@ in
# };
};
users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit retroarchWithCores;
inherit (pkgs)
@@ -70,8 +70,6 @@ in
prismlauncher # minecraft launcher with jdk overlays
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

44
modules/apps/internet.nix
View File

@@ -30,32 +30,30 @@ in
options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
config = lib.mkIf config.my.apps.internet.enable {
home-manager.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
in lib.mkMerge (map (user: {
${user}.programs.librewolf = import ./librewolf.nix;
}) users);
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.apps (user: {
programs.librewolf = import ./librewolf.nix;
});
programs.geary.enable = true;
users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
# inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
inherit krisp-patcher;
inherit (pkgs)
# thunderbird # email client
warp # transfer files with based ppl
nextcloud-client # self-hosted google-drive alternative
fragments # beautiful torrent client
tor-browser # dark web, so dark!
telegram-desktop # furry chat
nicotine-plus # remember Ares?
discord # :3
vdhcoapp # video download helper assistant
nextcloud-talk-desktop # nextcloud talk client
fractal # matrix client
;
# inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
inherit krisp-patcher;
inherit (pkgs)
# thunderbird # email client
warp # transfer files with based ppl
nextcloud-client # self-hosted google-drive alternative
fragments # beautiful torrent client
tor-browser # dark web, so dark!
telegram-desktop # furry chat
nicotine-plus # remember Ares?
discord # :3
vdhcoapp # video download helper assistant
nextcloud-talk-desktop # nextcloud talk client
fractal # matrix client
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

18
modules/apps/misc.nix
View File

@@ -8,17 +8,15 @@
options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
config = lib.mkIf config.my.apps.misc.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
blanket # background noise
metadata-cleaner # remove any metadata and geolocation from files
pika-backup # backups
gnome-obfuscate # censor private information
;
inherit (pkgs)
blanket # background noise
metadata-cleaner # remove any metadata and geolocation from files
pika-backup # backups
gnome-obfuscate # censor private information
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

6
modules/apps/multimedia.nix
View File

@@ -8,7 +8,7 @@
options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
config = lib.mkIf config.my.apps.multimedia.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
curtail # image compressor
@@ -19,8 +19,6 @@
tagger # tag music files
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

16
modules/apps/music.nix
View File

@@ -8,16 +8,14 @@
options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
config = lib.mkIf config.my.apps.piano.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
neothesia
linthesia
timidity
;
inherit (pkgs)
neothesia
linthesia
timidity
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

22
modules/apps/office.nix
View File

@@ -9,19 +9,17 @@
config = lib.mkIf config.my.apps.office.enable {
environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
users.users = let
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
jre17_minimal # for libreoffice extensions
libreoffice # office, but based & european
calibre # ugly af eBook library manager
newsflash # feed reader, syncs with nextcloud
furtherance # I packaged this one tehee track time utility
# planify # let's pretend I will organize my tasks
;
inherit (pkgs)
jre17_minimal # for libreoffice extensions
libreoffice # office, but based & european
calibre # ugly af eBook library manager
newsflash # feed reader, syncs with nextcloud
furtherance # I packaged this one tehee track time utility
# planify # let's pretend I will organize my tasks
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.apps packages;
};
}

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; };
};
}

6
modules/factories/mkscript.nix
View File

@@ -37,13 +37,11 @@
};
config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
users.users = let
users = if lib.isString config.my.toggleUsers.scripts then [ config.my.toggleUsers.scripts ] else config.my.toggleUsers.scripts;
userLib = import ../lib.nix { inherit lib; };
packages = config.my.scripts
|> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
|> lib.flatten;
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.scripts packages;
systemd.user.services =
config.my.scripts
|> lib.mapAttrs' (

25
modules/lib.nix Normal file
View File

@@ -0,0 +1,25 @@
# Helper functions for multi-user toggle support
# Usage: import this file in your module and use the helpers
{ lib }:
let
normalizeUsers = users:
if lib.isString users then [ users ] else users;
mkUserPackages = users: packages:
lib.mkMerge (map (user: {
${user}.packages = packages;
}) (normalizeUsers users));
mkUserAttrs = users: attrs:
lib.mkMerge (map (user: {
${user} = attrs;
}) (normalizeUsers users));
mkHomeManagerUsers = users: fn:
lib.mkMerge (map (user: {
${user} = fn user;
}) (normalizeUsers users));
getFirstUser = users:
if lib.isString users then users else (builtins.head users);
in
{
inherit normalizeUsers mkUserPackages mkUserAttrs mkHomeManagerUsers getFirstUser;
}

6
modules/services/printing.nix
View File

@@ -14,11 +14,9 @@ in
options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
config = lib.mkIf config.my.services.printing.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.services then [ config.my.toggleUsers.services ] else config.my.toggleUsers.services;
userLib = import ../lib.nix { inherit lib; };
packages = [ pkgs.simple-scan ];
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.services packages;
services.printing = {
enable = true;
drivers = printingDrivers;

26
modules/services/syncthing.nix
View File

@@ -16,32 +16,26 @@ in
{
options.my.services.syncthing.enable = lib.mkEnableOption "Syncthing file synchronization";
config = lib.mkIf (config.my.services.syncthing.enable && config.my.secureHost) {
sops.secrets = let
# Syncthing runs as a single user service, so use the first user if a list is provided
user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
in {
sops.secrets = {
"syncthing_keys/${hostName}" = {
sopsFile = ../../secrets/keys.yaml;
owner = config.users.users.${user}.name;
inherit (config.users.users.${user}) group;
path = "/home/${user}/.config/syncthing/key.pem";
owner = config.users.users.jawz.name;
inherit (config.users.users.jawz) group;
path = "/home/jawz/.config/syncthing/key.pem";
};
"syncthing_certs/${hostName}" = {
sopsFile = ../../secrets/keys.yaml;
owner = config.users.users.${user}.name;
inherit (config.users.users.${user}) group;
path = "/home/${user}/.config/syncthing/cert.pem";
owner = config.users.users.jawz.name;
inherit (config.users.users.jawz) group;
path = "/home/jawz/.config/syncthing/cert.pem";
};
"syncthing_password" = {
sopsFile = ../../secrets/keys.yaml;
};
};
services.syncthing = let
# Syncthing runs as a single user service, so use the first user if a list is provided
user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
in {
services.syncthing = {
enable = true;
user = user;
user = "jawz";
group = "users";
overrideDevices = true;
overrideFolders = true;
@@ -56,7 +50,7 @@ in
globalAnnounceEnabled = false;
};
gui = {
user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
user = "jawz";
password = config.sops.secrets.syncthing_password.path;
};
devices = {

4
modules/shell/config.nix
View File

@@ -15,10 +15,10 @@
};
config = {
users.users = let
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
userLib = import ../lib.nix { inherit lib; };
in lib.mkMerge (map (user: {
${user}.shell = pkgs.${config.my.shell.type};
}) users);
}) (userLib.normalizeUsers config.my.toggleUsers.shell));
programs.zsh.enable = config.my.shell.type == "zsh";
};
}

14
modules/shell/exercism.nix
View File

@@ -8,15 +8,13 @@
options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
config = lib.mkIf config.my.shell.exercism.enable {
users.users = let
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
exercism # learn to code
bats # testing system, required by Exercism
;
inherit (pkgs)
exercism # learn to code
bats # testing system, required by Exercism
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.shell packages;
};
}

27
modules/shell/multimedia.nix
View File

@@ -9,17 +9,18 @@
options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
config = lib.mkIf config.my.shell.multimedia.enable {
sops.secrets."gallery-dl/secrets" = let
userLib = import ../lib.nix { inherit lib; };
# Use first user for secret ownership
user = if lib.isString config.my.toggleUsers.shell then config.my.toggleUsers.shell else (lib.head config.my.toggleUsers.shell);
user = userLib.getFirstUser config.my.toggleUsers.shell;
in {
sopsFile = ../../secrets/gallery.yaml;
owner = user;
mode = "0400";
};
home-manager.users = let
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
in lib.mkMerge (map (user: {
${user}.programs = {
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.shell (user: {
programs = {
yt-dlp = {
enable = true;
settings = {
@@ -43,18 +44,16 @@
'';
};
};
}) users);
});
users.users = let
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
ffmpeg # not ffmpreg, the coolest video conversion tool!
imagemagick # photoshop what??
ffpb # make ffmpeg encoding... a bit fun
;
inherit (pkgs)
ffmpeg # not ffmpreg, the coolest video conversion tool!
imagemagick # photoshop what??
ffpb # make ffmpeg encoding... a bit fun
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.shell packages;
};
}

14
modules/shell/tools.nix
View File

@@ -12,9 +12,9 @@ in
options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
config = lib.mkIf config.my.shell.tools.enable {
home-manager.users = let
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
in lib.mkMerge (map (user: {
${user}.programs = {
userLib = import ../lib.nix { inherit lib; };
in userLib.mkHomeManagerUsers config.my.toggleUsers.shell (user: {
programs = {
hstr.enable = true;
htop = {
enable = true;
@@ -88,7 +88,7 @@ in
fi
'';
};
}) users);
});
programs = {
starship.enable = true;
tmux.enable = true;
@@ -99,7 +99,7 @@ in
};
};
users.users = let
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
userLib = import ../lib.nix { inherit lib; };
packages = builtins.attrValues {
inherit (pkgs)
ripgrep # modern grep
@@ -115,9 +115,7 @@ in
rmlint # amazing dupe finder that integrates well with BTRFS
;
};
in lib.mkMerge (map (user: {
${user}.packages = packages;
}) users);
in userLib.mkUserPackages config.my.toggleUsers.shell packages;
environment.variables = {
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
LESSHISTFILE = "-";

16
parts/core.nix
View File

@@ -213,6 +213,22 @@ in
windows_vm = ../secrets/ssh/ed25519_windows_vm.pub;
};
getSshKeys = keyNames: keyNames |> map (name: inputs.self.lib.sshKeys.${name});
normalizeUsers = users:
if builtins.isString users then [ users ] else users;
mkUserPackages = lib: users: packages:
lib.mkMerge (map (user: {
${user}.packages = packages;
}) (inputs.self.lib.normalizeUsers users));
mkUserAttrs = lib: users: attrs:
lib.mkMerge (map (user: {
${user} = attrs;
}) (inputs.self.lib.normalizeUsers users));
mkHomeManagerUsers = lib: users: fn:
lib.mkMerge (map (user: {
${user} = fn user;
}) (inputs.self.lib.normalizeUsers users));
getFirstUser = users:
if builtins.isString users then users else (builtins.head users);
};
};
}