stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of austenwares.com:stonewareslord/Sync

Browse Source
This commit is contained in:
Austen Adler 2014-08-20 22:13:30 -04:00
commit d18547ce32
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/gitconfig
View File

@ -11,8 +11,6 @@
st = status st = status
br = branch -av br = branch -av
hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
type = cat-file -t
dump = cat-file -p
d = difftool d = difftool
cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i" size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i"

18
vim/vimrc
View File

@ -31,7 +31,7 @@ nnoremap <F8> :TagbarToggle<CR>
nnoremap + <C-a> nnoremap + <C-a>
nnoremap - <C-x> nnoremap - <C-x>
nnoremap Q <Nop> nnoremap Q <Nop>
noremap <Leader><Leader> <C-^> nnoremap <Leader><Leader> <C-^>
nnoremap <Leader>a :!git st<CR>:!ls<CR>:!git a nnoremap <Leader>a :!git st<CR>:!ls<CR>:!git a
nnoremap <Leader>up :!git pull origin nnoremap <Leader>up :!git pull origin
nnoremap <Leader>st :!git st<CR> nnoremap <Leader>st :!git st<CR>
@ -67,7 +67,6 @@ nnoremap <BS> :nohlsearch<CR>g<C-g>zo
nnoremap U <C-r> nnoremap U <C-r>
nnoremap K i<CR><Esc>k$ nnoremap K i<CR><Esc>k$
nnoremap <Enter> :up<CR>g<C-g> nnoremap <Enter> :up<CR>g<C-g>
"nnoremap s c
vnoremap gj j vnoremap gj j
vnoremap gk k vnoremap gk k
vnoremap j gj vnoremap j gj
@ -86,9 +85,9 @@ nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l nnoremap <C-l> <C-w>l
map , <Plug>(easymotion-prefix) map , <Plug>(easymotion-prefix)
noremap ! :! nnoremap ! :!
nnoremap ; : nnoremap ; :
noremap J Jx nnoremap J Jx
vnoremap < <gv vnoremap < <gv
vnoremap > >gv vnoremap > >gv
nnoremap <F1> <nop> nnoremap <F1> <nop>
@ -125,10 +124,12 @@ nnoremap <C-w>z <C-w>_<C-w>\|
nnoremap <Leader>bun G?Bundle<CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:BundleInstall nnoremap <Leader>bun G?Bundle<CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:BundleInstall
nnoremap <Leader><C-p> :CtrlPFunky<CR> nnoremap <Leader><C-p> :CtrlPFunky<CR>
nnoremap <F2> :set invpaste<CR> nnoremap <F2> :set invpaste<CR>
nmap <C-Up> [e nnoremap <C-Up> [e
nmap <C-Down> ]e nnoremap <C-Down> ]e
vmap <C-Up> [egv vnoremap <C-Up> [egv
vmap <C-Down> ]egv vnoremap <C-Down> ]egv
nnoremap / /\v
vnoremap / /\v
set guicursor+=n-v-c:blinkon0 set guicursor+=n-v-c:blinkon0
set formatoptions-=r set formatoptions-=r
set formatoptions-=o set formatoptions-=o
@ -327,4 +328,3 @@ else
endif endif
silent! colorscheme fruity silent! colorscheme fruity
nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr> nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
nnoremap <Leader>H *<C-O>:AckFromSearch!<CR>