From 2d7d0c1fd79aaba81710e24d79aab2b0193e5c57 Mon Sep 17 00:00:00 2001 From: xerus2000 <27jf@pm.me> Date: Mon, 12 Oct 2020 22:19:12 +0200 Subject: [PATCH] config/zsh: Clean up external sourcings --- .config/zsh/.zshrc | 12 ++---------- .local/share/shell/.fzf.zsh | 13 ------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 .local/share/shell/.fzf.zsh diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 417fdf8..caadb9b 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -173,19 +173,11 @@ for file in $CONFIG_SHELLS/*; do source $file; done # AUTOMATICALLY ADDED SHIT -if [ -d "~/.sdkman" ]; then - export SDKMAN_DIR="~/.sdkman" - [[ -s "~/.sdkman/bin/sdkman-init.sh" ]] && source "~/.sdkman/bin/sdkman-init.sh" -fi - -# added by travis gem -[ -f /home/janek/.travis/travis.sh ] && source /home/janek/.travis/travis.sh - export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion # To customize prompt, run `p10k configure` or edit .p10k.zsh. -[[ ! -f $CONFIG_ZSH/.p10k.zsh ]] || source $CONFIG_ZSH/.p10k.zsh +test -f $CONFIG_ZSH/.p10k.zsh && source $CONFIG_ZSH/.p10k.zsh -[ -f $XDG_DATA_HOME/shell/.fzf.zsh ] && source $XDG_DATA_HOME/shell/.fzf.zsh +test -d /usr/share/fzf && source /usr/share/fzf/key-bindings.zsh && source /usr/share/fzf/completion.zsh diff --git a/.local/share/shell/.fzf.zsh b/.local/share/shell/.fzf.zsh deleted file mode 100644 index b7a8b48..0000000 --- a/.local/share/shell/.fzf.zsh +++ /dev/null @@ -1,13 +0,0 @@ -# Setup fzf -# --------- -if [[ ! "$PATH" == */opt/fzf/bin* ]]; then - export PATH="${PATH:+${PATH}:}/opt/fzf/bin" -fi - -# Auto-completion -# --------------- -[[ $- == *i* ]] && source "/opt/fzf/shell/completion.zsh" 2> /dev/null - -# Key bindings -# ------------ -source "/opt/fzf/shell/key-bindings.zsh"