diff --git a/files/fish/.gitignore b/files/fish/.gitignore
index 2442100..057bdbd 100644
--- a/files/fish/.gitignore
+++ b/files/fish/.gitignore
@@ -16,3 +16,4 @@ functions/*
 !functions/pe.fish
 !functions/px.fish
 !functions/rsync.fish
+!functions/nvm.fish
diff --git a/files/fish/fish_plugins b/files/fish/fish_plugins
index c49338b..751556b 100644
--- a/files/fish/fish_plugins
+++ b/files/fish/fish_plugins
@@ -1,3 +1,3 @@
-jorgebucaran/nvm.fish
 jorgebucaran/fisher
 jethrokuan/z
+edc/bass
diff --git a/files/fish/functions/nvm.fish b/files/fish/functions/nvm.fish
new file mode 100644
index 0000000..5761a36
--- /dev/null
+++ b/files/fish/functions/nvm.fish
@@ -0,0 +1,3 @@
+function nvm
+  bass source ~/.nvm/nvm.sh --no-use ';' nvm $argv
+end