Adding fzf-tab, fixing install.sh with shellcheck.
This commit is contained in:
parent
d8d598f888
commit
ebc588b32e
@ -35,11 +35,6 @@ source "${ZDOTDIR}/fzf.zsh"
|
|||||||
## it has to be last
|
## it has to be last
|
||||||
source "${ZDOTDIR}/atuin.zsh"
|
source "${ZDOTDIR}/atuin.zsh"
|
||||||
|
|
||||||
# source modules
|
|
||||||
source "${HOME}/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh"
|
|
||||||
source "${HOME}/.local/git/zsh_modules/wd/wd.plugin.zsh"
|
|
||||||
export WD_CONFIG="${XDG_CONFIG_HOME}/wd_list"
|
|
||||||
|
|
||||||
# set fpath
|
# set fpath
|
||||||
fpath=(~/.local/git/zsh_modules/wd $fpath)
|
fpath=(~/.local/git/zsh_modules/wd $fpath)
|
||||||
|
|
||||||
@ -57,9 +52,6 @@ if [[ -r "${XDG_CACHE_HOME}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# completion
|
# completion
|
||||||
zstyle ':completion:*' menu select
|
|
||||||
zstyle ':completion:*' list-colors ''
|
|
||||||
|
|
||||||
autoload -Uz compinit
|
autoload -Uz compinit
|
||||||
if [ ! -e "${XDG_DATA_HOME}/zsh/zcompdump.zwc" ]; then
|
if [ ! -e "${XDG_DATA_HOME}/zsh/zcompdump.zwc" ]; then
|
||||||
autoload -Uz zrecompile
|
autoload -Uz zrecompile
|
||||||
@ -67,6 +59,19 @@ if [ ! -e "${XDG_DATA_HOME}/zsh/zcompdump.zwc" ]; then
|
|||||||
fi
|
fi
|
||||||
compinit -C -d "${XDG_DATA_HOME}/zsh/zcompdump"
|
compinit -C -d "${XDG_DATA_HOME}/zsh/zcompdump"
|
||||||
|
|
||||||
|
zstyle ':completion:*' menu no
|
||||||
|
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
|
||||||
|
zstyle ':fzf-tab:*' fzf-command ftb-tmux-popup
|
||||||
|
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'
|
||||||
|
zstyle ':fzf-tab:complete:cd:*' popup-pad 60 0
|
||||||
|
zstyle ':fzf-tab:complete:diff:*' popup-min-size 80 12
|
||||||
|
|
||||||
|
# source modules
|
||||||
|
source "${HOME}/.local/git/zsh_modules/fzf-tab/fzf-tab.plugin.zsh"
|
||||||
|
source "${HOME}/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh"
|
||||||
|
source "${HOME}/.local/git/zsh_modules/wd/wd.plugin.zsh"
|
||||||
|
export WD_CONFIG="${XDG_CONFIG_HOME}/wd_list"
|
||||||
|
|
||||||
# quick note functionality
|
# quick note functionality
|
||||||
if [[ -f "${HOME}/.note" ]]; then
|
if [[ -f "${HOME}/.note" ]]; then
|
||||||
echo
|
echo
|
||||||
|
39
install.sh
39
install.sh
@ -1,37 +1,38 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
|
||||||
# variables
|
# variables
|
||||||
LOCAL_GIT_DIR=${HOME}/.local/git
|
LOCAL_GIT_DIR="${HOME}/.local/git"
|
||||||
XDG_CACHE_HOME=/tmp/${USER}-cache
|
XDG_CACHE_HOME="/tmp/${USER}-cache"
|
||||||
XDG_CONFIG_HOME=${HOME}/.config
|
XDG_CONFIG_HOME="${HOME}/.config"
|
||||||
XDG_DATA_HOME=${HOME}/.local/share
|
XDG_DATA_HOME="${HOME}/.local/share"
|
||||||
XDG_STATE_HOME=${HOME}/.local/state
|
XDG_STATE_HOME="${HOME}/.local/state"
|
||||||
|
|
||||||
# clean + prepare local dirs
|
# clean + prepare local dirs
|
||||||
rm -rf ~/.cache ~/.config/_cache ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.hushlogin ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh*
|
rm -rf ~/.cache ~/.config/_cache ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.hushlogin ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh*
|
||||||
rm -rf ${XDG_CACHE_HOME} ${XDG_DATA_HOME}/nvim ${XDG_STATE_HOME}/nvim
|
rm -rf "${XDG_CACHE_HOME}" "${XDG_DATA_HOME}/nvim" "${XDG_STATE_HOME}/nvim"
|
||||||
mkdir -p ${XDG_CACHE_HOME} ${XDG_CONFIG_HOME} ${XDG_DATA_HOME}
|
mkdir -p "${XDG_CACHE_HOME}" "${XDG_CONFIG_HOME}" "${XDG_DATA_HOME}"
|
||||||
chmod 700 ${XDG_CACHE_HOME}
|
chmod 700 "${XDG_CACHE_HOME}"
|
||||||
|
|
||||||
# prepare repository
|
# prepare repository
|
||||||
mkdir -p ${LOCAL_GIT_DIR}
|
mkdir -p "${LOCAL_GIT_DIR}"
|
||||||
rm -rf ${LOCAL_GIT_DIR}/dotfiles
|
rm -rf "${LOCAL_GIT_DIR}/dotfiles"
|
||||||
git clone https://git.insomniac.pl/ftpd/dotfiles $LOCAL_GIT_DIR/dotfiles
|
git clone https://git.insomniac.pl/ftpd/dotfiles "${LOCAL_GIT_DIR}/dotfiles"
|
||||||
|
|
||||||
# zsh modules
|
# zsh modules
|
||||||
mkdir -p ${LOCAL_GIT_DIR}/zsh_modules
|
mkdir -p "${LOCAL_GIT_DIR}/zsh_modules"
|
||||||
rm -rf ${LOCAL_GIT_DIR}/zsh_modules/*
|
for module in Aloxaf/fzf-tab mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do
|
||||||
for module in mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do
|
rm -rf "${LOCAL_GIT_DIR}/zsh_modules/${module#*/}"
|
||||||
git clone https://github.com/${module} $LOCAL_GIT_DIR/zsh_modules/${module#*/}
|
git clone https://github.com/${module} "${LOCAL_GIT_DIR}/zsh_modules/${module#*/}"
|
||||||
done
|
done
|
||||||
|
|
||||||
# configs
|
# configs
|
||||||
for i in ${LOCAL_GIT_DIR}/dotfiles/config/*; do
|
for i in "${LOCAL_GIT_DIR}"/dotfiles/config/*; do
|
||||||
rm -rf ${XDG_CONFIG_HOME}/$(basename $i)
|
rm -rf "${XDG_CONFIG_HOME:?}/$(basename "${i}")"
|
||||||
ln -sf ${LOCAL_GIT_DIR}/dotfiles/config/$(basename $i) ${XDG_CONFIG_HOME}/
|
ln -sf "${LOCAL_GIT_DIR}/dotfiles/config/$(basename "${i}")" "${XDG_CONFIG_HOME}/"
|
||||||
done
|
done
|
||||||
|
|
||||||
# execute post-install script
|
# execute post-install script
|
||||||
printf "Running post-install script... "
|
printf "Running post-install script... "
|
||||||
. ${LOCAL_GIT_DIR}/dotfiles/scripts/post-install.sh
|
. "${LOCAL_GIT_DIR}/dotfiles/scripts/post-install.sh"
|
||||||
echo "done."
|
echo "done."
|
||||||
|
Loading…
Reference in New Issue
Block a user