Merge branch 'master' into 'master'

Bashrc edits

See merge request dwt1/dotfiles!2
This commit is contained in:
Derek Taylor
2019-11-05 15:23:33 +00:00
+9 -11
View File
@@ -82,10 +82,10 @@ if ${use_color} ; then
PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] ' PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] '
fi fi
alias ls='ls -lah' alias ls='ls -lah' \
alias grep='grep --colour=auto' grep='grep --colour=auto' \
alias egrep='egrep --colour=auto' egrep='egrep --colour=auto' \
alias fgrep='fgrep --colour=auto' fgrep='fgrep --colour=auto'
else else
if [[ ${EUID} == 0 ]] ; then if [[ ${EUID} == 0 ]] ; then
# show root@ when we don't have colors # show root@ when we don't have colors
@@ -120,14 +120,12 @@ ex ()
{ {
if [ -f $1 ] ; then if [ -f $1 ] ; then
case $1 in case $1 in
*.tar.bz2) tar xjf $1 ;; *.tar.bz2|*.tbz2) tar xjf $1 ;;
*.tar.gz) tar xzf $1 ;; *.tar.gz|*.tgz) tar xzf $1 ;;
*.bz2) bunzip2 $1 ;; *.bz2) bunzip2 $1 ;;
*.rar) unrar x $1 ;; *.rar) unrar x $1 ;;
*.gz) gunzip $1 ;; *.gz) gunzip $1 ;;
*.tar) tar xf $1 ;; *.tar) tar xf $1 ;;
*.tbz2) tar xjf $1 ;;
*.tgz) tar xzf $1 ;;
*.zip) unzip $1 ;; *.zip) unzip $1 ;;
*.Z) uncompress $1;; *.Z) uncompress $1;;
*.7z) 7z x $1 ;; *.7z) 7z x $1 ;;
@@ -140,8 +138,8 @@ ex ()
### ALIASES ### ### ALIASES ###
# navigation # navigation
alias ..='cd ..' alias ..='cd ..' \
alias ...='cd .. ; cd ..' ...='cd ../..'
# Changing "ls" to "exa" # Changing "ls" to "exa"
alias ls='exa -al --color=always --group-directories-first' # my preferred listing alias ls='exa -al --color=always --group-directories-first' # my preferred listing
@@ -159,7 +157,7 @@ alias lynx='lynx -cfg=~/.lynx/lynx.cfg -lss=~/.lynx/lynx.lss -vikeys'
alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash' alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash'
# bare git repo alias for dotfiles # bare git repo alias for dotfiles
alias config='/usr/bin/git --git-dir=/home/dt/dotfiles --work-tree=/home/dt' alias config="/usr/bin/git --git-dir=$HOME/dotfiles --work-tree=$HOME"
# termbin # termbin
alias tb="nc termbin.com 9999" alias tb="nc termbin.com 9999"