diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-03-01 23:05:44 +0100 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-03-01 23:06:54 +0100 |
| commit | c0e92f01511e3a8c32eb8afb2a12c60df8cfcce0 (patch) | |
| tree | d94ac41b771e135c8de33513f47c695c438ecab8 | |
| parent | bash: group settings, add separators (diff) | |
| download | linux-home-c0e92f01511e3a8c32eb8afb2a12c60df8cfcce0.tar.gz linux-home-c0e92f01511e3a8c32eb8afb2a12c60df8cfcce0.zip | |
bash: regroup settings a bit
| -rw-r--r-- | %HOME%/.bashrc | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/%HOME%/.bashrc b/%HOME%/.bashrc index 532ee05..561eef9 100644 --- a/%HOME%/.bashrc +++ b/%HOME%/.bashrc @@ -24,6 +24,22 @@ export HISTFILESIZE=20000 export HISTSIZE=20000 # ----------------------------------------------------------------------------- +# Includes +# ----------------------------------------------------------------------------- + +[ -r "$HOME/.bash_utils/file.sh" ] && source "$HOME/.bash_utils/file.sh" +[ -r "$HOME/.bash_utils/text.sh" ] && source "$HOME/.bash_utils/text.sh" + +[ -r "$HOME/.bash_utils/alternatives.sh" ] && source "$HOME/.bash_utils/alternatives.sh" +[ -r "$HOME/.bash_utils/cxx.sh" ] && source "$HOME/.bash_utils/cxx.sh" +[ -r "$HOME/.bash_utils/distr.sh" ] && source "$HOME/.bash_utils/distr.sh" +[ -r "$HOME/.bash_utils/git.sh" ] && source "$HOME/.bash_utils/git.sh" +[ -r "$HOME/.bash_utils/os.sh" ] && source "$HOME/.bash_utils/os.sh" +[ -r "$HOME/.bash_utils/path.sh" ] && source "$HOME/.bash_utils/path.sh" + +[ -r "$HOME/.bashrc_local" ] && source "$HOME/.bashrc_local" + +# ----------------------------------------------------------------------------- # Shell options # ----------------------------------------------------------------------------- @@ -38,6 +54,20 @@ shopt -s histappend shopt -s nullglob shopt -s nocaseglob +os_is_cygwin && set -o igncr +os_is_cygwin || complete -r + +# I'm sick and tired of third-party scripts breaking b/c of a random shell +# option I use (configure scripts in particular), so I'm commenting this out. +#export SHELLOPTS +#export BASHOPTS + +# I've bumped into this on Linux Mint: Ctrl+S causes my terminal to freeze +# completely (Ctrl+Q is a temporary escape, stty is the cure). +os_is_cygwin \ + || command -v stty > /dev/null 2>&1 \ + && stty -ixon + # ----------------------------------------------------------------------------- # Aliases # ----------------------------------------------------------------------------- @@ -92,40 +122,6 @@ GPG_TTY="$( tty )" export GPG_TTY # ----------------------------------------------------------------------------- -# Includes -# ----------------------------------------------------------------------------- - -[ -r "$HOME/.bash_utils/file.sh" ] && source "$HOME/.bash_utils/file.sh" -[ -r "$HOME/.bash_utils/text.sh" ] && source "$HOME/.bash_utils/text.sh" - -[ -r "$HOME/.bash_utils/alternatives.sh" ] && source "$HOME/.bash_utils/alternatives.sh" -[ -r "$HOME/.bash_utils/cxx.sh" ] && source "$HOME/.bash_utils/cxx.sh" -[ -r "$HOME/.bash_utils/distr.sh" ] && source "$HOME/.bash_utils/distr.sh" -[ -r "$HOME/.bash_utils/git.sh" ] && source "$HOME/.bash_utils/git.sh" -[ -r "$HOME/.bash_utils/os.sh" ] && source "$HOME/.bash_utils/os.sh" -[ -r "$HOME/.bash_utils/path.sh" ] && source "$HOME/.bash_utils/path.sh" - -[ -r "$HOME/.bashrc_local" ] && source "$HOME/.bashrc_local" - -# ----------------------------------------------------------------------------- -# More shell options -# ----------------------------------------------------------------------------- - -os_is_cygwin && set -o igncr -os_is_cygwin || complete -r - -# I'm sick and tired of third-party scripts breaking b/c of a random shell -# option I use (configure scripts in particular), so I'm commenting this out. -#export SHELLOPTS -#export BASHOPTS - -# I've bumped into this on Linux Mint: Ctrl+S causes my terminal to freeze -# completely (Ctrl+Q is a temporary escape, stty is the cure). -os_is_cygwin \ - || command -v stty > /dev/null 2>&1 \ - && stty -ixon - -# ----------------------------------------------------------------------------- # nnn # ----------------------------------------------------------------------------- |