From 2bab77d87257d885fca2e2e379d06caf1c8cb028 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 6 Sep 2021 18:46:48 +0300 Subject: .bashrc: reorder stuff --- %HOME%/.bashrc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/%HOME%/.bashrc b/%HOME%/.bashrc index 016232c..7ea9817 100644 --- a/%HOME%/.bashrc +++ b/%HOME%/.bashrc @@ -94,6 +94,14 @@ os_is_cygwin \ || command -v stty > /dev/null 2>&1 \ && stty -ixon +# Vagrant: fix `vagrant plugin install`. +# https://github.com/hashicorp/vagrant/issues/12202 +# TODO: remove when 2.2.15 is released? +export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 + +# nnn +# --- + inside_nnn() { [ -n "$NNNLVL" ] && [ "${NNNLVL:-0}" -ge 1 ] } @@ -119,6 +127,9 @@ nnn() { n "$@" } +# tmux +# ---- + remote_terminal() { test -n "$SSH_CONNECTION" } @@ -150,11 +161,6 @@ elif command -v tmux &> /dev/null; then exec tmux fi -# Vagrant: fix `vagrant plugin install`. -# https://github.com/hashicorp/vagrant/issues/12202 -# TODO: remove when 2.2.15 is released? -export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 - # Disable Alt+N shortcuts, which I use in tmux: # https://superuser.com/a/770902 for i in "-" {0..9}; do bind -r "\e$i"; done -- cgit v1.2.3