diff --git a/aliases b/aliases
index ab40014..fead801 100644
--- a/aliases
+++ b/aliases
@@ -5,6 +5,7 @@ alias less='command less -R'
 alias mysql='command mysql --sigint-ignore'
 alias pacman='command pacman --color=auto'
 alias rgrep='command grep --exclude-dir=\.git -R'
+alias ggrep='command git grep'
 alias tailf='command less -R +F'
 alias vi='command vim'
 alias whence='type -P'
diff --git a/bashrc b/bashrc
index bc1db2b..5165341 100644
--- a/bashrc
+++ b/bashrc
@@ -58,9 +58,11 @@ PROMPT_COMMAND=prompt_command
 # {{{ plugins and traps
 aliases="${HOME}/.aliases"
 plugins="${HOME}/.bashplugins"
+localconf="${HOME}/.bashlocal"
 [[ -r "${aliases}" ]] && . "${aliases}"
 [[ -r "${plugins}" ]] && . "${plugins}"
-unset aliases plugins
+[[ -r "${localconf}" ]] && . "${localconf}"
+unset aliases plugins localconf
 
 # we want to see exit code on error (it also has to be the last entry here)
 trap 'printf "${red}>>${reset} ${black}exit${reset} ${red}%s${reset}\n" "$?" >&2' ERR