refactoring and nushell
This commit is contained in:
parent
359e58f469
commit
396aee7db9
10 changed files with 301 additions and 92 deletions
|
@ -43,6 +43,11 @@
|
|||
});
|
||||
})
|
||||
|
||||
(final: prev: {
|
||||
bash-env-json = inputs.bash-env-json.packages.x86_64-linux.default;
|
||||
bash-env-nushell = inputs.bash-env-nushell.packages.x86_64-linux.default;
|
||||
})
|
||||
|
||||
(final: prev: {
|
||||
manifold = prev.manifold.overrideAttrs (old: {
|
||||
cmakeFlags = [
|
||||
|
@ -344,15 +349,16 @@
|
|||
|
||||
programs.java.enable = true;
|
||||
|
||||
# enable fish and launch it from bash for interactive shells
|
||||
# enable alternate shells and launch it from bash for interactive shells
|
||||
programs.fish.enable = true;
|
||||
environment.pathsToLink = [ "/share/fish" ];
|
||||
# environment.pathsToLink = [ "/share/fish" ];
|
||||
environment.shells = [ pkgs.nushell ];
|
||||
programs.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
|
||||
exec ${pkgs.nushell}/bin/nu $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -35,5 +35,6 @@
|
|||
gnomeExtensions.appindicator
|
||||
gnome-settings-daemon
|
||||
swayidle
|
||||
nushell
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue