diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 18:57:04 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 19:00:39 +0200 |
| commit | 90dac235bb409e5795aa460b34388c455178035c (patch) | |
| tree | 33a2ddef37ebc35175d10285f562b3ce8a375bf7 /nixos/modules/programs | |
| parent | 1235f693ee54221ef5f27c2256215f961d971393 (diff) | |
| download | nixlib-90dac235bb409e5795aa460b34388c455178035c.tar nixlib-90dac235bb409e5795aa460b34388c455178035c.tar.gz nixlib-90dac235bb409e5795aa460b34388c455178035c.tar.bz2 nixlib-90dac235bb409e5795aa460b34388c455178035c.tar.lz nixlib-90dac235bb409e5795aa460b34388c455178035c.tar.xz nixlib-90dac235bb409e5795aa460b34388c455178035c.tar.zst nixlib-90dac235bb409e5795aa460b34388c455178035c.zip | |
Remove the option ‘programs.bash.enable’
NixOS has a pervasive dependency on bash. For instance, the X11 session script sources /etc/profile to get a reasonable environment. Thus we should not provide an option to disable bash. Also, enabling zsh no longer sets ‘users.defaultUserShell’ to zsh, to prevent a collision with bash's definition of the same option. (Changing the default shell is also something that should be left to the user.)
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/bash/bash.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 9584f07b0945..c5c0f9d01215 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -40,6 +40,7 @@ in programs.bash = { + /* enable = mkOption { default = true; description = '' @@ -52,6 +53,7 @@ in ''; type = types.bool; }; + */ shellAliases = mkOption { default = config.environment.shellAliases // { which = "type -P"; }; @@ -114,7 +116,7 @@ in }; - config = mkIf cfg.enable { + config = /* mkIf cfg.enable */ { programs.bash = { diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 7bcf8da2c659..a3efad288ac2 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -168,7 +168,7 @@ in environment.systemPackages = [ pkgs.zsh ]; - users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; + #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = [ "/run/current-system/sw/bin/zsh" |