From 10891f685b04638a5eadc6ca03ba54f4a60269fb Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Wed, 11 Dec 2019 15:54:20 +0100 Subject: [PATCH] updated stuff --- zsh/.zshrc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index 335b05b..72a6f81 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -2,15 +2,13 @@ if [[ -r "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then source "$HOME/.cache/p10k-instant-prompt-${(%):-%n}.zsh" fi +export os=$(grep -E "^ID=" /etc/*release | cut -d= -f2) + source $ZDOTDIR/exports.zsh source $ZDOTDIR/dircolor.zsh -if [[ $(grep -E "^ID" /etc/*release | cut -d= -f2) == "arch" ]]; then - source $share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - source $share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme -else - source $share/zsh-autosuggestions/zsh-autosuggestions.zsh -fi +source $share/zsh-autosuggestions/zsh-autosuggestions.zsh +source $share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme autoload -Uz compinit if [[ -n $HOME/.cache/zsh/compdump(#qN.mh+24) ]]; then compinit -d $HOME/.cache/zsh/compdump; else compinit -d $HOME/.cache/zsh/compdump -C; fi @@ -18,12 +16,16 @@ if [[ -n $HOME/.cache/zsh/compdump(#qN.mh+24) ]]; then compinit -d $HOME/.cache/ for file in $ZDOTDIR/libs/*.zsh; do source "$file"; done for file in $ZDOTDIR/plgs/*.zsh; do source "$file"; done -if [[ $(grep -E "^ID" /etc/*release | cut -d= -f2) == "arch" ]]; then +if [[ $os == "arch" ]]; then source $fzf/completion.zsh source $fzf/key-bindings.zsh source $share/doc/pkgfile/command-not-found.zsh else - source $share/doc/fzf/examples/key-bindings.zsh + if [[ $os == "debian" || $os == "ubuntu" ]]; then + source $share/doc/fzf/examples/key-bindings.zsh + else + source $share/fzf/shell/key-bindings.zsh + fi fi source $ZDOTDIR/tmux/tmux.zsh