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

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
;