PowerUser/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of PowerUser/dotfiles

Browse source
This commit is contained in:
PowerUser64 2024-09-16 17:41:55 -07:00
commit 706ed31198
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.config/shell/env
View file

@ -55,13 +55,20 @@ if [ -z "$PROFILE_LOADED" ] && [ -f ~/.profile ]; then
fi fi
# Intelligently set $EDITOR # Intelligently set $EDITOR
if [ "${EDITOR:-}" = "" ] || [ "${EDITOR##*/}" = "nano" ]; then if [ "${EDITOR:-}" = "" ] ||
[ "${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"
@ -75,6 +82,9 @@ 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"

8
.config/shell/plugins
View file

@ -13,3 +13,11 @@ 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"

10
.config/shell/shrc
View file

@ -82,10 +82,6 @@ ${SKIP_FUNCTIONS:-false} || fnupdate
### Options >>> ### Options >>>
set -o vi set -o vi
# <<<
### "Plugins" >>>
${SKIP_SH_PLUGINS:-false} || careful_source "$SHELL_CONFIG_DIR/plugins"
# <<< # <<<
# <<< # <<<
@ -98,7 +94,9 @@ ${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"
### <<< ### <<<
# terminal colorscheme ### "Plugins" >>>
careful_source "$SHELL_CONFIG_DIR/colors.sh" ${SKIP_SH_PLUGINS:-false} || careful_source "$SHELL_CONFIG_DIR/plugins"
# <<<
# 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,6 +265,8 @@ 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"