diff --git a/_bashrc b/_bashrc index f51f3d6..4b7efe5 100755 --- a/_bashrc +++ b/_bashrc @@ -24,6 +24,10 @@ mkcd() { cd "$1" } +if [ "$PREFERRED_SHELL" = zsh ] && command -v ls > /dev/null; then + exec zsh +fi + export PS1=" $(tput bold)$(tput setaf 1)[$(tput setaf 3)\u$(tput setaf 2)@$(tput setaf 4)\H $(tput setaf 5)\w$(tput setaf 1)]$(tput setaf 7) $ $(tput sgr0)" diff --git a/_zshrc b/_zshrc index dda566f..c23809d 100755 --- a/_zshrc +++ b/_zshrc @@ -30,6 +30,7 @@ function zle-keymap-select { } zle -N zle-keymap-select +unset PREFERRED_SHELL [ -f "$HOME/./config/bashrc" ] && emulate sh -c "source $HOME/./config/bashrc" [ -f "$HOME/.bashrc" ] && emulate sh -c "source $HOME/.bashrc" diff --git a/flake.nix b/flake.nix index dbf71a3..3a7c82c 100644 --- a/flake.nix +++ b/flake.nix @@ -114,6 +114,7 @@ # Environment variables only for this user/session home.sessionVariables = { EDITOR = "nvim"; + PREFERRED_SHELL = "zsh"; }; # Good HM hygiene