diff --git a/cli/.bashrc b/cli/.bashrc
index 61c0ff5..2713970 100644
--- a/cli/.bashrc
+++ b/cli/.bashrc
@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-# If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 HISTSIZE=1000
@@ -11,12 +10,10 @@ export LESS='i M R'
 export PAGER=less
 export EDITOR=vim
 export TIME_STYLE=long-iso
-export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock"
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
 
 PS1='\[\e[0m\][ \u@\h \[\e[34m\]\w\[\e[0m\] ]\n\$ '
 
-unalias ls ld ll 2>/dev/null
-
 beep()    { printf "\007"; }
 fixterm() { printf "\u001bc"; }
 
@@ -26,6 +23,8 @@ rgrep()  { command grep --exclude-dir=\.git -R "$@"; }
 whence() { command -v "$@"; }
 
 # ls
+unalias ls ld ll 2>/dev/null
+
 ls() { command ls --color=auto "$@"; }
 ll() { ls -alh "$@"; }
 ld() { ls -dlh "$@"; }
diff --git a/cli/.config/fish/conf.d/globals.fish b/cli/.config/fish/conf.d/globals.fish
index b076196..03ab654 100644
--- a/cli/.config/fish/conf.d/globals.fish
+++ b/cli/.config/fish/conf.d/globals.fish
@@ -2,6 +2,6 @@ set -x LESS 'i n M R S'
 set -x PAGER less
 set -x EDITOR hx
 set -x TIME_STYLE long-iso
-set -x SSH_AUTH_SOCK "$HOME/.ssh/ssh_auth_sock"
+set -x SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent.socket"
 set -x ALTERNATE_EDITOR ""
 set -U fish_greeting
diff --git a/cli/.config/zsh/settings.zsh b/cli/.config/zsh/settings.zsh
index fd3d416..b3969cb 100644
--- a/cli/.config/zsh/settings.zsh
+++ b/cli/.config/zsh/settings.zsh
@@ -14,7 +14,7 @@ export EDITOR
 export LESS='i M R'
 export PAGER=less
 export TIME_STYLE=long-iso
-export ALTERNATE_EDITOR=
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
 
 bindkey -e
 bindkey $terminfo[kdch1] delete-char
diff --git a/cli/.zshrc b/cli/.zshrc
index b2051a2..4834292 100644
--- a/cli/.zshrc
+++ b/cli/.zshrc
@@ -1,4 +1,3 @@
-# If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 confdir=$HOME/.config/zsh