diff --git a/.bash_aliases b/.bash_aliases new file mode 100644 index 0000000..43b259d --- /dev/null +++ b/.bash_aliases @@ -0,0 +1,76 @@ +alias cp="cp -i" # confirm before overwriting something +#alias df='df -h' # human-readable sizes +#alias free='free -m' # show sizes in MB +#alias np='nano -w PKGBUILD' +#alias more=less + +alias ls='ls --color=auto' +alias ll='ls -alF' +alias la='ll -A' +alias l='ls -CF' +alias grep='grep --colour=auto' +alias egrep='egrep --colour=auto' +alias fgrep='fgrep --colour=auto' + + +# +# # dusort - disk usage for specified folder or current folder +# # usage: dusort [path] +dusort () +{ + path=$1 + du -hd 1 "${path:-.}" | sort -h +} + +# +# # ex - archive extractor +# # usage: ex +ex () +{ + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xjf $1 ;; + *.tar.gz) tar xzf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xf $1 ;; + *.tbz2) tar xjf $1 ;; + *.tgz) tar xzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1;; + *.7z) 7z x $1 ;; + *) echo "'$1' cannot be extracted via ex()" ;; + esac + else + echo "'$1' is not a valid file" + fi +} + + +colors() { + local fgc bgc vals seq0 + printf "Color escapes are %s\n" '\e[${value};...;${value}m' + printf "Values 30..37 are \e[33mforeground colors\e[m\n" + printf "Values 40..47 are \e[43mbackground colors\e[m\n" + printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" + + # foreground colors + for fgc in {30..37}; do + # background colors + for bgc in {40..47}; do + fgc=${fgc#37} # white + bgc=${bgc#40} # black + + vals="${fgc:+$fgc;}${bgc}" + vals=${vals%%;} + + seq0="${vals:+\e[${vals}m}" + printf " %-9s" "${seq0:-(default)}" + printf " ${seq0}TEXT\e[m" + printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" + done + echo; echo + done +} + diff --git a/.bash_logout b/.bash_logout index 0e4e4f1..9032d8e 100644 --- a/.bash_logout +++ b/.bash_logout @@ -1,3 +1,8 @@ # # ~/.bash_logout # + +# when leaving the console clear the screen to increase privacy +if [ "$SHLVL" = 1 ]; then + [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q || /usr/bin/clear +fi diff --git a/.bashrc b/.bashrc index e4d7c6a..76ac8b4 100644 --- a/.bashrc +++ b/.bashrc @@ -4,33 +4,6 @@ [[ $- != *i* ]] && return -colors() { - local fgc bgc vals seq0 - - printf "Color escapes are %s\n" '\e[${value};...;${value}m' - printf "Values 30..37 are \e[33mforeground colors\e[m\n" - printf "Values 40..47 are \e[43mbackground colors\e[m\n" - printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" - - # foreground colors - for fgc in {30..37}; do - # background colors - for bgc in {40..47}; do - fgc=${fgc#37} # white - bgc=${bgc#40} # black - - vals="${fgc:+$fgc;}${bgc}" - vals=${vals%%;} - - seq0="${vals:+\e[${vals}m}" - printf " %-9s" "${seq0:-(default)}" - printf " ${seq0}TEXT\e[m" - printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" - done - echo; echo - done -} - [ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion # Change the window title of X terminals @@ -126,14 +99,6 @@ if ${use_color} ; then fi CDirColour=$DarkGrn PS1="$TimeColour[\t] $Bold$UserColour\u${HostColour}@\h $Reset$CDirColour\$PWD$Reset $Bold\n$UserColour\\$ ${Reset}" - - alias ls='ls --color=auto' - alias ll='ls -alF' - alias la='ll -A' - alias l='ls -CF' - alias grep='grep --colour=auto' - alias egrep='egrep --colour=auto' - alias fgrep='fgrep --colour=auto' else if [[ ${EUID} == 0 ]] ; then # show root@ when we don't have colors @@ -145,12 +110,6 @@ fi unset use_color safe_term match_lhs sh -alias cp="cp -i" # confirm before overwriting something -#alias df='df -h' # human-readable sizes -#alias free='free -m' # show sizes in MB -#alias np='nano -w PKGBUILD' -#alias more=less - xhost +local:root > /dev/null 2>&1 # Bash won't get SIGWINCH if another process is in the foreground. @@ -166,29 +125,7 @@ shopt -s expand_aliases # Enable history appending instead of overwriting. #139609 shopt -s histappend -# -# # ex - archive extractor -# # usage: ex -ex () -{ - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1;; - *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; - esac - else - echo "'$1' is not a valid file" - fi -} export PATH=$PATH:~/.local/bin:~/bin export EDITOR=vim + +[[ -f .bash_aliases ]] && source .bash_aliases