diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index bdfad0a..c65dd2e 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -24,6 +24,7 @@ alias ip 'ip --color=auto'
 
 # add some stuff to the path
 fish_add_path $HOME/.local/share/cargo/bin
+fish_add_path $HOME/.cache/cabal/bin
 fish_add_path $HOME/.local/bin
 fish_add_path $HOME/j9.5/bin
 fish_add_path $HOME/.local/share/rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin
@@ -32,33 +33,34 @@ fish_add_path $HOME/.config/emacs/bin
 fish_add_path $HOME/.elan/bin
 fish_add_path $HOME/.pack/bin
 
+set -x XDG_CACHE_HOME $HOME/.cache
+set -x XDG_CONFIG_HOME $HOME/.config
+set -x XDG_DATA_HOME $HOME/.local/share
+
 # set some environment variables 
-#set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"
 set -x MANPAGER "less -R --use-color -Dd+r -Du+b"
-set -x INPUTRC $HOME/.config/readline/inputrc
 set -x EDITOR nvim
 set -x VISUAL nvim
-#set -x TZ America/Los_Angeles
 set -x TERM xterm-256color
 set -x BROWSER firefox
+
 set -x MOZ_ENABLE_WAYLAND 1
 set -x ELECTRON_OZONE_PLATFORM_HINT auto
-set -x MAKEFLAGS "-j$(nproc)"
-set -x MANROFFOPT "-c"
-set -x LESSHISTFILE -
 set -x GDK_BACKEND wayland
+
+set -x LESSHISTFILE -
+set -x INPUTRC $HOME/.config/readline/inputrc
+set -x HISTFILE $XDG_CACHE_HOME/bash/history
 set -x XDG_DATA_HOME $HOME/.local/share
 set -x CARGO_HOME $XDG_DATA_HOME/cargo
+set -x GNUPGHOME $XDG_DATA_HOME/gnupg
+set -x STACK_ROOT $XDG_DATA_HOME/stack
 set -x GHCUP_USE_XDG_DIRS true
 set -x JULIA_DEPOT_PATH $XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH
 set -x JUPYTER_CONFIG_DIR $XDG_CONFIG_HOME/jupyter
 set -x RUSTUP_HOME $XDG_DATA_HOME/rustup
 set -x DOT_SAGE $XDG_CONFIG_HOME/sage
-set -x OCAMLPATH $HOME/.opam/default/lib
+set -x MAXIMA_USERDIR $XDG_CONFIG_HOME/maxima
 set -x AGDA_DIR $HOME/.config/agda
+set -x PACK_DIR $HOME/.local/share/pack
 set -x MIZFILES $HOME/.local/share/mizar
-
-#eval (opam env)
-#eval (direnv hook fish)
-
-set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin $PATH /home/wball/.local/bin # ghcup-env
\ No newline at end of file
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 52286bb..4a9fef7 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -53,5 +53,5 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/home/wball/\x2epack/bin\x1e/usr/lib/smlnj/bin\x1e/home/wball/go/bin\x1e/home/wball/\x2eelan/bin\x1e/home/wball/\x2econfig/emacs/bin\x1e/home/wball/j9\x2e5/bin\x1e/home/wball/\x2elocal/smlnj/bin\x1e/home/wball/\x2elocal/share/rustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/wball/code/j/j9\x2e4/bin\x1e/usr/lib/j9/bin\x1e/home/wball/\x2ecabal/bin\x1e/home/wball/\x2eghcup/bin\x1e/home/wball/\x2elocal/share/cargo/bin\x1e/home/wball/\x2elocal/bin\x1e/home/wball/\x2ecargo/bin\x1e/home/wball/\x2escripts
+SETUVAR fish_user_paths:/home/wball/\x2ecache/cabal/bin\x1e/home/wball/\x2epack/bin\x1e/usr/lib/smlnj/bin\x1e/home/wball/go/bin\x1e/home/wball/\x2eelan/bin\x1e/home/wball/\x2econfig/emacs/bin\x1e/home/wball/j9\x2e5/bin\x1e/home/wball/\x2elocal/smlnj/bin\x1e/home/wball/\x2elocal/share/rustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/wball/code/j/j9\x2e4/bin\x1e/usr/lib/j9/bin\x1e/home/wball/\x2ecabal/bin\x1e/home/wball/\x2eghcup/bin\x1e/home/wball/\x2elocal/share/cargo/bin\x1e/home/wball/\x2elocal/bin\x1e/home/wball/\x2ecargo/bin\x1e/home/wball/\x2escripts
 SETUVAR grc_plugin_execs:cat\x1ecvs\x1edf\x1ediff\x1edig\x1egcc\x1eg\x2b\x2b\x1els\x1eifconfig\x1emake\x1emount\x1emtr\x1enetstat\x1eping\x1eps\x1etail\x1etraceroute\x1ewdiff\x1eblkid\x1edu\x1ednf\x1edocker\x1edocker\x2dcompose\x1edocker\x2dmachine\x1eenv\x1eid\x1eip\x1eiostat\x1ejournalctl\x1ekubectl\x1elast\x1elsattr\x1elsblk\x1elspci\x1elsmod\x1elsof\x1egetfacl\x1egetsebool\x1eulimit\x1euptime\x1enmap\x1efdisk\x1efindmnt\x1efree\x1esemanage\x1esar\x1ess\x1esysctl\x1esystemctl\x1estat\x1eshowmount\x1etcpdump\x1etune2fs\x1evmstat\x1ew\x1ewho\x1esockstat