From 826bba0b110213d66747830e22c12e74c555655f Mon Sep 17 00:00:00 2001 From: InigoGutierrez Date: Wed, 27 Jul 2022 19:25:35 +0200 Subject: Updated and moved LS_COLORS and lesspipe to .bash_vars. --- stow/rcs/.bash_vars | 21 ++++++++++++++++----- stow/rcs/.bashrc | 10 ---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/stow/rcs/.bash_vars b/stow/rcs/.bash_vars index 1cf2b27..e86c703 100644 --- a/stow/rcs/.bash_vars +++ b/stow/rcs/.bash_vars @@ -61,6 +61,17 @@ export LESS_TERMCAP_se=$'\E[0m' export LESS_TERMCAP_us=$(tput smul; tput setaf 3) export LESS_TERMCAP_ue=$'\E[0m' +# Set LS_COLORS (enable color support of ls and others) +if [ -x /usr/bin/dircolors ]; then + dircolorsFile="$HOME/.config/dircolors" + [ -r "$dircolorsFile" ] && + eval "$(dircolors -b $dircolorsFile)" || + eval "$(dircolors -b)" +fi + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x "/usr/bin/lesspipe.sh" ] && eval "$(SHELL=/bin/sh lesspipe.sh)" + ######### # $PATH # ######### @@ -69,19 +80,19 @@ export LESS_TERMCAP_ue=$'\E[0m' export JAVA_HOME="/usr/lib/jvm/default/" PATH="${PATH}:${JAVA_HOME}/bin" -# add scripts folder to path plus its direct subfolders +# Add scripts folder to path plus its direct subfolders for dir in $(find "$HOME/scripts" -type d | grep -v '/\.'); do PATH="${PATH}:${dir}" done -# add ruby bins (gems) folder to path +# Add ruby bins (gems) folder to path PATH="${PATH}:$(ruby -e 'puts Gem.user_dir')/bin" -# add cargo bins folder to path +# Add cargo bins folder to path PATH="${PATH}:${HOME}/.cargo/bin" -# add pip local bins to path +# Add pip local bins to path PATH="${PATH}:${HOME}/.local/bin" -# export final PATH +# Export final PATH export PATH diff --git a/stow/rcs/.bashrc b/stow/rcs/.bashrc index 5c0c5bb..9a70ccd 100644 --- a/stow/rcs/.bashrc +++ b/stow/rcs/.bashrc @@ -30,16 +30,6 @@ stty -ixon # match all files and zero or more directories and subdirectories. #shopt -s globstar -# make less more friendly for non-text input files, see lesspipe(1) -[ -x "/usr/bin/lesspipe" ] && eval "$(SHELL=/bin/sh lesspipe)" - -# enable color support of ls -if [ -x /usr/bin/dircolors ]; then - test -r "$HOME/.dircolors" && eval "$(dircolors -b $HOME/.dircolors)" || eval "$(dircolors -b)" - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' -fi - if [ -r "/usr/share/bash-completion/bash_completion" ]; then . "/usr/share/bash-completion/bash_completion" fi -- cgit v1.2.1