diff --git a/config/fish/config.fish b/config/fish/config.fish
index 8be753b..2dc2882 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,4 +1,6 @@
- set --universal nvm_default_version v22.19.0
+set nodejs_version "v22.21.0"
+
+# set --universal nvm_default_version v22.19.0
 set fish_add_path $HOME/.local/bin 
 
 # Get directory of this config file
@@ -9,6 +11,8 @@ set -l secrets_file "$config_dir/secrets.fish"
 set -gx GOPATH "$HOME/go" 
 set -gx JAVA_HOME "/usr/lib/jvm/java-17-openjdk/"
 set -gx ANDROID_HOME $HOME"/Android/Sdk/"
+set --universal nvm_default_version $nodejs_version
+# echo $nodejs_version
 
 fish_add_path -a "$GOPATH/bin"
 
diff --git a/deploy.sh b/deploy.sh
index 069b341..4e10556 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -4,6 +4,14 @@ target_config_dir="$HOME/.config"
 
 nodejs_version="v22.21.0"
 
+current_dir="$(pwd)"
+
+# cp ./core-setup/arch-surface.conf /boot/loader/entries/arch-surface.conf
+# cp ./core-setup/cpupower /etc/default/cpupower
+
+cd core-setup && sh setup
+cd $current_dir
+
 # Ensure fish/fisher setup + install plugins
 if fish -c "which fisher" >/dev/null 2>&1; then
     echo "fisher is installed"
@@ -13,8 +21,13 @@ else
     fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher"
 fi
 
-for dir in "$source_dir"/*/; do
+tree .
+for dir in $source_dir/*/; do
+    echo ">>>"$dir
+    echo "Raw dir value: '$dir'"
+    ls -ld "$dir"
     if [ -d "$dir" ]; then # Check if it's a directory
+        echo "asdkgjnsgjsdkgan"
         dir_name=$(basename "$dir")
         source=$source_dir"/"$dir_name
         target=$target_config_dir"/"$dir_name