diff --git a/env/50_bun.zsh b/env/50_bun.zsh
new file mode 100644
index 0000000..4aa7b25
--- /dev/null
+++ b/env/50_bun.zsh
@@ -0,0 +1,4 @@
+export BUN_INSTALL="$HOME/.local/share/bun" 
+if [[ -d $BUN_INSTALL ]]; then
+	path+="$BUN_INSTALL/bin"
+fi
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 3da2921..7996004 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,33 +1,51 @@
 typeset -a chpwd_functions __chromaz_extra_left
+# fnm
+FNM_PATH="${XDG_DATA_HOME:-$HOME/.local/share}/fnm"
+if [ -d "$FNM_PATH" ]; then
+	export PATH="$FNM_PATH:$PATH"
+	eval "$(fnm env --use-on-cd --version-file-strategy recursive)"
+	FNM_DEFAULT=${$(readlink $FNM_PATH/aliases/default):h:t}
 
-export NVM_DIR="$HOME/.nvm"
-nvm() {
-	[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-	nvm "$@"
-}
-_prompt_nvm_version() {
-	[[ -z $NVM_BIN ]] && return
-	echo "nvm: ${NVM_BIN:h:t}"
-}
-__chromaz_extra_left+=_prompt_nvm_version
+	_prompt_fnm_version() {
+		local node_version=$(fnm current)
+		[[ $node_version == $FNM_DEFAULT ]] && return
+		echo "nodejs: ${node_version}"
+	}
+	__chromaz_extra_left+=_prompt_fnm_version
+elif [ -d "$HOME/.nvm" ]; then
+	export NVM_DIR="$HOME/.nvm"
+	nvm() {
+		[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+		nvm "$@"
+	}
 
-find-nvmrc-version() {
-	local dir=${1:-${PWD:a}}
-	if [[ $dir == / ]]; then return 1; fi
-	if [[ -e $dir/.nvmrc ]]; then
-		< $dir/.nvmrc
-	else
-		find-nvmrc-version ${dir:h}
-	fi
-}
-
-chpwd-set-nvm() {
-	if vers=$(find-nvmrc-version); then
-		if [[ $vers != ${NVM_BIN:h:t} ]]; then
-			nvm use
+	find-nvmrc-version() {
+		local dir=${1:-${PWD:a}}
+		if [[ $dir == / ]]; then return 1; fi
+		if [[ -e $dir/.nvmrc ]]; then
+			< $dir/.nvmrc
+		else
+			find-nvmrc-version ${dir:h}
 		fi
-	fi
-}
-chpwd-set-nvm &>/dev/null
+	}
+
+	chpwd-set-nvm() {
+		if vers=$(find-nvmrc-version); then
+			if [[ $vers != ${NVM_BIN:h:t} ]]; then
+				nvm use
+			fi
+		fi
+	}
+	chpwd-set-nvm &>/dev/null
+
+	chpwd_functions+=chpwd-set-nvm
+
+	_prompt_nvm_version() {
+		[[ -z $NVM_BIN ]] && return
+		echo "nodejs: ${NVM_BIN:h:t}"
+	}
+	__chromaz_extra_left+=_prompt_nvm_version
+else
+	return
+fi
 
-chpwd_functions+=chpwd-set-nvm
diff --git a/zshrc b/zshrc
index 8ede0d6..0c1eb6d 100644
--- a/zshrc
+++ b/zshrc
@@ -130,3 +130,6 @@ fi
 
 tabs -4
 #zprof
+
+# bun completions
+[ -s "/home/crater2150/.bun/_bun" ] && source "/home/crater2150/.bun/_bun"