Compare commits

...

5 commits

Author SHA1 Message Date
b7d187caaa shell/plugins: fix zoxide check issue 2024-09-11 00:13:44 -07:00
f034209385 zsh: prefer zoxide to zsh 2024-09-11 00:13:32 -07:00
cd5ab32ac6 bash: remove colors function
it was moved into `prcolors` a while ago
2024-09-11 00:12:48 -07:00
78edcec21e Merge branch 'master' of 192.168.1.2:PowerUser/dotfiles 2024-09-11 00:10:19 -07:00
80ecba5396 shell: add and source plugins
Currently only zoxide
2024-09-11 00:00:20 -07:00
4 changed files with 25 additions and 29 deletions

29
.bashrc
View file

@ -17,34 +17,7 @@ export SHELL_CONFIG_DIR="${SHELL_CONFIG_DIR:-"${XDG_CONFIG_HOME:-"$HOME/.config"
# Source standard shell configuration
[ -f "$SHELL_CONFIG_DIR/shrc" ] && source "$SHELL_CONFIG_DIR/shrc"
### Manjaro default bashrc >>>
colors() {
local fgc bgc vals seq0
printf "Color escapes are %s\n" '\e[${value};...;${value}m'
printf "Values 30..37 are \e[33mforeground colors\e[m\n"
printf "Values 40..47 are \e[43mbackground colors\e[m\n"
printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n"
# foreground colors
for fgc in {30..37}; do
# background colors
for bgc in {40..47}; do
fgc=${fgc#37} # white
bgc=${bgc#40} # black
vals="${fgc:+$fgc;}${bgc}"
vals=${vals%%;}
seq0="${vals:+\e[${vals}m}"
printf " %-9s" "${seq0:-(default)}"
printf " ${seq0}TEXT\e[m"
printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m"
done
echo; echo
done
}
### (mostly) Manjaro default bashrc >>>
[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
# Change the window title of X terminals

17
.config/shell/plugins Normal file
View file

@ -0,0 +1,17 @@
#!/bin/sh
# shell plugins for POSIX
# Enable zoxide if it exists
if command -v zoxide > /dev/null 2>&1 || ${SKIP_ZOXIDE:-false}; then
# Check what shell we're using based on variables that get set by non-posix shells - https://stackoverflow.com/a/3327022
if [ -n "${ZSH_NAME+set}" ]; then # zsh
eval "$(zoxide init zsh)"
elif [ -n "${BASH+set}" ]; then # bash
eval "$(zoxide init bash)"
else
# assume posix
eval "$(zoxide init posix --hook prompt)"
fi
# make an alias (feels wrong to do it here, but feels worse to split it into ./aliases)
alias z=zoxide
fi

View file

@ -82,6 +82,10 @@ ${SKIP_FUNCTIONS:-false} || fnupdate
### Options >>>
set -o vi
# <<<
### "Plugins" >>>
${SKIP_SH_PLUGINS:-false} || careful_source "$SHELL_CONFIG_DIR/plugins"
# <<<
# <<<

2
.zshrc
View file

@ -66,7 +66,9 @@ ${SKIP_PLUGINS:-false} || {
zinit load "jeffreytse/zsh-vi-mode"
zinit load "zsh-users/zsh-history-substring-search"
zinit load "zsh-users/zsh-completions"
if ! command -v zoxide &> /dev/null || ${SKIP_ZOXIDE:-false}; then
zinit load "agkozak/zsh-z"
fi
# Plugins for use with Nix
zinit load "chisui/zsh-nix-shell"