diff --git a/.void.bash_aliases b/.void.bash_aliases
index 8c9d9ae..e0bcb8f 100644
--- a/.void.bash_aliases
+++ b/.void.bash_aliases
@@ -6,14 +6,14 @@
 # xbps-install
 # use xtools instead
 # alias xin="doas xbps-install -S"
-alias xup="doas xbps-install -Su"
+alias xup="xi -Su"
 
 # xbps-query
-# alias xq="xbps-query"
-# alias xs="xq -Rs"
-alias xqs="xq -S"
-alias xqm="xq -m"
-alias xql="xq -l"
+alias xqr="xbps-query"
+alias xs="xqr -Rs"
+alias xqs="xqr -S"
+alias xqm="xqr -m"
+alias xql="xqr -l"
 alias xqq="xql | grep ${1}"
 
 alias xcln="xr -o"
diff --git a/.void.bashrc b/.void.bashrc
index d73c2ad..e16a04f 100644
--- a/.void.bashrc
+++ b/.void.bashrc
@@ -13,17 +13,21 @@ PATH=~/.local/bin:$PATH
 # - bash_aliases
 # - bash-completion
 
+# always bash-completion first
 [[ -r /usr/share/bash-completion/bash_completion ]] && . /usr/share/bash-completion/bash_completion
 
+# integrate git prompt functions
+# will break PS1 if not used
 [[ -f /usr/share/git/git-prompt.sh ]] && . /usr/share/git/git-prompt.sh
 
+# source distro and general purpose aliases
 [[ -r ~/.bash_aliases ]] && . ~/.bash_aliases
 
+# set PS1 from file
+# USE ONLY AFTER GIT PROMPT
 [[ -r ~/.ps1 ]] && . ~/.ps1
 
 #################################
-# Debian Defaults
-#
 # don't put duplicate lines or lines starting with space in the history.
 HISTCONTROL=ignoreboth
 
@@ -41,4 +45,14 @@ shopt -s checkwinsize
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
-eval "$(direnv hook bash)"
+#################################
+# - hooks
+
+command -v direnv &>/dev/null && eval "$(direnv hook bash)"
+
+# - env vars
+
+export XBPS_DISTDIR="/home/hendrik/git/void-packages"
+export SVDIR="/home/hendrik/sv"
+export HOME="/home/hendrik"
+export EDITOR="vim"