mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

users: remove lib.

Browse source
This commit is contained in:
Michael Hoang 2024-11-11 00:21:42 +11:00
parent 5c74ab862c
commit c2c88ae983
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
modules/users/default.nix
View file

@ -1,8 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) concatStringsSep concatMapStringsSep elem filter filterAttrs inherit (lib) concatStringsSep concatMapStringsSep elem escapeShellArg
mapAttrs' mapAttrsToList mkIf mkMerge mkOption mkOrder optionalString types; escapeShellArgs filter filterAttrs mapAttrs' mapAttrsToList mkAfter
mkIf mkMerge mkOption mkOrder mkRemovedOptionModule optionals
optionalString types;
cfg = config.users; cfg = config.users;
@ -42,7 +44,7 @@ in
{ {
imports = [ imports = [
(lib.mkRemovedOptionModule [ "users" "forceRecreate" ] "") (mkRemovedOptionModule [ "users" "forceRecreate" ] "")
]; ];
options = { options = {
@ -111,7 +113,7 @@ in
# NOTE: We put this in `system.checks` as we want this to run first to avoid partial activations # NOTE: We put this in `system.checks` as we want this to run first to avoid partial activations
# however currently that runs at user level activation as that runs before system level activation # however currently that runs at user level activation as that runs before system level activation
# TODO: replace `$USER` with `$SUDO_USER` when system.checks runs from system level # TODO: replace `$USER` with `$SUDO_USER` when system.checks runs from system level
system.checks.text = lib.mkIf (builtins.length (createdUsers ++ deletedUsers) > 0) (lib.mkAfter '' system.checks.text = mkIf (builtins.length (createdUsers ++ deletedUsers) > 0) (mkAfter ''
ensurePerms() { ensurePerms() {
homeDirectory=$(dscl . -read /Users/nobody NFSHomeDirectory) homeDirectory=$(dscl . -read /Users/nobody NFSHomeDirectory)
homeDirectory=''${homeDirectory#NFSHomeDirectory: } homeDirectory=''${homeDirectory#NFSHomeDirectory: }
@ -158,8 +160,8 @@ in
} }
${concatMapStringsSep "\n" (v: let ${concatMapStringsSep "\n" (v: let
name = lib.escapeShellArg v.name; name = escapeShellArg v.name;
dsclUser = lib.escapeShellArg "/Users/${v.name}"; dsclUser = escapeShellArg "/Users/${v.name}";
in '' in ''
u=$(id -u ${name} 2> /dev/null) || true u=$(id -u ${name} 2> /dev/null) || true
if ! [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then if ! [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then
@ -170,7 +172,7 @@ in
else else
homeDirectory=$(dscl . -read ${dsclUser} NFSHomeDirectory) homeDirectory=$(dscl . -read ${dsclUser} NFSHomeDirectory)
homeDirectory=''${homeDirectory#NFSHomeDirectory: } homeDirectory=''${homeDirectory#NFSHomeDirectory: }
if [[ ${lib.escapeShellArg v.home} != "$homeDirectory" ]]; then if [[ ${escapeShellArg v.home} != "$homeDirectory" ]]; then
printf >&2 '\e[1;31merror: config contains the wrong home directory for %s, aborting activation\e[0m\n' ${name} printf >&2 '\e[1;31merror: config contains the wrong home directory for %s, aborting activation\e[0m\n' ${name}
printf >&2 'nix-darwin does not support changing the home directory of existing users.\n' printf >&2 'nix-darwin does not support changing the home directory of existing users.\n'
printf >&2 '\n' printf >&2 '\n'
@ -187,7 +189,7 @@ in
'') createdUsers} '') createdUsers}
${concatMapStringsSep "\n" (v: let ${concatMapStringsSep "\n" (v: let
name = lib.escapeShellArg v; name = escapeShellArg v;
in '' in ''
u=$(id -u ${name} 2> /dev/null) || true u=$(id -u ${name} 2> /dev/null) || true
if [ -n "$u" ]; then if [ -n "$u" ]; then
@ -209,14 +211,14 @@ in
echo "setting up groups..." >&2 echo "setting up groups..." >&2
${concatMapStringsSep "\n" (v: let ${concatMapStringsSep "\n" (v: let
dsclGroup = lib.escapeShellArg "/Groups/${v.name}"; dsclGroup = escapeShellArg "/Groups/${v.name}";
in '' in ''
g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true
g=''${g#PrimaryGroupID: } g=''${g#PrimaryGroupID: }
if [ -z "$g" ]; then if [ -z "$g" ]; then
echo "creating group ${v.name}..." >&2 echo "creating group ${v.name}..." >&2
dscl . -create ${dsclGroup} PrimaryGroupID ${toString v.gid} dscl . -create ${dsclGroup} PrimaryGroupID ${toString v.gid}
dscl . -create ${dsclGroup} RealName ${lib.escapeShellArg v.description} dscl . -create ${dsclGroup} RealName ${escapeShellArg v.description}
g=${toString v.gid} g=${toString v.gid}
fi fi
@ -224,7 +226,7 @@ in
g=$(dscl . -read ${dsclGroup} GroupMembership 2> /dev/null) || true g=$(dscl . -read ${dsclGroup} GroupMembership 2> /dev/null) || true
if [ "$g" != 'GroupMembership: ${concatStringsSep " " v.members}' ]; then if [ "$g" != 'GroupMembership: ${concatStringsSep " " v.members}' ]; then
echo "updating group members ${v.name}..." >&2 echo "updating group members ${v.name}..." >&2
dscl . -create ${dsclGroup} GroupMembership ${lib.escapeShellArgs v.members} dscl . -create ${dsclGroup} GroupMembership ${escapeShellArgs v.members}
fi fi
else else
echo "warning: existing group '${v.name}' has unexpected gid $g, skipping..." >&2 echo "warning: existing group '${v.name}' has unexpected gid $g, skipping..." >&2
@ -232,7 +234,7 @@ in
'') createdGroups} '') createdGroups}
${concatMapStringsSep "\n" (name: let ${concatMapStringsSep "\n" (name: let
dsclGroup = lib.escapeShellArg "/Groups/${name}"; dsclGroup = escapeShellArg "/Groups/${name}";
in '' in ''
g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true g=$(dscl . -read ${dsclGroup} PrimaryGroupID 2> /dev/null) || true
g=''${g#PrimaryGroupID: } g=''${g#PrimaryGroupID: }
@ -251,8 +253,8 @@ in
echo "setting up users..." >&2 echo "setting up users..." >&2
${concatMapStringsSep "\n" (v: let ${concatMapStringsSep "\n" (v: let
name = lib.escapeShellArg v.name; name = escapeShellArg v.name;
dsclUser = lib.escapeShellArg "/Users/${v.name}"; dsclUser = escapeShellArg "/Users/${v.name}";
in '' in ''
u=$(id -u ${name} 2> /dev/null) || true u=$(id -u ${name} 2> /dev/null) || true
if [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then if [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then
@ -261,11 +263,11 @@ in
if [ -z "$u" ]; then if [ -z "$u" ]; then
echo "creating user ${v.name}..." >&2 echo "creating user ${v.name}..." >&2
sysadminctl -addUser ${lib.escapeShellArgs ([ sysadminctl -addUser ${escapeShellArgs ([
v.name v.name
"-UID" v.uid "-UID" v.uid
"-GID" v.gid ] "-GID" v.gid ]
++ (lib.optionals (v.description != null) [ "-fullName" v.description ]) ++ (optionals (v.description != null) [ "-fullName" v.description ])
++ [ "-home" (if v.home != null then v.home else "/var/empty") ] ++ [ "-home" (if v.home != null then v.home else "/var/empty") ]
++ [ "-shell" (if v.shell != null then shellPath v.shell else "/usr/bin/false") ])} 2> /dev/null ++ [ "-shell" (if v.shell != null then shellPath v.shell else "/usr/bin/false") ])} 2> /dev/null
@ -284,17 +286,17 @@ in
# Update properties on known users to keep them inline with configuration # Update properties on known users to keep them inline with configuration
dscl . -create ${dsclUser} PrimaryGroupID ${toString v.gid} dscl . -create ${dsclUser} PrimaryGroupID ${toString v.gid}
${optionalString (v.description != null) "dscl . -create ${dsclUser} RealName ${lib.escapeShellArg v.description}"} ${optionalString (v.description != null) "dscl . -create ${dsclUser} RealName ${escapeShellArg v.description}"}
${optionalString (v.shell != null) "dscl . -create ${dsclUser} UserShell ${lib.escapeShellArg (shellPath v.shell)}"} ${optionalString (v.shell != null) "dscl . -create ${dsclUser} UserShell ${escapeShellArg (shellPath v.shell)}"}
fi fi
'') createdUsers} '') createdUsers}
${concatMapStringsSep "\n" (name: '' ${concatMapStringsSep "\n" (name: ''
u=$(id -u ${lib.escapeShellArg name} 2> /dev/null) || true u=$(id -u ${escapeShellArg name} 2> /dev/null) || true
if [ -n "$u" ]; then if [ -n "$u" ]; then
if [ "$u" -gt 501 ]; then if [ "$u" -gt 501 ]; then
echo "deleting user ${name}..." >&2 echo "deleting user ${name}..." >&2
dscl . -delete ${lib.escapeShellArg "/Users/${name}"} dscl . -delete ${escapeShellArg "/Users/${name}"}
else else
echo "warning: existing user '${name}' has unexpected uid $u, skipping..." >&2 echo "warning: existing user '${name}' has unexpected uid $u, skipping..." >&2
fi fi