Compare commits

..

No commits in common. "4c1e256d6308b02d2e835ff6e11e86e7276676f3" and "3d4447558366d36a63e82eec07e947b68e94ec16" have entirely different histories.

4 changed files with 7 additions and 25 deletions

View file

@ -55,20 +55,13 @@ if [ -z "$PROFILE_LOADED" ] && [ -f ~/.profile ]; then
fi fi
# Intelligently set $EDITOR # Intelligently set $EDITOR
if [ "${EDITOR:-}" = "" ] || if [ "${EDITOR:-}" = "" ] || [ "${EDITOR##*/}" = "nano" ]; then
[ "${EDITOR##*/}" = "nano" ] ||
! command -v "$EDITOR" > /dev/null
then
if command -v nvim > /dev/null;then if command -v nvim > /dev/null;then
export EDITOR=nvim export EDITOR=nvim
elif command -v vim > /dev/null;then elif command -v vim > /dev/null;then
export EDITOR=vim export EDITOR=vim
elif command -v vi > /dev/null;then elif command -v vi > /dev/null;then
export EDITOR=vi export EDITOR=vi
elif command -v nano > /dev/null; then
export EDITOR=nano
else
echo "Error: couldn't find a valid candidate for \$EDITOR" >&2
fi fi
fi fi
export SYSTEMD_EDITOR="$EDITOR" export SYSTEMD_EDITOR="$EDITOR"
@ -82,9 +75,6 @@ if test -n "${ZSH_VERSION:-}"; then
export NIX_BUILD_SHELL=zsh export NIX_BUILD_SHELL=zsh
fi fi
# Launch zsh if we haven't yet
LAUNCH_ZSH="${LAUNCH_ZSH:-true}"
# Basic default LS colors # Basic default LS colors
export LSCOLORS="Gxfxcxdxbxegedabagacad" export LSCOLORS="Gxfxcxdxbxegedabagacad"

View file

@ -13,11 +13,3 @@ if command -v zoxide > /dev/null 2>&1 || ${SKIP_ZOXIDE:-false}; then
eval "$(zoxide init posix --hook prompt)" eval "$(zoxide init posix --hook prompt)"
fi fi
fi fi
# Switch to zsh if we're told to
if [ "${LAUNCH_ZSH:-false}" = true ] && command -v zsh > /dev/null 2>&1; then
LAUNCH_ZSH=false exec zsh
fi
# terminal colorscheme
careful_source "$SHELL_CONFIG_DIR/colors.sh"

View file

@ -82,6 +82,10 @@ ${SKIP_FUNCTIONS:-false} || fnupdate
### Options >>> ### Options >>>
set -o vi set -o vi
# <<<
### "Plugins" >>>
${SKIP_SH_PLUGINS:-false} || careful_source "$SHELL_CONFIG_DIR/plugins"
# <<< # <<<
# <<< # <<<
@ -94,9 +98,7 @@ ${SKIP_UPDATES:-false} || careful_source "$SHELL_CONFIG_DIR/updates" \
"Error: failed to run update script" $LINENO -x "command" "Error: failed to run update script" $LINENO -x "command"
### <<< ### <<<
### "Plugins" >>> # terminal colorscheme
${SKIP_SH_PLUGINS:-false} || careful_source "$SHELL_CONFIG_DIR/plugins" careful_source "$SHELL_CONFIG_DIR/colors.sh"
# <<<
# vim:fdm=marker:fmr=>>>,<<<:et:ft=sh:sw=3:ts=3 # vim:fdm=marker:fmr=>>>,<<<:et:ft=sh:sw=3:ts=3

2
.zshrc
View file

@ -265,8 +265,6 @@ load_working_dir && cd - > /dev/null || true
# <<< # <<<
# <<< # <<<
export BASH_LAUNCH_ZSH=false
# Optionally source another zshrc # Optionally source another zshrc
${SKIP_LOCAL_ZSHRC:-false} || careful_source "$SHELL_CONFIG_DIR/local/zshrc" ${SKIP_LOCAL_ZSHRC:-false} || careful_source "$SHELL_CONFIG_DIR/local/zshrc"