HUGE changes in bashrc nd zshrc

3 files changed, 47 insertions, 7 deletions

diff --git a/.bashrc b/.bashrc
index 32047dd..960b255 100644
--- a/.bashrc
+++ b/.bashrc
@@ -13,7 +13,7 @@
 #neofetch small
 
 #ble.sh bash w vi-mode and auto-completion
-[[ $- == *i* ]] && source $HOME/.local/src/blesh/ble.sh --noattach
+##[[ $- == *i* ]] && source $HOME/.local/src/blesh/ble.sh --noattach
 
 alias ls='ls --color=auto'
 #PS1='[\u@\h \W]\$ '
@@ -40,22 +40,34 @@ set -o ignoreeof
 export PATH="$PATH:$HOME/.scripts"
 # Adds `~/.local/bin` to $PATH
 export PATH="$PATH:$HOME/.local/bin"
-
-
 export SUDO_ASKPASS="$HOME/.local/bin/dpass"
 
+
 #infinite history
 HISTSIZE= HISTFILESIZE= 
 #timecodes in bash history :))
 #HISTTIMEFORMAT="%d/%m/%y %T "
 HISTTIMEFORMAT="%F %T"
 #ignore dupes
-HISTCONTROL=ignoredups
+export HISTCONTROL=ignoredups:erasedups
+
+#XDG
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_CACHE_HOME="$HOME/.cache"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+export TERMINFO="$XDG_DATA_HOME/terminfo"
+export LESSHISTFILE="$XDG_CACHE_HOME/less/history"
+export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
+export HISTFILE="${XDG_STATE_HOME}/bash/history"
 
 # Load aliases
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
 #partially supported XDG Base Directory
 [ -f "$HOME/.config/env" ] && source "$HOME/.config/env"
 
-[[ ${BLE_VERSION-} ]] && ble-attach
+#[[ ${BLE_VERSION-} ]] && ble-attach
 
+export N_PREFIX="$HOME/.local/usr/n"; [[ :$PATH: == *":$N_PREFIX/bin:"* ]] || PATH+=":$N_PREFIX/bin"  # Added by n-install (see http://git.io/n-install-repo).
diff --git a/.zshenv b/.zshenv
index 07d580d..38e3db4 100644
--- a/.zshenv
+++ b/.zshenv
@@ -3,8 +3,33 @@ export EDITOR="nvim"
 export READER="zathura"
 export TERMINAL="st"
 export BROWSER="brave"
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+##export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+export VIDEO="mpv"
+export IMAGE="sxiv"
+export OPENER="xdg-open"
+export PAGER="less"
+export WM="dwm"
 
+# Other XDG paths
+
+export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"}
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"}
+export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"}
+export XDG_STATE_HOME=${XDG_STATE_HOME:="$HOME/.local/state"}
+
+# Fixing Paths
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+export GOPATH="$XDG_DATA_HOME"/go
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+
+# Path
+path=("$HOME/scripts" "$HOME/.local/bin" "$path[@]")
+export PATH
 
 # Documentation: https://github.com/romkatv/zsh4humans/blob/v5/README.md.
 
diff --git a/.zshrc b/.zshrc
index e55a1d4..8566927 100644
--- a/.zshrc
+++ b/.zshrc
@@ -59,7 +59,6 @@ bindkey -v
 
 # Extend PATH.
 path=(~/bin $path)
-
 # Export environment variables.
 export GPG_TTY=$TTY
 
@@ -106,3 +105,7 @@ alias ls="${aliases[ls]:-ls} -A"
 # Set shell options: http://zsh.sourceforge.net/Doc/Release/Options.html.
 setopt glob_dots     # no special treatment for file names with a leading dot
 setopt no_auto_menu  # require an extra TAB press to open the completion menu
+
+
+#XDG
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"