diff --git a/config/exports b/config/exports
index 962017d..219804c 100755
--- a/config/exports
+++ b/config/exports
@@ -294,7 +294,7 @@ export SHORT_HOST=$(hostname -s)
 # asdf
 # https://github.com/asdf-vm/asdf
 msg "Setting up asdf configuration"
-export ASDF_DIR="${XDG_BIN_HOME}/asdf"
+export ASDF_DIR="${HOME}/.local/asdf"
 [[ -d $ASDF_DIR ]] && {
   # [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
   # [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"
diff --git a/config/fish/config.fish b/config/fish/config.fish
index 2890646..19d7852 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,7 +1,15 @@
+# ╭──────────────────────────────────────────────────────────╮
+# │                     fish/config.fish                     │
+# ╰──────────────────────────────────────────────────────────╯
+
+# ASDF configuration code
+source $HOME/.local/asdf/asdf.fish
+
+fish_add_path $HOME/.cargo/bin
+fish_add_path $HOME/.local/bin
+fish_add_path $HOME/.local/share/nvim/mason/bin
+fish_add_path $HOME/.local/state/composer/vendor/bin
+
 if status is-interactive
-    # Commands to run in interactive sessions can go here
-  fish_add_path $HOME/.cargo/bin
-  fish_add_path $HOME/.local/bin
-  fish_add_path $HOME/.local/share/nvim/mason/bin
-  fish_add_path $HOME/.local/state/composer/vendor/bin
+  # Commands to run in interactive sessions can go here
 end
diff --git a/install.conf.yaml b/install.conf.yaml
index 6396285..5c9156f 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -40,6 +40,9 @@
       relink: true
       path: config/*
       exclude: [config/nvm, config/fzf]
+    ~/.local/asdf:
+      glob: true
+      path: local/asdf/*
     ~/.local/bin:
       glob: true
       path: local/bin/*
diff --git a/local/asdf b/local/asdf
new file mode 160000
index 0000000..54d15e3
--- /dev/null
+++ b/local/asdf
@@ -0,0 +1 @@
+Subproject commit 54d15e3fa689a161015df4f739fc7cd537c81e95
diff --git a/scripts/install-macos-defaults.sh b/scripts/install-macos-defaults.sh
index 6b4fc9c..18bd963 100755
--- a/scripts/install-macos-defaults.sh
+++ b/scripts/install-macos-defaults.sh
@@ -22,11 +22,14 @@ while true; do
   kill -0 "$$" || exit
 done 2> /dev/null &
 
-msgr nested "Change user shell to zsh if it is available and not the current"
+# Skip when shell is fish
+if [[ $SHELL != $(which fish) ]]; then
+  msgr nested "Change user shell to zsh if it is available and not the current"
 
-# Change user shell to zsh if not that already.
-if hash zsh 2> /dev/null; then
-  [[ $SHELL != $(which zsh) ]] && chsh -s "$(which zsh)"
+  # Change user shell to zsh if not that already.
+  if hash zsh 2> /dev/null; then
+    [[ $SHELL != $(which zsh) ]] && chsh -s "$(which zsh)"
+  fi
 fi
 
 ###############################################################################