From 0c4fbaf0d94b7de981ef798cedad2fa4ca03caed Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Dec 2016 23:11:35 +0100
Subject: add variables option to programs.zsh module

---
 modules/programs/bash.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'modules/programs/bash.nix')

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.
-- 
cgit v1.2.3