diff --git a/configuration.nix b/configuration.nix index bfdd23b..22e96a2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -132,7 +132,15 @@ in # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - + prorams.bash = { + 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 + ''; + }; services.gpm.enable = true; # Mouse support in tty @@ -222,13 +230,6 @@ in programs.bash = { 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 93c1d74..41684cf 100644 --- a/nixos-switch.log +++ b/nixos-switch.log @@ -1,31 +1,89 @@ -building Nix... -building the system configuration... error: - … while calling the 'head' builtin + … while evaluating the attribute 'config' - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/attrsets.nix:1575:11: + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: - 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; + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); | ^ - 810| inherit (res.defsFinal') highestPrio; + 323| _module = checked (config._module); + + … while calling the 'seq' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); (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: + error: The option `prorams' 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 + { + bash = { + interactiveShellInit = '' + if [[ $(/nix/store/ii2mdnlf5fvdsp03zcdml411f7mvlap8-procps-3.3.17/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + ... +building Nix... +error: + … while evaluating the attribute 'config' + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + … while calling the 'seq' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + (stack trace truncated; use '--show-trace' to show the full trace) + + error: The option `prorams' does not exist. Definition values: + - In `/etc/nixos/configuration.nix': + { + bash = { + interactiveShellInit = '' + if [[ $(/nix/store/ii2mdnlf5fvdsp03zcdml411f7mvlap8-procps-3.3.17/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + ... +building the system configuration... +error: + … while evaluating the attribute 'config.system.build.toplevel' + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + … while calling the 'seq' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + (stack trace truncated; use '--show-trace' to show the full trace) + + error: The option `prorams' does not exist. Definition values: + - In `/etc/nixos/configuration.nix': + { + bash = { + interactiveShellInit = '' + if [[ $(/nix/store/ii2mdnlf5fvdsp03zcdml411f7mvlap8-procps-3.3.17/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then ...