diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 3634c03..8699d2c 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -35,11 +35,6 @@ source "${ZDOTDIR}/fzf.zsh" ## it has to be last 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 fpath=(~/.local/git/zsh_modules/wd $fpath) @@ -57,9 +52,6 @@ if [[ -r "${XDG_CACHE_HOME}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then fi # completion -zstyle ':completion:*' menu select -zstyle ':completion:*' list-colors '' - autoload -Uz compinit if [ ! -e "${XDG_DATA_HOME}/zsh/zcompdump.zwc" ]; then autoload -Uz zrecompile @@ -67,6 +59,19 @@ if [ ! -e "${XDG_DATA_HOME}/zsh/zcompdump.zwc" ]; then fi 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 if [[ -f "${HOME}/.note" ]]; then echo diff --git a/install.sh b/install.sh index 1794174..ea4e8e2 100644 --- a/install.sh +++ b/install.sh @@ -1,37 +1,38 @@ #!/bin/sh +# shellcheck disable=SC1091 # variables -LOCAL_GIT_DIR=${HOME}/.local/git -XDG_CACHE_HOME=/tmp/${USER}-cache -XDG_CONFIG_HOME=${HOME}/.config -XDG_DATA_HOME=${HOME}/.local/share -XDG_STATE_HOME=${HOME}/.local/state +LOCAL_GIT_DIR="${HOME}/.local/git" +XDG_CACHE_HOME="/tmp/${USER}-cache" +XDG_CONFIG_HOME="${HOME}/.config" +XDG_DATA_HOME="${HOME}/.local/share" +XDG_STATE_HOME="${HOME}/.local/state" # 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 ${XDG_CACHE_HOME} ${XDG_DATA_HOME}/nvim ${XDG_STATE_HOME}/nvim -mkdir -p ${XDG_CACHE_HOME} ${XDG_CONFIG_HOME} ${XDG_DATA_HOME} -chmod 700 ${XDG_CACHE_HOME} +rm -rf "${XDG_CACHE_HOME}" "${XDG_DATA_HOME}/nvim" "${XDG_STATE_HOME}/nvim" +mkdir -p "${XDG_CACHE_HOME}" "${XDG_CONFIG_HOME}" "${XDG_DATA_HOME}" +chmod 700 "${XDG_CACHE_HOME}" # prepare repository -mkdir -p ${LOCAL_GIT_DIR} -rm -rf ${LOCAL_GIT_DIR}/dotfiles -git clone https://git.insomniac.pl/ftpd/dotfiles $LOCAL_GIT_DIR/dotfiles +mkdir -p "${LOCAL_GIT_DIR}" +rm -rf "${LOCAL_GIT_DIR}/dotfiles" +git clone https://git.insomniac.pl/ftpd/dotfiles "${LOCAL_GIT_DIR}/dotfiles" # zsh modules -mkdir -p ${LOCAL_GIT_DIR}/zsh_modules -rm -rf ${LOCAL_GIT_DIR}/zsh_modules/* -for module in mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do - git clone https://github.com/${module} $LOCAL_GIT_DIR/zsh_modules/${module#*/} +mkdir -p "${LOCAL_GIT_DIR}/zsh_modules" +for module in Aloxaf/fzf-tab 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#*/}" done # configs -for i in ${LOCAL_GIT_DIR}/dotfiles/config/*; do - rm -rf ${XDG_CONFIG_HOME}/$(basename $i) - ln -sf ${LOCAL_GIT_DIR}/dotfiles/config/$(basename $i) ${XDG_CONFIG_HOME}/ +for i in "${LOCAL_GIT_DIR}"/dotfiles/config/*; do + rm -rf "${XDG_CONFIG_HOME:?}/$(basename "${i}")" + ln -sf "${LOCAL_GIT_DIR}/dotfiles/config/$(basename "${i}")" "${XDG_CONFIG_HOME}/" done # execute 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."