Merge remote-tracking branch 'upstream/master'

aliases/available/general.aliases.bash

@@ -18,17 +18,20 @@ alias l1='ls -1'
 
 alias _="sudo"
 
+# Shortcuts to edit startup files
+alias vbrc="vim ~/.bashrc"
+alias vbpf="vim ~/.bash_profile"
+
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
 # that the check works when on an OS that supports the color option
-if grep --color=auto "a" $BASH_IT/*.md &> /dev/null
+if grep --color=auto "a" "${BASH_IT}/"*.md &> /dev/null
 then
   alias grep='grep --color=auto'
   export GREP_COLOR='1;33'
 fi
 
-which gshuf &> /dev/null
-if [ $? -eq 0 ]
+if which gshuf &> /dev/null
 then
   alias shuf=gshuf
 fi
@@ -75,9 +78,29 @@ alias rd='rmdir'
 alias shit='bash-it'
 alias batshit='bash-it'
 alias bashit='bash-it'
+alias batbsh='bash-it'
+alias babsh='bash-it'
 alias bash_it='bash-it'
 alias bash_ti='bash-it'
 
+# Additional bash-it aliases for help/show
+alias bshsa='bash-it show aliases'
+alias bshsc='bash-it show completions'
+alias bshsp='bash-it show plugins'
+alias bshha='bash-it help aliases'
+alias bshhc='bash-it help completions'
+alias bshhp='bash-it help plugins'
+alias bshsch="bash-it search"
+alias bshenp="bash-it enable plugin"
+alias bshena="bash-it enable alias"
+alias bshenc="bash-it enable completion"
+
+# Shorten extract
+alias xt="extract"
+
+# sudo vim
+alias svim="sudo vim"
+
 # Display whatever file is regular file or folder
 catt() {
   for i in "$@"; do

aliases/available/git.aliases.bash

@@ -59,7 +59,7 @@ alias gll='git log --graph --pretty=oneline --abbrev-commit'
 alias gg="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
 alias ggs="gg --stat"
 alias gsl="git shortlog -sn"
-alias gw="git whatchanged"
+alias gwc="git whatchanged"
 alias gt="git tag"
 alias gta="git tag -a"
 alias gtd="git tag -d"

aliases/available/homesick.aliases.bash

@@ -0,0 +1,24 @@
+cite 'about-alias'
+about-alias 'homesick aliases'
+
+# Aliases
+alias sikhm="homesick cd dotfiles"
+alias sikclone="homesick clone"
+alias sikcomt="homesick commit dotfiles"
+alias sikdstry="homesick destroy"
+alias sikdif="homesick diff dotfiles"
+alias sikexec="homesick exec dotfiles"
+alias sikexeca="homesick exec_all"
+alias sikgen="homesick generate"
+alias sikhlp="homesick help"
+alias siklnk="homesick link dotfiles"
+alias sikls="homesick list"
+alias sikopn="homesick open dotfiles"
+alias sikpll="homesick pull dotfiles"
+alias sikpsh="homesick push dotfiles"
+alias sikrc="homesick rc dotfiles"
+alias sikpth="homesick show_path dotfiles"
+alias sikst="homesick status dotfiles"
+alias siktrk="homesick track $1 dotfiles"
+alias sikulnk="homesick unlink dotfiles"
+alias sikv="homesick version"

aliases/available/vagrant.aliases.bash

@@ -2,6 +2,10 @@ cite 'about-alias'
 about-alias 'vagrant aliases'
 
 # Aliases
+alias vhl='vagrant hosts list'
+alias vscp='vagrant scp'
+alias vsl='vagrant snapshot list'
+alias vst='vagrant snapshot take'
 alias vup="vagrant up"
 alias vupl="vagrant up 2>&1 | tee vagrant.log"
 alias vh="vagrant halt"