summaryrefslogtreecommitdiff
path: root/modules/programs/bash.nix
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2016-12-17 23:11:35 +0100
committerDaiderd Jordan <daiderd@gmail.com>2016-12-17 23:11:35 +0100
commit0c4fbaf0d94b7de981ef798cedad2fa4ca03caed (patch)
tree3497676ef7afe22d81f89f25c1749153ba2f1bec /modules/programs/bash.nix
parent2ad1229c71fe5858fd4fa15b963198945ed01810 (diff)
add variables option to programs.zsh module
Diffstat (limited to 'modules/programs/bash.nix')
-rw-r--r--modules/programs/bash.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 2231401..7a021ff 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -6,7 +6,7 @@ let
cfg = config.programs.bash;
- bash = pkgs.runCommand pkgs.zsh.name
+ shell = pkgs.runCommand pkgs.zsh.name
{ buildInputs = [ pkgs.makeWrapper ]; }
''
source $stdenv/setup
@@ -39,14 +39,6 @@ in
'';
};
- programs.bash.shell = mkOption {
- type = types.path;
- default = "${bash}/bin/bash";
- description = ''
- Zsh shell to use.
- '';
- };
-
programs.bash.interactiveShellInit = mkOption {
default = "";
description = ''
@@ -64,7 +56,7 @@ in
pkgs.bash
];
- environment.variables.SHELL = mkDefault "${cfg.shell}";
+ environment.variables.SHELL = mkDefault "${shell}/bin/bash";
environment.etc."bashrc".text = ''
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.