diff --git a/.bashrc b/.bashrc index 06376d4..0c685d9 100644 --- a/.bashrc +++ b/.bashrc @@ -146,7 +146,8 @@ if ! shopt -oq posix; then fi # Customizations -if [ -f ~/.profile ] && [ -z "${SSH_CONNECTION}" ]; then + +if [ -f ~/.profile ]; then . ~/.profile fi diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 31b3653..fba2487 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -55,9 +55,7 @@ set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @continuum-restore 'on' set -g @continuum-boot 'on' -set -g @continuum-save-interval '10' # Save every n minutes -set -g @resurrect-capture-pane-contents 'on' -set -g @resurrect-processes '"~autossh->autossh *" ssh nano k9s nvim' +set -g @resurrect-processes 'ssh nano k9s nvim' # Open Links set -g @plugin 'tmux-plugins/tmux-open' diff --git a/.zshrc b/.zshrc index 9251aa9..31ae1b4 100644 --- a/.zshrc +++ b/.zshrc @@ -70,21 +70,6 @@ if [ -z "${SUDO_USER}" ] && [ -z "${SSH_CONNECTION}" ] && [ -z "${TERM_PROGRAM}" tmux new -A -s local_tmux fi -# Define a function to use autossh with a custom bashrc -function assh() { - remote_file=$(mktemp) - if $(ssh "$@" "cat > ${remote_file}" < ~/.bashrc > /dev/null 2>&1); then - # Successfully copied bashrc to the remote. Source it upon ssh - autossh -t "$@" "bash --rcfile ${remote_file}; rm ${remote_file}" - else - # SSH Config specifies a RemoteCommand; connect normally - autossh "$@" - fi -} -# Use ssh completion for autossh -compdef autossh=ssh -compdef assh=ssh - # Custom dircolors [ -f ~/.dircolors ] && eval "$(dircolors ~/.dircolors)"