Update vimrc, aliases and dict

This commit is contained in:
Michael Campagnaro 2015-11-04 14:25:27 -05:00
parent 2a40a7a30f
commit dd3fea2128
4 changed files with 27 additions and 8 deletions

View File

@ -67,3 +67,17 @@ schemas
multimethod multimethod
defmethod defmethod
devcards devcards
modal's
fallback
truthy
destructured
clickable
autoplaying
YouTube
bool
UI
px
google
https
youtube
HD

Binary file not shown.

7
vimrc
View File

@ -116,7 +116,8 @@ set undoreload=10000
au BufNewFile,BufRead *.txt setlocal wrap au BufNewFile,BufRead *.txt setlocal wrap
au BufNewFile,BufRead *.txt setlocal lbr au BufNewFile,BufRead *.txt setlocal lbr
" Clojurescript syntax highlighting " 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. " Remove trailing whitespace on save all files.
au BufWritePre * :%s/\s\+$//e 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 " Make it easier to jump around the command line. The default behaviour is
" using the arrow keys with or without shift " using the arrow keys with or without shift
:cnoremap <C-j> <S-Left> :cnoremap <C-J> <S-Left>
:cnoremap <C-k> <S-Right> :cnoremap <C-K> <S-Right>
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" ABBREVIATIONS " ABBREVIATIONS

View File

@ -96,9 +96,10 @@ alias zsh='vim ~/.zshrc'
# Git # Git
alias ammend='amend' alias am='git commit --amend'
alias amend='git commit --amend' alias ams='git commit -S --amend' # signed
alias amends='git commit -S --amend' alias ammend='echo "use am instead"'
alias amend='echo "use am instead"'
alias g='gst' alias g='gst'
alias ga='git add -A :/' alias ga='git add -A :/'
alias gaa='git add -A' alias gaa='git add -A'
@ -107,6 +108,8 @@ alias gb='git branch'
alias gbd='git branch -D' alias gbd='git branch -D'
alias gbl='git branch --all' alias gbl='git branch --all'
alias gbm='git branch -m' alias gbm='git branch -m'
alias gbr='git branch -rv'
alias gbv='git branch -v'
alias gc='git commit' alias gc='git commit'
alias gcs='git commit -S' alias gcs='git commit -S'
alias gcl='git clone' alias gcl='git clone'
@ -131,6 +134,7 @@ alias gfixs="git commit -S -a --amend -C HEAD" # signed
alias gfo='git fetch origin' alias gfo='git fetch origin'
alias gfm='git fetch origin master' alias gfm='git fetch origin master'
alias gfup='git fetch upstream' alias gfup='git fetch upstream'
alias ggrep='git log --all --oneline | grep '
alias gh="source ~/.githelpers && show_git_head" alias gh="source ~/.githelpers && show_git_head"
alias gla='git lg --all' alias gla='git lg --all'
alias gl='git lg -30' alias gl='git lg -30'
@ -138,7 +142,7 @@ alias gll='git lg'
alias gli='git show --pretty="format:" --name-only' alias gli='git show --pretty="format:" --name-only'
alias glog='git log' alias glog='git log'
alias gm='git merge' alias gm='git merge'
alias gmnoff='git merge --no-ff' alias gmnff='git merge --no-ff'
alias gmff='git merge --ff-only' alias gmff='git merge --ff-only'
alias gmffm='git merge --ff-only master' alias gmffm='git merge --ff-only master'
alias gmffs='git merge --ff-only --squash' alias gmffs='git merge --ff-only --squash'
@ -199,7 +203,7 @@ alias gta='git tag -a'
alias gtd='git tag -d' alias gtd='git tag -d'
alias gtl='git tag -l' alias gtl='git tag -l'
alias gx='git reset --hard' 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 # git stats
alias gstats="echo 'Total commits: $(git rev-list HEAD --count)'; echo '\nAuthor breakdown:'; git shortlog | grep -E '^[^ ]'" 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\"" alias gwip="git add . && git commit -m \"WIP\""