diff options
| -rw-r--r-- | .bash_aliases | 11 | ||||
| -rw-r--r-- | .bashrc | 4 | ||||
| -rw-r--r-- | .gitconfig | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/.bash_aliases b/.bash_aliases index eb9f081..550f8de 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -12,6 +12,11 @@ alias micmro='micro' alias mycli_admin='mycli --defaults-group-suffix=_admin' alias y2j='/usr/bin/python3 -c "import json,sys; from ruamel.yaml import YAML; yaml=YAML(); print(json.dumps(yaml.load(sys.stdin)))"' -alias irc-s='env PATH=.:$PATH irc-slack -H 0.0.0.0 -s wl.zachdecook.com' -alias gitb="git branch | grep '^*' | cut -d' ' -f2" -alias migs='ls resources/sql/*/*$(gitb)*' + +# OvernightBDC stuff: +alias gitb="git branch --show-current" + +alias cp="cp -i" +alias rm="rm -i" + +alias awksum="awk 'BEGIN{s=0} /[0-9]+/{s+=\$1} END{print s}'" diff --git a/.bashrc b/.bashrc index 970afa3..6e2d199 100644 --- a/.bashrc +++ b/.bashrc @@ -36,8 +36,8 @@ mfi () { source ~/.bash_aliases -eval $(thefuck --alias frick) +#eval $(thefuck --alias frick) -eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +#eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" export PATH="/home/zachariahdecook/.local/bin:$PATH" export EDITOR=micro diff --git a/.gitconfig b/.gitconfig index 3a514eb..c1b7ddd 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,17 +7,17 @@ uncommit = reset --soft HEAD~1 recommit = commit -C 'HEAD@{1}' grepn = grep -n - mod = !git diff HEAD --relative | diff-so-fancy | grep \"@.*@\" | cut -d\" \" -f2 | grep -v \"^$\" | grep -v \"*\" | uniq: + #mod = !git diff HEAD --relative | diff-so-fancy | grep \"@.*@\" | cut -d\" \" -f2 | grep -v \"^$\" | grep -v \"*\" | uniq: ndiff = !git --no-pager diff ddiff = -c diff.external=difft -c core.pager="less" diff git = !git gerp = grep [core] - pager = diff-so-fancy | less --tabs=4 -RFX + #pager = diff-so-fancy | less --tabs=4 -RFX [merge] conflictstyle = diff3 [interactive] - diffFilter = diff-so-fancy --patch + #diffFilter = diff-so-fancy --patch [sendemail] smtpserver = smtp.gmail.com smtpuser = zach.decook@bettercarpeople.com |