diff --git a/configuration.nix b/configuration.nix index c18fc4a..bfdd23b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -221,7 +221,14 @@ in }; programs.bash = { - enable = false; + enable = true; + interactiveShellInit = '' + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + ''; shellAliases= { emacs="emacs -nw"; nixrc="exec $HOME/media/Code/git/nixos/edit-config.sh"; diff --git a/nixos-switch.log b/nixos-switch.log index db774bf..93c1d74 100644 --- a/nixos-switch.log +++ b/nixos-switch.log @@ -1,7 +1,31 @@ building Nix... building the system configuration... -activating the configuration... -setting up /etc... -reloading user units for lightdm... -reloading user units for deadvey... -restarting sysinit-reactivation.target +error: + … while calling the 'head' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/attrsets.nix:1575:11: + + 1574| || pred here (elemAt values 1) (head values) then + 1575| head values + | ^ + 1576| else + + … while evaluating the attribute 'value' + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:809:9: + + 808| in warnDeprecation opt // + 809| { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; + | ^ + 810| inherit (res.defsFinal') highestPrio; + + (stack trace truncated; use '--show-trace' to show the full trace) + + error: The option `home-manager.users.deadvey.programs.bash.interactiveShellInit' does not exist. Definition values: + - In `/etc/nixos/configuration.nix': + '' + if [[ $(/nix/store/ii2mdnlf5fvdsp03zcdml411f7mvlap8-procps-3.3.17/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec /nix/store/8qd4ca73xfm277z4hgqn3c6y3n8v914d-fish-3.7.1/bin/fish $LOGIN_OPTION + ...