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
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
type = cat-file -t
dump = cat-file -p
d = difftool
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"

26
vim/vimrc
View File

@ -19,7 +19,7 @@ au FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
"nnoremap <F5> :UndotreeToggle<CR>
"inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
nnoremap <C-w>\| <C-w>v<C-w>l
nnoremap <C-w>- <C-w>s<C-w>j
nnoremap <C-d> <C-w>q
@ -31,9 +31,9 @@ nnoremap <F8> :TagbarToggle<CR>
nnoremap + <C-a>
nnoremap - <C-x>
nnoremap Q <Nop>
noremap <Leader><Leader> <C-^>
nnoremap <Leader>a :!git st<CR>:!ls<CR>:!git a
nnoremap <Leader>up :!git pull origin
nnoremap <Leader><Leader> <C-^>
nnoremap <Leader>a :!git st<CR>:!ls<CR>:!git a
nnoremap <Leader>up :!git pull origin
nnoremap <Leader>st :!git st<CR>
nnoremap <Leader>ci :!git st<CR>:!git ci ""<Left>
nnoremap <Leader>log :!git hist<CR>
@ -67,7 +67,6 @@ nnoremap <BS> :nohlsearch<CR>g<C-g>zo
nnoremap U <C-r>
nnoremap K i<CR><Esc>k$
nnoremap <Enter> :up<CR>g<C-g>
"nnoremap s c
vnoremap gj j
vnoremap gk k
vnoremap j gj
@ -86,9 +85,9 @@ nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
map , <Plug>(easymotion-prefix)
noremap ! :!
nnoremap ! :!
nnoremap ; :
noremap J Jx
nnoremap J Jx
vnoremap < <gv
vnoremap > >gv
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><C-p> :CtrlPFunky<CR>
nnoremap <F2> :set invpaste<CR>
nmap <C-Up> [e
nmap <C-Down> ]e
vmap <C-Up> [egv
vmap <C-Down> ]egv
nnoremap <C-Up> [e
nnoremap <C-Down> ]e
vnoremap <C-Up> [egv
vnoremap <C-Down> ]egv
nnoremap / /\v
vnoremap / /\v
set guicursor+=n-v-c:blinkon0
set formatoptions-=r
set formatoptions-=o
@ -296,7 +297,7 @@ Bundle 'honza/vim-snippets'
" | https://github.com/honza/vim-snippets
Bundle 'Shougo/neocomplete.vim'
" | https://github.com/Shougo/neocomplete.vim
" |
" |
"DO NOT DELETE LINE ABOVE OR \bun WILL BREAK
filetype plugin indent on
if exists("+undofile")
@ -327,4 +328,3 @@ else
endif
silent! colorscheme fruity
nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
nnoremap <Leader>H *<C-O>:AckFromSearch!<CR>