-export CLEAN_HOME=/opt/clean
-export PATH=~/.local/bin:$PATH
-export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
-export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin
-export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux
+# XDG fixes
+alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
+alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
+alias tudu="tudu -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/config\""
+export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config
+export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass
+export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+
+export CLEAN_HOME=/opt/clean-x64
+
+export PATH=$CLEAN_HOME/bin:~/.local/bin:$PATH
+export PATH=/opt/texlive/2020/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin:/opt/firefox:$PATH
+
+export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:/opt/arduino/java/man:$MANPATH