all: overhaul, move dotfile specifics to .local/share/dotfiles and more

1 files changed, 26 insertions, 13 deletions

diff --git a/zsh/.zshenv b/zsh/.zshenv
index ca10a3f..8b585a9 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,7 +1,14 @@
-export EDITOR="nvim"
+export PAGER="/usr/bin/less"
+export EDITOR="/usr/bin/nvim"
+export VISUAL="/usr/bin/nvim"
+export TERMINAL="/usr/bin/alacritty"
+export BROWSER="/usr/bin/firefox-developer-edition"
 
 export DEFAULT_USER=peter
 
+export SSH_ASKPASS="$HOME/.local/bin/dmenu_pass"
+export SUDO_ASKPASS="$HOME/.local/bin/dmenu_pass"
+
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
@@ -9,16 +16,17 @@ export XDG_DATA_HOME="$HOME/.local/share"
 
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 
-extra_paths=""
+typeset -U PATH path
+path=("$path[@]")
 
 # RUST XDG_DIR
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
-extra_paths="$CARGO_HOME/bin"
+path=("$CARGO_HOME/bin" "$path[@]")
 
 # GOPATH
 export GOPATH="$XDG_DATA_HOME/go"
-extra_paths="$extra_paths:$GOPATH/bin"
+path=("$GOPATH/bin" "$path[@]")
 
 # Ruby
 export GEM_HOME="$XDG_DATA_HOME/gem"
@@ -26,13 +34,13 @@ export GEM_SPEC_CACHE="$XDG_CACHE_HOME/gem"
 export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME/bundle"
 export BUNDLE_USER_CACHE="$XDG_CACHE_HOME/bundle"
 export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME/bundle"
-extra_paths="$extra_paths:$GEM_HOME/bin"
+path=("$GEM_HOME/bin" "$path[@]")
 
 # Node & NPM
 export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
 export npm_config_prefix="$XDG_DATA_HOME/node"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-extra_paths="$extra_paths:$npm_config_prefix/bin"
+path=("$npm_config_prefix/bin" "$path[@]")
 
 # Docker
 export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
@@ -54,11 +62,16 @@ export PYLINTHOME="$XDG_CACHE_HOME/pylint"
 export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
 export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
 
-[ -d "$HOME/bin" ] && \
-    PATH="$HOME/bin:$PATH"
-[ -d "$HOME/.bin" ] && \
-    PATH="$HOME/.bin:$PATH"
-[ -d "$HOME/.local/bin" ] && \
-    PATH="$HOME/.local/bin:$PATH"
-export PATH="$extra_paths:$PATH"
+#[ -d "$HOME/bin" ] && \
+#    path=("$HOME/bin" "$path[@]")
+#[ -d "$HOME/.bin" ] && \
+#    path=("$HOME/.bin" "$path[@]")
+#[ -d "$HOME/.local/bin" ] && \
+#    path=("$HOME/.local/bin" "$path[@]")
+for dir in ~/bin ~/.bin ~/.local/bin; do
+    if [[ -d "${dir}" ]]; then
+        path=($dir $path)
+    fi
+done
+export PATH