diff --git a/roles/base.nix b/roles/base.nix
index d177262..cc944d0 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -22,6 +22,12 @@
 
   programs.bash = {
     interactiveShellInit = ''
+      export EDITOR=nvim
+
+      if [ -z "$SSH_AUTH_SOCK" ]; then
+          eval $(ssh-agent)
+      fi
+
       pw () {
           len=''${1:-$(( $RANDOM % 24 + 8 ))}
           tr -dc a-zA-Z0-9 < /dev/urandom | head -c $len
@@ -48,7 +54,7 @@
 
       . "$(fzf-share)/key-bindings.bash"
       . "$(fzf-share)/completion.bash"
-      eval $(z --init bash)
+      . <(z --init bash)
     '';
     shellAliases = {
       cat = "bat -pp";