LnL7/nix-darwin
1
1
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-09-11 12:49:18 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daiderd Jordan 2020-10-25 16:32:55 +01:00
parent 1804b8ecd2
commit 079db5db5b
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
5 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/environment/default.nix
View File

@ -77,7 +77,7 @@ in
environment.loginShell = mkOption {
type = types.str;
default = "$SHELL";
default = "$SHELL -l";
description = "Configure default login shell.";
};

3
modules/examples/lnl.nix
View File

@ -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";

3
modules/programs/bash/default.nix
View File

@ -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.

3
modules/programs/zsh/default.nix
View File

@ -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.

2
tests/programs-zsh.nix
View File

@ -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"