.bash_profile: Clean up environment

Move wrappers to separate folder. Move vimrc
to application directory.

1 files changed, 22 insertions, 17 deletions

diff --git a/.bash_profile b/.bash_profile
index 6b75ff4..9581a74 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -6,44 +6,49 @@ prefixPath() {
     *":$1:"*) true ;;
     *) PATH="$1:$PATH" ;;
   esac
-  export PATH;
+  export PATH
 }
 
-prefixPath "$HOME/.local/bin";
-prefixPath "$HOME/.local/bin/scripts";
+prefixPath "$HOME/.local/bin"
+prefixPath "$HOME/.local/bin/scripts"
+prefixPath "$HOME/.local/bin/wrappers"
 
 # auto login
 [ "$EUID" != 0 ] && [ -z "$DISPLAY" ] && [ "$(tty)" = '/dev/tty1' ] \
-  && command -v nix && "$HOME"/.local/bin/scripts/nix-xorg-conf > "$HOME"/.config/X11/xorg.conf.d/00-modules.conf \
-  && exec sx;
+  && command -v nix && nix-xorg-conf > "$HOME"/.config/X11/xorg.conf.d/00-modules.conf \
+  && exec sx
 
-umask 0022;
+umask 0022
 
-PS1_USER='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;34m\]\w\[\e[0m\] \[\e[0;34m\]\$\[\e[0m\] '
-PS1_ROOT='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;31m\]\w\[\e[0m\] \[\e[0;31m\]\$\[\e[0m\] '
-PS1_SSHD='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;32m\]\w\[\e[0m\] \[\e[0;32m\]\$\[\e[0m\] '
+PS1_USER='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;34m\]\W\[\e[0m\] \[\e[0;34m\]\$\[\e[0m\] '
+PS1_ROOT='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;31m\]\W\[\e[0m\] \[\e[0;31m\]\$\[\e[0m\] '
+PS1_SSHD='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;32m\]\W\[\e[0m\] \[\e[0;32m\]\$\[\e[0m\] '
 
-[ "$EUID" != 0 ] && export PS1="$PS1_USER";
-[ "$EUID" = 0 ] && export PS1="$PS1_ROOT";
+[ "$EUID" != 0 ] && export PS1="$PS1_USER"
+[ "$EUID" = 0 ] && export PS1="$PS1_ROOT"
 
-[ -n "$SSH_CLIENT" ] && [ "$EUID" != 0 ] && export PS1="$PS1_SSHD";
+[ -n "$SSH_CLIENT" ] && [ "$EUID" != 0 ] && export PS1="$PS1_SSHD"
 
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+export BROWSER=browser
+export EDITOR=vim
+export TERMINAL=urxvt
 
 export DESKTOP_SESSION=gnome
 export XDG_CURRENT_DESKTOP=gnome
 
-export BROWSER=browser;
 export CARGO_HOME="$XDG_CACHE_HOME/cargo"
 export DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com"
-export EDITOR=vim
+export ELECTRUMDIR="$XDG_DATA_HOME/electrum"
 export FZF_DIRECTORY_MARKS=$XDG_CONFIG_HOME/fzf/marks/directories
 export FZF_FILE_MARKS=$XDG_CONFIG_HOME/fzf/marks/files
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
-export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
 export GTK_OVERLAY_SCROLLING=0
 export HISTCONTROL=ignoreboth:erasedups
 export HISTFILESIZE=-1
@@ -51,16 +56,16 @@ export HISTSIZE=-1
 export HISTTIMEFORMAT="%d/%m/%y %T "
 export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
 export INPUTRC="$XDG_CONFIG_HOME/inputrc"
+export LEIN_HOME="$XDG_DATA_HOME/lein"
 export LESSHISTFILE="$XDG_CACHE_HOME/less.history"
 export MANPAGER="vim -M +MANPAGER -"
 export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npmrc"
 export PASSWORD_STORE_DIR="$XDG_CONFIG_HOME/pass"
-export PROMPT_COMMAND='cd .; history -a; history -n;'
+export PROMPT_COMMAND='cd .; history -a; history -n'
 export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc"
 export RECOLL_CONFDIR="$XDG_CONFIG_HOME/recoll"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export TERMINAL=urxvt
 export TEXINPUTS=$XDG_DATA_HOME/tex:
 export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"