don't set SHELL automatically based on programs.<shell>.enable

5 files changed, 4 insertions, 9 deletions

diff --git a/modules/environment/default.nix b/modules/environment/default.nix
index 2791c45..eed1604 100644
--- a/modules/environment/default.nix
+++ b/modules/environment/default.nix
@@ -77,7 +77,7 @@ in
 
     environment.loginShell = mkOption {
       type = types.str;
-      default = "$SHELL";
+      default = "$SHELL -l";
       description = "Configure default login shell.";
     };
 
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix
index e8114ec..423636b 100644
--- a/modules/examples/lnl.nix
+++ b/modules/examples/lnl.nix
@@ -271,6 +271,9 @@
     zle -N up-line-or-beginning-search
   '';
 
+  environment.loginShell = "${pkgs.zsh}/bin/zsh -l";
+  environment.variables.SHELL = "${pkgs.zsh}/bin/zsh";
+
   environment.variables.LANG = "en_US.UTF-8";
 
   environment.shellAliases.g = "git log --pretty=color -32";
diff --git a/modules/programs/bash/default.nix b/modules/programs/bash/default.nix
index fb93b79..6ebd923 100644
--- a/modules/programs/bash/default.nix
+++ b/modules/programs/bash/default.nix
@@ -45,9 +45,6 @@ in
         "/share/bash-completion/completions"
       ];
 
-    environment.loginShell = mkDefault "bash -l";
-    environment.variables.SHELL = mkDefault "${pkgs.bashInteractive}/bin/bash";
-
     environment.etc."bashrc".text = ''
       # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
       # This file is read for interactive shells.
diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index 64436e2..14100d8 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -105,9 +105,6 @@ in
 
     environment.pathsToLink = [ "/share/zsh" ];
 
-    environment.loginShell = "zsh -l";
-    environment.variables.SHELL = "${pkgs.zsh}/bin/zsh";
-
     environment.etc."zshenv".text = ''
       # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
       # This file is read for all shells.
diff --git a/tests/programs-zsh.nix b/tests/programs-zsh.nix
index af1b3dd..ba03229 100644
--- a/tests/programs-zsh.nix
+++ b/tests/programs-zsh.nix
@@ -22,8 +22,6 @@
 
      echo >&2 "checking setEnvironment in /etc/zshenv"
      fgrep '. ${config.system.build.setEnvironment}' ${config.out}/etc/zshenv
-     echo >&2 "checking SHELL in setEnvironment"
-     grep 'export SHELL="${pkgs.zsh}/bin/zsh"' ${config.system.build.setEnvironment}
      echo >&2 "checking nix-shell return /etc/zshenv"
      grep 'if test -n "$IN_NIX_SHELL"; then return; fi' ${config.out}/etc/zshenv
      echo >&2 "checking zshenv.d in /etc/zshenv"