From e38a6257f7cec9746f20ef8fae9e0cc40a286a9a Mon Sep 17 00:00:00 2001
From: eeleater <nikolasweger@googlemail.com>
Date: Sat, 23 Oct 2021 14:08:13 +0200
Subject: [PATCH] Update dot_config/zsh/export.zsh Update dot_zshrc

---
 dot_config/zsh/export.zsh |  4 +++-
 dot_zshrc                 | 32 ++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/dot_config/zsh/export.zsh b/dot_config/zsh/export.zsh
index 134c288..4d2b2d8 100644
--- a/dot_config/zsh/export.zsh
+++ b/dot_config/zsh/export.zsh
@@ -2,7 +2,6 @@
 export GPG_TTY=$TTY
 
 # History
-
 mkdir -p "$HOME/.cache/zsh" &>/dev/null
 export SAVEHIST=1048576
 export HISTSIZE=1048576
@@ -18,6 +17,9 @@ export SPACEVIMDIR="$HOME/.config/spacevim/"
 export FZF_MARKS_FILE="$HOME/.config/fzfmarks"
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 export LESSHISTFILE="-"
+export OMZ="$Z4H/ohmyzsh/ohmyzsh"
+export OMZP="$OMZ/plugins"
+export OMZL="$OMZ/lib"
 
 # Sheldon
 export SHELDON_CONFIG_DIR="$HOME/.config/sheldon"
diff --git a/dot_zshrc b/dot_zshrc
index a23bd2c..b652bb9 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -1,5 +1,4 @@
-# Documentation: https://github.com/romkatv/zsh4humans/blob/v5/README.md
-# tmux: integrated, system, no
+# https://github.com/romkatv/zsh4humans/blob/v5/README.md (tmux: integrated, system, no)
 zstyle ':z4h:' start-tmux 'no'
 
 # keyboard setting
@@ -7,36 +6,32 @@ zstyle ':z4h:bindkey' keyboard 'pc'
 zstyle ':z4h:autosuggestions' forward-char 'accept'
 zstyle ':z4h:fzf-complete' recurse-dirs 'no'
 
-# automatic teleportation of z4h to ssh 'yes' or 'no'
-#zstyle ':z4h:ssh:example-hostname1' enable 'yes'
+# automatic teleportation of z4h to ssh (yes, no) example: zstyle ':z4h:ssh:example-hostname1' enable 'yes'
 zstyle ':z4h:ssh:*' enable 'no'
 
 z4h install ohmyzsh/ohmyzsh || return
 z4h install urbainvaes/fzf-marks || return
 z4h install mroth/evalcache || return
-z4h install MichaelAquilina/zsh-you-should-use || return
 
-# install or update core components and initialize zsh. no network stuff after here 
+# initialize z4h (no network stuff after here)
 z4h init || return
 
 # exports
 z4h source -c $HOME/.config/zsh/export.zsh
 z4h source -c $HOME/.config/local/env.zsh
 
-# Source Files
-OMZ="$Z4H/ohmyzsh/ohmyzsh"
+# plugins (ohmyzsh)
+z4h source -c $OMZL/history.zsh
+z4h source -c $OMZL/completion.zsh
+z4h source -c $OMZL/directories.zsh
+z4h source -c $OMZL/clipboard.zsh
+z4h source -c $OMZL/grep.zsh
+z4h source -c $OMZP/command-not-found/command-not-found.plugin.zsh
+z4h source -c $OMZP/extract/extract.plugin.zsh
 
-z4h source -c $HOME/.config/zsh/sshagent.zsh
-z4h source -c $OMZ/lib/history.zsh
-z4h source -c $OMZ/lib/completion.zsh
-z4h source -c $OMZ/lib/directories.zsh
-z4h source -c $OMZ/lib/clipboard.zsh
-z4h source -c $OMZ/lib/grep.zsh
-z4h source -c $OMZ/plugins/command-not-found/command-not-found.plugin.zsh
-z4h source -c $OMZ/plugins/extract/extract.plugin.zsh
+# plugins (self)
 z4h source -c $Z4H/urbainvaes/fzf-marks/fzf-marks.plugin.zsh
 z4h source -c $Z4H/mroth/evalcache/evalcache.plugin.zsh
-z4h source -c $Z4H/MichaelAquilina/zsh-you-should-use/you-should-use.plugin.zsh
 
 #zinit pack for ls_colors
 
@@ -52,7 +47,8 @@ run_ranger () { echo; ranger < $TTY; zle redisplay }
 zle -N run_ranger
 bindkey '^f' run_ranger
 
-# fix ssh completions
+# ssh stuff
+z4h source -c $HOME/.config/zsh/sshagent.zsh
 z4h source -c $HOME/.config/zsh/sshcompfix.zsh
 
 # Define named directories: ~wsl <=> Windows home directory on WSL.