multi-user toggle init
This commit is contained in:
@@ -32,6 +32,16 @@ in
|
|||||||
"nixserver"
|
"nixserver"
|
||||||
"nixminiserver"
|
"nixminiserver"
|
||||||
];
|
];
|
||||||
|
# Example: Configure which user(s) get packages from each toggle category
|
||||||
|
# By default, all categories install to "jawz", but you can override:
|
||||||
|
# toggleUsers = {
|
||||||
|
# apps = "jawz"; # Apps go to jawz (single user)
|
||||||
|
# apps = [ "jawz" "bearded_dragonn" ]; # Or install to multiple users
|
||||||
|
# dev = "bearded_dragonn"; # Dev tools go to bearded_dragonn
|
||||||
|
# shell = "jawz"; # Shell tools go to jawz
|
||||||
|
# scripts = "jawz"; # Scripts go to jawz
|
||||||
|
# services = "jawz"; # Service user packages go to jawz
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
home-manager.users.jawz.programs = {
|
home-manager.users.jawz.programs = {
|
||||||
vscode = {
|
vscode = {
|
||||||
|
|||||||
@@ -39,5 +39,10 @@ in
|
|||||||
apps.art.enable = lib.mkEnableOption "digital art and creative applications";
|
apps.art.enable = lib.mkEnableOption "digital art and creative applications";
|
||||||
dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
|
dev.gameDev.enable = lib.mkEnableOption "game development tools and engines";
|
||||||
};
|
};
|
||||||
config.users.users.jawz.packages = artPackages ++ gameDevPackages;
|
config.users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = artPackages ++ gameDevPackages;
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
let
|
||||||
options.my.apps.dictionaries.enable = lib.mkEnableOption "dictionaries and language tools";
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
config = lib.mkIf config.my.apps.dictionaries.enable {
|
packages = builtins.attrValues {
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
hunspell
|
hunspell
|
||||||
;
|
;
|
||||||
@@ -17,5 +16,12 @@
|
|||||||
en_CA-large
|
en_CA-large
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
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);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,9 @@ in
|
|||||||
# environmentFile = config.sops.secrets.switch-presence.path;
|
# environmentFile = config.sops.secrets.switch-presence.path;
|
||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit retroarchWithCores;
|
inherit retroarchWithCores;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
shipwright # zelda OoT port
|
shipwright # zelda OoT port
|
||||||
@@ -68,5 +70,8 @@ in
|
|||||||
prismlauncher # minecraft launcher with jdk overlays
|
prismlauncher # minecraft launcher with jdk overlays
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,9 +29,15 @@ in
|
|||||||
{
|
{
|
||||||
options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
|
options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
|
||||||
config = lib.mkIf config.my.apps.internet.enable {
|
config = lib.mkIf config.my.apps.internet.enable {
|
||||||
home-manager.users.jawz.programs.librewolf = import ./librewolf.nix;
|
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);
|
||||||
programs.geary.enable = true;
|
programs.geary.enable = true;
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = builtins.attrValues {
|
||||||
# inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
|
# inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
|
||||||
inherit krisp-patcher;
|
inherit krisp-patcher;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
@@ -48,5 +54,8 @@ in
|
|||||||
fractal # matrix client
|
fractal # matrix client
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,9 @@
|
|||||||
{
|
{
|
||||||
options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
|
options.my.apps.misc.enable = lib.mkEnableOption "miscellaneous desktop applications";
|
||||||
config = lib.mkIf config.my.apps.misc.enable {
|
config = lib.mkIf config.my.apps.misc.enable {
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
blanket # background noise
|
blanket # background noise
|
||||||
metadata-cleaner # remove any metadata and geolocation from files
|
metadata-cleaner # remove any metadata and geolocation from files
|
||||||
@@ -15,5 +17,8 @@
|
|||||||
gnome-obfuscate # censor private information
|
gnome-obfuscate # censor private information
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,9 @@
|
|||||||
{
|
{
|
||||||
options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
|
options.my.apps.multimedia.enable = lib.mkEnableOption "multimedia applications and media players";
|
||||||
config = lib.mkIf config.my.apps.multimedia.enable {
|
config = lib.mkIf config.my.apps.multimedia.enable {
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
curtail # image compressor
|
curtail # image compressor
|
||||||
easyeffects # equalizer
|
easyeffects # equalizer
|
||||||
@@ -17,5 +19,8 @@
|
|||||||
tagger # tag music files
|
tagger # tag music files
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,12 +7,17 @@
|
|||||||
{
|
{
|
||||||
options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
|
options.my.apps.piano.enable = lib.mkEnableOption "piano learning and music theory apps";
|
||||||
config = lib.mkIf config.my.apps.piano.enable {
|
config = lib.mkIf config.my.apps.piano.enable {
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
neothesia
|
neothesia
|
||||||
linthesia
|
linthesia
|
||||||
timidity
|
timidity
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,9 @@
|
|||||||
options.my.apps.office.enable = lib.mkEnableOption "office applications and productivity tools";
|
options.my.apps.office.enable = lib.mkEnableOption "office applications and productivity tools";
|
||||||
config = lib.mkIf config.my.apps.office.enable {
|
config = lib.mkIf config.my.apps.office.enable {
|
||||||
environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
|
environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.apps then [ config.my.toggleUsers.apps ] else config.my.toggleUsers.apps;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
jre17_minimal # for libreoffice extensions
|
jre17_minimal # for libreoffice extensions
|
||||||
libreoffice # office, but based & european
|
libreoffice # office, but based & european
|
||||||
@@ -18,5 +20,8 @@
|
|||||||
# planify # let's pretend I will organize my tasks
|
# planify # let's pretend I will organize my tasks
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,10 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.my.dev.cc.enable {
|
config = lib.mkIf config.my.dev.cc.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,11 @@ in
|
|||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.my.dev.docker.enable {
|
(lib.mkIf config.my.dev.docker.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";
|
environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";
|
||||||
|
|||||||
@@ -8,7 +8,10 @@
|
|||||||
{
|
{
|
||||||
options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
|
options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
|
||||||
config = lib.mkIf config.my.emacs.enable {
|
config = lib.mkIf config.my.emacs.enable {
|
||||||
home-manager.users.jawz = {
|
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.dataFile = {
|
xdg.dataFile = {
|
||||||
"doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
|
"doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
|
||||||
"doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
|
"doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
|
||||||
@@ -21,8 +24,10 @@
|
|||||||
edit = "emacsclient -t";
|
edit = "emacsclient -t";
|
||||||
e = "edit";
|
e = "edit";
|
||||||
};
|
};
|
||||||
};
|
}) users));
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.dev then [ config.my.toggleUsers.dev ] else config.my.toggleUsers.dev;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs.xorg) xwininfo;
|
inherit (pkgs.xorg) xwininfo;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
#emacs everywhere
|
#emacs everywhere
|
||||||
@@ -45,6 +50,9 @@
|
|||||||
prettier # multi-language linter
|
prettier # multi-language linter
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
services.emacs = {
|
services.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
@@ -55,7 +63,7 @@
|
|||||||
extraPackages =
|
extraPackages =
|
||||||
epkgs:
|
epkgs:
|
||||||
let
|
let
|
||||||
inherit (config.home-manager.users.jawz.programs.emacs)
|
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)
|
||||||
extraPackages
|
extraPackages
|
||||||
extraConfig
|
extraConfig
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -38,7 +38,11 @@ in
|
|||||||
environment.variables = { inherit GOPATH; };
|
environment.variables = { inherit GOPATH; };
|
||||||
}
|
}
|
||||||
(lib.mkIf config.my.dev.go.enable {
|
(lib.mkIf config.my.dev.go.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,11 @@ in
|
|||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.my.dev.haskell.enable {
|
(lib.mkIf config.my.dev.haskell.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
|
|||||||
@@ -27,16 +27,24 @@ in
|
|||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.my.dev.javascript.enable {
|
(lib.mkIf config.my.dev.javascript.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
home-manager.users.jawz.xdg.configFile = {
|
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;
|
"npm/npmrc".source = ../../dotfiles/npmrc;
|
||||||
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {
|
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {
|
||||||
optOut = false;
|
optOut = false;
|
||||||
lastUpdateCheck = 1646662583446;
|
lastUpdateCheck = 1646662583446;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
}) users);
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
|
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
|
||||||
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
|
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
|
||||||
|
|||||||
@@ -25,6 +25,10 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.my.dev.julia.enable {
|
config = lib.mkIf config.my.dev.julia.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,8 +33,15 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.my.dev.nix.enable {
|
config = lib.mkIf config.my.dev.nix.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
users.users = let
|
||||||
home-manager.users.jawz.programs.${shellType}.shellAliases =
|
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);
|
||||||
|
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
|
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
|
||||||
{
|
{
|
||||||
nixformat = ''
|
nixformat = ''
|
||||||
@@ -48,5 +55,6 @@ in
|
|||||||
nix run nixpkgs#attic-client -- push lan:nixos --stdin
|
nix run nixpkgs#attic-client -- push lan:nixos --stdin
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,10 +46,18 @@ in
|
|||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.my.dev.python.enable {
|
(lib.mkIf config.my.dev.python.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
home-manager.users.jawz.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
|
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);
|
||||||
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
|
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -27,7 +27,11 @@ in
|
|||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.my.dev.ruby.enable {
|
(lib.mkIf config.my.dev.ruby.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
|
|||||||
@@ -32,7 +32,11 @@ in
|
|||||||
};
|
};
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.my.dev.rust.enable {
|
(lib.mkIf config.my.dev.rust.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
environment.variables.CARGO_HOME = "\${XDG_DATA_HOME}/cargo";
|
environment.variables.CARGO_HOME = "\${XDG_DATA_HOME}/cargo";
|
||||||
|
|||||||
@@ -30,6 +30,10 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.my.dev.sh.enable {
|
config = lib.mkIf config.my.dev.sh.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,10 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.my.dev.zig.enable {
|
config = lib.mkIf config.my.dev.zig.enable {
|
||||||
users.users.jawz = { inherit packages; };
|
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);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,10 +36,14 @@
|
|||||||
description = "Configuration for multiple scripts.";
|
description = "Configuration for multiple scripts.";
|
||||||
};
|
};
|
||||||
config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
|
config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
|
||||||
users.users.jawz.packages =
|
users.users = let
|
||||||
config.my.scripts
|
users = if lib.isString config.my.toggleUsers.scripts then [ config.my.toggleUsers.scripts ] else config.my.toggleUsers.scripts;
|
||||||
|
packages = config.my.scripts
|
||||||
|> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
|
|> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
|
||||||
|> lib.flatten;
|
|> lib.flatten;
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
systemd.user.services =
|
systemd.user.services =
|
||||||
config.my.scripts
|
config.my.scripts
|
||||||
|> lib.mapAttrs' (
|
|> lib.mapAttrs' (
|
||||||
|
|||||||
@@ -103,6 +103,23 @@ in
|
|||||||
};
|
};
|
||||||
enableContainers = lib.mkEnableOption "container services (Docker/Podman)";
|
enableContainers = lib.mkEnableOption "container services (Docker/Podman)";
|
||||||
enableProxy = lib.mkEnableOption "nginx reverse proxy for services";
|
enableProxy = lib.mkEnableOption "nginx reverse proxy for services";
|
||||||
|
toggleUsers = lib.mkOption {
|
||||||
|
type = lib.types.attrsOf (lib.types.either lib.types.str (lib.types.listOf lib.types.str));
|
||||||
|
default = {
|
||||||
|
apps = "jawz";
|
||||||
|
dev = "jawz";
|
||||||
|
shell = "jawz";
|
||||||
|
scripts = "jawz";
|
||||||
|
services = "jawz";
|
||||||
|
};
|
||||||
|
description = "Map toggle categories to users. Can be a single user (string) or multiple users (list). Determines which user(s) get packages from each toggle category.";
|
||||||
|
example = {
|
||||||
|
apps = "jawz";
|
||||||
|
dev = "bearded_dragonn";
|
||||||
|
shell = "jawz";
|
||||||
|
gaming = [ "jawz" "bearded_dragonn" ]; # Install gaming on both users
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
assertions =
|
assertions =
|
||||||
|
|||||||
@@ -11,8 +11,8 @@
|
|||||||
cloudflare-api.sopsFile = ../../secrets/env.yaml;
|
cloudflare-api.sopsFile = ../../secrets/env.yaml;
|
||||||
dns = {
|
dns = {
|
||||||
sopsFile = ../../secrets/env.yaml;
|
sopsFile = ../../secrets/env.yaml;
|
||||||
owner = config.users.users.jawz.name;
|
owner = config.users.users.${config.my.toggleUsers.scripts}.name;
|
||||||
inherit (config.users.users.jawz) group;
|
inherit (config.users.users.${config.my.toggleUsers.scripts}) group;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.cloudflare-dyndns = {
|
services.cloudflare-dyndns = {
|
||||||
|
|||||||
@@ -13,7 +13,12 @@ in
|
|||||||
{
|
{
|
||||||
options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
|
options.my.services.printing.enable = lib.mkEnableOption "printing services and drivers";
|
||||||
config = lib.mkIf config.my.services.printing.enable {
|
config = lib.mkIf config.my.services.printing.enable {
|
||||||
users.users.jawz.packages = [ pkgs.simple-scan ];
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.services then [ config.my.toggleUsers.services ] else config.my.toggleUsers.services;
|
||||||
|
packages = [ pkgs.simple-scan ];
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
services.printing = {
|
services.printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = printingDrivers;
|
drivers = printingDrivers;
|
||||||
|
|||||||
@@ -16,26 +16,32 @@ in
|
|||||||
{
|
{
|
||||||
options.my.services.syncthing.enable = lib.mkEnableOption "Syncthing file synchronization";
|
options.my.services.syncthing.enable = lib.mkEnableOption "Syncthing file synchronization";
|
||||||
config = lib.mkIf (config.my.services.syncthing.enable && config.my.secureHost) {
|
config = lib.mkIf (config.my.services.syncthing.enable && config.my.secureHost) {
|
||||||
sops.secrets = {
|
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 {
|
||||||
"syncthing_keys/${hostName}" = {
|
"syncthing_keys/${hostName}" = {
|
||||||
sopsFile = ../../secrets/keys.yaml;
|
sopsFile = ../../secrets/keys.yaml;
|
||||||
owner = config.users.users.jawz.name;
|
owner = config.users.users.${user}.name;
|
||||||
inherit (config.users.users.jawz) group;
|
inherit (config.users.users.${user}) group;
|
||||||
path = "/home/jawz/.config/syncthing/key.pem";
|
path = "/home/${user}/.config/syncthing/key.pem";
|
||||||
};
|
};
|
||||||
"syncthing_certs/${hostName}" = {
|
"syncthing_certs/${hostName}" = {
|
||||||
sopsFile = ../../secrets/keys.yaml;
|
sopsFile = ../../secrets/keys.yaml;
|
||||||
owner = config.users.users.jawz.name;
|
owner = config.users.users.${user}.name;
|
||||||
inherit (config.users.users.jawz) group;
|
inherit (config.users.users.${user}) group;
|
||||||
path = "/home/jawz/.config/syncthing/cert.pem";
|
path = "/home/${user}/.config/syncthing/cert.pem";
|
||||||
};
|
};
|
||||||
"syncthing_password" = {
|
"syncthing_password" = {
|
||||||
sopsFile = ../../secrets/keys.yaml;
|
sopsFile = ../../secrets/keys.yaml;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.syncthing = {
|
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 {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "jawz";
|
user = user;
|
||||||
group = "users";
|
group = "users";
|
||||||
overrideDevices = true;
|
overrideDevices = true;
|
||||||
overrideFolders = true;
|
overrideFolders = true;
|
||||||
@@ -50,7 +56,7 @@ in
|
|||||||
globalAnnounceEnabled = false;
|
globalAnnounceEnabled = false;
|
||||||
};
|
};
|
||||||
gui = {
|
gui = {
|
||||||
user = "jawz";
|
user = if lib.isString config.my.toggleUsers.services then config.my.toggleUsers.services else (lib.head config.my.toggleUsers.services);
|
||||||
password = config.sops.secrets.syncthing_password.path;
|
password = config.sops.secrets.syncthing_password.path;
|
||||||
};
|
};
|
||||||
devices = {
|
devices = {
|
||||||
|
|||||||
@@ -14,7 +14,11 @@
|
|||||||
description = "The shell to use system-wide (bash or zsh)";
|
description = "The shell to use system-wide (bash or zsh)";
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
users.users.jawz.shell = pkgs.${config.my.shell.type};
|
users.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}.shell = pkgs.${config.my.shell.type};
|
||||||
|
}) users);
|
||||||
programs.zsh.enable = config.my.shell.type == "zsh";
|
programs.zsh.enable = config.my.shell.type == "zsh";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,11 +7,16 @@
|
|||||||
{
|
{
|
||||||
options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
|
options.my.shell.exercism.enable = lib.mkEnableOption "Exercism coding practice platform";
|
||||||
config = lib.mkIf config.my.shell.exercism.enable {
|
config = lib.mkIf config.my.shell.exercism.enable {
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
exercism # learn to code
|
exercism # learn to code
|
||||||
bats # testing system, required by Exercism
|
bats # testing system, required by Exercism
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,19 +8,25 @@
|
|||||||
{
|
{
|
||||||
options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
||||||
config = lib.mkIf config.my.shell.multimedia.enable {
|
config = lib.mkIf config.my.shell.multimedia.enable {
|
||||||
sops.secrets."gallery-dl/secrets" = {
|
sops.secrets."gallery-dl/secrets" = let
|
||||||
|
# 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);
|
||||||
|
in {
|
||||||
sopsFile = ../../secrets/gallery.yaml;
|
sopsFile = ../../secrets/gallery.yaml;
|
||||||
owner = "jawz";
|
owner = user;
|
||||||
mode = "0400";
|
mode = "0400";
|
||||||
};
|
};
|
||||||
home-manager.users.jawz.programs = {
|
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 = {
|
||||||
yt-dlp = {
|
yt-dlp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
embed-thumbnail = true;
|
embed-thumbnail = true;
|
||||||
embed-subs = true;
|
embed-subs = true;
|
||||||
sub-langs = "all";
|
sub-langs = "all";
|
||||||
cookies-from-browser = "firefox+gnomekeyring:/home/jawz/.librewolf/jawz";
|
cookies-from-browser = "firefox+gnomekeyring:/home/${user}/.librewolf/${user}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
gallery-dl = {
|
gallery-dl = {
|
||||||
@@ -37,12 +43,18 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
}) users);
|
||||||
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
ffmpeg # not ffmpreg, the coolest video conversion tool!
|
ffmpeg # not ffmpreg, the coolest video conversion tool!
|
||||||
imagemagick # photoshop what??
|
imagemagick # photoshop what??
|
||||||
ffpb # make ffmpeg encoding... a bit fun
|
ffpb # make ffmpeg encoding... a bit fun
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,10 @@ in
|
|||||||
{
|
{
|
||||||
options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
|
options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
|
||||||
config = lib.mkIf config.my.shell.tools.enable {
|
config = lib.mkIf config.my.shell.tools.enable {
|
||||||
home-manager.users.jawz.programs = {
|
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 = {
|
||||||
hstr.enable = true;
|
hstr.enable = true;
|
||||||
htop = {
|
htop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -52,7 +55,7 @@ in
|
|||||||
PASSWORD_STORE_NOPAGER = "false";
|
PASSWORD_STORE_NOPAGER = "false";
|
||||||
PASSWORD_STORE_NOTIFICATIONS = "false";
|
PASSWORD_STORE_NOTIFICATIONS = "false";
|
||||||
PASSWORD_STORE_PARSING = "true";
|
PASSWORD_STORE_PARSING = "true";
|
||||||
PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
|
PASSWORD_STORE_PATH = "/home/${user}/.local/share/pass";
|
||||||
PASSWORD_STORE_SAFECONTENT = "true";
|
PASSWORD_STORE_SAFECONTENT = "true";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -85,6 +88,7 @@ in
|
|||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
}) users);
|
||||||
programs = {
|
programs = {
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
tmux.enable = true;
|
tmux.enable = true;
|
||||||
@@ -94,7 +98,9 @@ in
|
|||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users = let
|
||||||
|
users = if lib.isString config.my.toggleUsers.shell then [ config.my.toggleUsers.shell ] else config.my.toggleUsers.shell;
|
||||||
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
ripgrep # modern grep
|
ripgrep # modern grep
|
||||||
dust # rusty du similar to gdu
|
dust # rusty du similar to gdu
|
||||||
@@ -109,6 +115,9 @@ in
|
|||||||
rmlint # amazing dupe finder that integrates well with BTRFS
|
rmlint # amazing dupe finder that integrates well with BTRFS
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
in lib.mkMerge (map (user: {
|
||||||
|
${user}.packages = packages;
|
||||||
|
}) users);
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
|
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
|
||||||
LESSHISTFILE = "-";
|
LESSHISTFILE = "-";
|
||||||
|
|||||||
Reference in New Issue
Block a user