From dd3fea2128a667f6d8e1a348a6d22e5dcc58aad6 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Wed, 4 Nov 2015 14:25:27 -0500
Subject: [PATCH] Update vimrc, aliases and dict

---
 vim/spell/en.utf-8.add     |  14 ++++++++++++++
 vim/spell/en.utf-8.add.spl | Bin 904 -> 1045 bytes
 vimrc                      |   7 ++++---
 zsh/aliases                |  14 +++++++++-----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index e93bc3c..313e80d 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -67,3 +67,17 @@ schemas
 multimethod
 defmethod
 devcards
+modal's
+fallback
+truthy
+destructured
+clickable
+autoplaying
+YouTube
+bool
+UI
+px
+google
+https
+youtube
+HD
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index 494e3c598a170b74c723de6ee3b51be6a1032205..86f57eac67c1fbd95cabce7ec9c9093fcacea5cd 100644
GIT binary patch
literal 1045
zcmYLI%Z}7A5Oh0%FW?w1QM7wUhz|fR%R@q1gv5<JoW!$^9pYpjx4rKX_zc9a<qwwX
z&J1Xj*i+rrRo!;J+<c6qaqh*VQu^n!vZ@=?cD>yVK8#bGm;EUjr$yV5begE^NTgH|
zNy*yLOo2vnRMLqoV^=<LVF8ML-fe5)5OdTZv!q&>cc}|;PV6pdoz`@RK!p@8ZnTP8
zRkR3+k%o5oH<8g=M--S486mCj$x|z;qMdE-j+#l8N$WQ5;lNWw@`Mtb_DlmAAU!kZ
z@GmyA2y<tH*DI@44O<gu<qdiL9h+j0B*W0lB`qx@e$ll9RzWJD6Ro#KK2+4v0V-xA
ztPW0?P^YD_frZw7Kr1aCR+_QGtyZWo2r2_vH?IqGR~EtAbSd6hV*)qEsvKOTu?mPd
zEDk6MJRcLhe>Her4L)hyjQ9~xgCD?$3c^@h4~(l}UySI}Z~HYqF_sT?hRH^Zaz?4S
zV(tNP`v(NLh|DXiBvJh5*NBUeKNdMW`*^+yIBKrc0Kl3ZpPJr<iJ{{*_o4;EgB`%z
zaneHsazaJRrz(61G%`S`lJgi@gl~x)_*!Z+C8ZychKsx7n<xYNwt01D`7y2Se9}Es
zeneypte2NKMSt$C6J_?#r;6xrBkr&(`n0w1zIAeGlP3nrc@Sxp1x)pP@rskKz{{*y
z-E9g5o90=veO6&I-wLKJxMG-?zE?`UPv6{p`ie1x%eO(d==SnuDA?jAw^M%0R-eB{
Vx&Om_C)ll&{w$?A$Dp)Qe*tmcz&QW_

literal 904
zcmYLH%WB*}5S$(<Uyz%~L5Kz4bIBo)Lu?EV1Pq4U^%zOBmS$v)w7b6L8uA(Wo&Bez
zYP1`(NSdwguBz^y9}nNdWQO76U#0Z@`?9JV({{bxkIqkXSk{A{W^E_YX`*g|h*Cum
z6~CPxR`ERMomd&9kx5FaWAHg0d{`0$GrRX%1+6MsV;VUc+2h|VMr$2VG9xm{BKoH|
zY00p&d}o{FNwcUjY2AhcG@S$_&!E`U78%6==~?sW|Hqan5}9^Rs~YxZrsRz{{X)(I
zG7O<VYg$?&j-*B^$ar}ct)-JAn9Y`V9-z*=Iw_5%uX8`beT#?u3%)R@6$;0Q4op99
z_SSf=wDB-PdWP2Mz5)`R6i1HjrNL`Ax}+Hv;3qr{egL})5}OBlA`j4FLMLuJpF?Ua
zmb1W56Fo7Z)TGQEpaFG91hC1^aUfX*Y$4BY3!Kvomu(uYSls}?H#@yE{ov<qjzx=P
zheD5%J>y*f@(MD`6~)s028tX_B*-}+@^j^Jd*@P{IVs%~+mlbcNDP<Q0S(6aWy3{(
zN^85k>K<A?AaA5<USdfO70mCVJ{#cD5dCGMN1Td2X|2C7UEAc8P<J~<eU*9WQhy(D
zRnREMMU0%xwMwZk$?d}<I`!APEKg|YdXp72*~hlHJNo$W71eL^`WCS#Fe&v9K8mEF

diff --git a/vimrc b/vimrc
index cffdf9f..567468f 100644
--- a/vimrc
+++ b/vimrc
@@ -116,7 +116,8 @@ set undoreload=10000
 au BufNewFile,BufRead *.txt setlocal wrap
 au BufNewFile,BufRead *.txt setlocal lbr
 " Clojurescript syntax highlighting
-au BufNewFile,BufRead *.cljs set filetype=clojure
+" au BufNewFile,BufRead *.cljs set filetype=clojure
+" au BufNewFile,BufRead *.cljc set filetype=clojure
 
 " Remove trailing whitespace on save all files.
 au BufWritePre * :%s/\s\+$//e
@@ -273,8 +274,8 @@ nnoremap <leader><leader> <c-^>
 
 " Make it easier to jump around the command line. The default behaviour is
 " using the arrow keys with or without shift
-:cnoremap <C-j> <S-Left>
-:cnoremap <C-k> <S-Right>
+:cnoremap <C-J> <S-Left>
+:cnoremap <C-K> <S-Right>
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " ABBREVIATIONS
diff --git a/zsh/aliases b/zsh/aliases
index b83e349..93ab394 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -96,9 +96,10 @@ alias zsh='vim ~/.zshrc'
 
 
 # Git
-alias ammend='amend'
-alias amend='git commit --amend'
-alias amends='git commit -S --amend'
+alias am='git commit --amend'
+alias ams='git commit -S --amend' # signed
+alias ammend='echo "use am instead"'
+alias amend='echo "use am instead"'
 alias g='gst'
 alias ga='git add -A :/'
 alias gaa='git add -A'
@@ -107,6 +108,8 @@ alias gb='git branch'
 alias gbd='git branch -D'
 alias gbl='git branch --all'
 alias gbm='git branch -m'
+alias gbr='git branch -rv'
+alias gbv='git branch -v'
 alias gc='git commit'
 alias gcs='git commit -S'
 alias gcl='git clone'
@@ -131,6 +134,7 @@ alias gfixs="git commit -S -a --amend -C HEAD" # signed
 alias gfo='git fetch origin'
 alias gfm='git fetch origin master'
 alias gfup='git fetch upstream'
+alias ggrep='git log --all --oneline | grep '
 alias gh="source ~/.githelpers && show_git_head"
 alias gla='git lg --all'
 alias gl='git lg -30'
@@ -138,7 +142,7 @@ alias gll='git lg'
 alias gli='git show --pretty="format:" --name-only'
 alias glog='git log'
 alias gm='git merge'
-alias gmnoff='git merge --no-ff'
+alias gmnff='git merge --no-ff'
 alias gmff='git merge --ff-only'
 alias gmffm='git merge --ff-only master'
 alias gmffs='git merge --ff-only --squash'
@@ -199,7 +203,7 @@ alias gta='git tag -a'
 alias gtd='git tag -d'
 alias gtl='git tag -l'
 alias gx='git reset --hard'
-alias gxx='git reset --hard HEAD~1 && git pull --ff-only'
+alias gxx='git reset --hard HEAD~1'
 # git stats
 alias gstats="echo 'Total commits: $(git rev-list HEAD --count)'; echo '\nAuthor breakdown:'; git shortlog | grep -E '^[^ ]'"
 alias gwip="git add . && git commit -m \"WIP\""