diff --git a/.zshrc b/.zshrc
index de20eb6..2cbd6fe 100644
--- a/.zshrc
+++ b/.zshrc
@@ -69,11 +69,11 @@ plugins=(
     # zsh-completions   INSTALL METHOD CHANGED https://github.com/zsh-users/zsh-completions/issues/603
     zsh-autosuggestions
     zsh-syntax-highlighting
-    history-substring-search
-    systemd
-    k
-    extract
-    sudo
+    # history-substring-search
+    # systemd
+    # k
+    # extract
+    # sudo
     fzf-tab
     # web-search
     # httpie
diff --git a/zshrc/nvm.zsh b/zshrc/nvm.zsh
index 8a4849d..e63dcfb 100644
--- a/zshrc/nvm.zsh
+++ b/zshrc/nvm.zsh
@@ -1,4 +1,17 @@
-# Initialize nvm (Node Version Manager)
-export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.nvm}"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+export NVM_DIR="$HOME/.nvm"
+nvm() {
+    unset -f nvm
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+    nvm "$@"
+}
+node() {
+    unset -f node
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+    node "$@"
+}
+npm() {
+    unset -f npm
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+    npm "$@"
+}
\ No newline at end of file