small tweaks

This commit is contained in:
Chris Kruining 2025-03-29 00:17:42 +01:00
parent 0d7d4d3a76
commit ac8aee70c0
Signed by: chris
SSH key fingerprint: SHA256:nG82MUfuVdRVyCKKWqhY+pCrbz9nbX6uzUns4RKa1Pg
3 changed files with 7 additions and 10 deletions

View file

@ -14,9 +14,6 @@
modules = { modules = {
system.audio.enable = true; system.audio.enable = true;
# EXPERIMENTS
services.auth.enable = true;
root = { root = {
user = { user = {
full_name = "__ROOT__"; full_name = "__ROOT__";

View file

@ -59,7 +59,7 @@ in rec
++ (map (user: (args@{ inputs, lib, pkgs, config, options, ... }: { ++ (map (user: (args@{ inputs, lib, pkgs, config, options, ... }: {
imports = mapModulesRec' ../modules/home (file: (import file (args // { inherit user; }))); imports = mapModulesRec' ../modules/home (file: (import file (args // { inherit user; })));
modules.${user} = (import "${path}/users/${user}/default.nix" args); config.modules.${user} = (import "${path}/users/${user}/default.nix" args);
})) users); })) users);
}; };

View file

@ -1,20 +1,20 @@
{ options, config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
let let
inherit (lib.attrsets) attrValues; inherit (lib.attrsets) attrValues;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) nullOr enum;
cfg = config.modules.${user}.shell; cfg = config.modules.${user}.shell;
in in
{ {
options.modules.${user}.shell = let options.modules.${user}.shell = {
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) nullOr enum;
in {
default = mkOption { default = mkOption {
type = nullOr (enum ["fish" "zsh" "xonsh"]); type = nullOr (enum ["fish" "zsh" "bash"]);
default = null; default = null;
description = "Default system shell"; description = "Default system shell";
}; };
corePkgs.enable = mkEnableOption "core shell packages"; corePkgs.enable = mkEnableOption "core shell packages";
}; };