Skip to content

Commit 814a69c

Browse files
authored
Merge pull request #44 from Mic92/fish
don't default to nix-shell as it seems to be buggy
2 parents f006b39 + 5547cd2 commit 814a69c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

share/nixos-shell/nixos-shell.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ in {
6767

6868
config = let
6969
user = builtins.getEnv "USER";
70-
shell = builtins.baseNameOf (builtins.getEnv "SHELL");
70+
shell' = builtins.baseNameOf (builtins.getEnv "SHELL");
71+
72+
# fish seems to do funky stuff: https://github.com/Mic92/nixos-shell/issues/42
73+
shell = if shell' == "fish" then "bash" else shell';
7174
in lib.mkMerge [
7275
# Enable the module of the user's shell for some sensible defaults.
7376
(lib.mkIf (options.programs ? ${shell}.enable && shell != "bash") {

0 commit comments

Comments
 (0)