diff --git a/files/home/.bash_profile b/files/home/.bash_profile
index 66f6c85..bdcaeef 100644
--- a/files/home/.bash_profile
+++ b/files/home/.bash_profile
@@ -1,2 +1,6 @@
 # Load .profile, containing login, non-bash related initializations.
 [ -f "$HOME/.profile" ] && source "$HOME/.profile"
+
+export NVM_DIR="$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
diff --git a/files/home/.profile b/files/home/.profile
index 03b0510..750bcd2 100644
--- a/files/home/.profile
+++ b/files/home/.profile
@@ -26,9 +26,11 @@ export DOTFILES=${DOTFILES:-"$HOME/.dotfiles"}
 
 
 # nvm
-export NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
-mkdir -p "$NVM_DIR"
-[ -f "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
+if [ -z "$NVM_DIR" ]; then
+    export NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
+    mkdir -p "$NVM_DIR"
+    [ -f "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
+fi
 
 # node (default v14)
 node_alias="$NVM_DIR/alias/lts/fermium"
diff --git a/files/home/.ssh/config b/files/home/.ssh/config
index fef79b8..a1241cb 100644
--- a/files/home/.ssh/config
+++ b/files/home/.ssh/config
@@ -2,4 +2,4 @@ Host *
   IgnoreUnknown UseKeychain
   UseKeychain yes
   AddKeysToAgent yes
-  IdentityFile ~/.ssh/id_rsa
+  IdentityFile ~/.ssh/id_ed25519
diff --git a/scripts/install.d/03-ssh.sh b/scripts/install.d/03-ssh.sh
index e2cb887..6aadaa5 100755
--- a/scripts/install.d/03-ssh.sh
+++ b/scripts/install.d/03-ssh.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 ssh_target="$HOME/.ssh"
-ssh_key="$ssh_target/id_rsa"
+ssh_key="$ssh_target/id_ed25519"
 ssh_pub="$ssh_key.pub"
 if [ ! -f "$ssh_key" ]; then
-    ssh-keygen -t rsa -b 4096 -f "$ssh_key"
+    ssh-keygen -t ed25519 -f "$ssh_key"
 fi
 
 cat "$ssh_pub"