diff options
| author | Michael Hoang <Enzime@users.noreply.github.com> | 2024-10-28 10:08:11 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 10:08:11 +1100 |
| commit | 5c0c6aaa797d6ccbb6cdab14de0248135735709d (patch) | |
| tree | 40c65e8cf0ae6def61b9bd15cfd4aad025b89e72 /modules/system | |
| parent | 2eb472230a5400c81d9008014888b4bff23bcf44 (diff) | |
| parent | febc3b3f514d1e3d46182975430737d0232e6af0 (diff) | |
Merge pull request #1120 from Enzime/push-ltvtsllrqvqy
users: update properties for known users
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/activation-scripts.nix | 1 | ||||
| -rw-r--r-- | modules/system/shells.nix | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix index da8eb5c..5f8916c 100644 --- a/modules/system/activation-scripts.nix +++ b/modules/system/activation-scripts.nix @@ -86,6 +86,7 @@ in exit $_status ''; + # FIXME: activationScripts.checks should be system level system.activationScripts.userScript.text = '' #! ${stdenv.shell} set -e diff --git a/modules/system/shells.nix b/modules/system/shells.nix index 0b599d9..025936d 100644 --- a/modules/system/shells.nix +++ b/modules/system/shells.nix @@ -14,9 +14,15 @@ in example = literalExpression "[ pkgs.bashInteractive pkgs.zsh ]"; description = '' A list of permissible login shells for user accounts. - No need to mention `/bin/sh` - and other shells that are available by default on - macOS. + + The default macOS shells will be automatically included: + - /bin/bash + - /bin/csh + - /bin/dash + - /bin/ksh + - /bin/sh + - /bin/tcsh + - /bin/zsh ''; apply = map (v: if types.shellPackage.check v then "/run/current-system/sw${v.shellPath}" else v); }; |