diff --git a/.config/fish/user_variables.fish b/.config/fish/user_variables.fish
index 89a637c0..c580350f 100644
--- a/.config/fish/user_variables.fish
+++ b/.config/fish/user_variables.fish
@@ -16,13 +16,23 @@ set -xg CARGO_HOME $XDG_DATA_HOME/cargo
 set -xg LEIN_HOME $XDG_DATA_HOME/lein
 set -xg NUGET_PACKAGES $XDG_CACHE_HOME/NuGetPackages
 set -xg ANDROID_HOME $XDG_DATA_HOME/android
-set -xg BUN_INSTALL $HOME/.bun
+set -xg BUN_INSTALL $XDG_DATA_HOME/bun
 set -xg NODE_REPL_HISTORY $XDG_DATA_HOME/node_repl_history
 set -xg DOCKER_CONFIG $XDG_CONFIG_HOME/docker
 set -xg SQLITE_HISTORY $XDG_DATA_HOME/sqlite_history
 set -xg GRADLE_USER_HOME $XDG_DATA_HOME/gradle
 set -xg RIPGREP_CONFIG_PATH $HOME/.config/rg/.ripgreprc
 set -xg STARSHIP_CONFIG $HOME/.config/starship/starship.toml
+set -xg ANSIBLE_HOME $XDG_CONFIG_HOME/ansible
+set -xg FFMPEG_DATADIR $XDG_CONFIG_HOME/ffmpeg
+set -xg MYSQL_HISTFILE $XDG_DATA_HOME/mysql_history
+set -xg OMNISHARPHOME $XDG_CONFIG_HOME/omnisharp
+set -xg PYENV_ROOT $XDG_DATA_HOME/pyenv
+set -xg WORKON_HOME $XDG_DATA_HOME/virtualenvs
+set -xg export XINITRC $XDG_CONFIG_HOME/X11/xinitrcexport
+set -xg export XSERVERRC $XDG_CONFIG_HOME/X11/xserverrc
+set -xg HISTFILE $XDG_STATE_HOME/bash/history
+set -xg ZSH $XDG_DATA_HOME/oh-my-zsh
 
 # Path
 set -x fish_user_paths
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 1fd81a77..847b729e 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -16,7 +16,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codeium.vim": { "branch": "main", "commit": "949f625902855a436dd08ed220a147976aab4e58" },
   "compiler.nvim": { "branch": "main", "commit": "b2661965cc4a9603642ddb03fb766fd2bd8b2dc9" },
-  "conform.nvim": { "branch": "master", "commit": "41852493b5abd7b5a0fd61ff007994c777a08ec9" },
+  "conform.nvim": { "branch": "master", "commit": "7396fc0208539e2bd70e3e446f27529e28dba12b" },
   "crates.nvim": { "branch": "main", "commit": "81c6325b7f8875857ec09e5d24f3b6d7986f29e2" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "debugprint.nvim": { "branch": "main", "commit": "7eec2b7ddf98b462de02f8ad521327a7736aaf28" },