Nanana
This commit is contained in:
Gregory Eremin
parent
e16b75347d
commit
f15d018f72
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Undo your last commit, but don't throw away your changes
|
||||
|
||||
git reset --soft HEAD^
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
alias vi="vim"
|
||||
alias v="vim"
|
||||
|
||||
alias reload! ". $HOME/.config/fish/config.fish"
|
||||
|
|
@ -16,7 +15,7 @@ alias rspec "bundle exec rspec"
|
|||
alias cap "bundle exec cap"
|
||||
alias cucumber "bundle exec cucumber"
|
||||
|
||||
alias mkbundle "bundle install --path vendor/gems"
|
||||
alias bd "bundle install --path vendor/gems"
|
||||
alias ss "git up; bundle --quiet; bundle exec rake db:migrate"
|
||||
alias rc "rails c"
|
||||
alias rs "rails s"
|
||||
|
|
@ -32,7 +31,7 @@ alias ga "git add -u; git add .; git st"
|
|||
alias gs "git st"
|
||||
alias gd "git diff"
|
||||
alias gp "git push"
|
||||
alias gu "gut up"
|
||||
alias gu "git up"
|
||||
alias gb "git br"
|
||||
|
||||
# OSX
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
ci = commit
|
||||
rd = rebase -i development
|
||||
rh = rebase -i HEAD~5
|
||||
unstage = reset
|
||||
undo = reset --soft HEAD^
|
||||
[color]
|
||||
diff = auto
|
||||
status = auto
|
||||
|
|
@ -26,9 +28,19 @@
|
|||
whitespace = nowarn
|
||||
[mergetool]
|
||||
keepBackup = false
|
||||
prompt = false
|
||||
[difftool]
|
||||
prompt = false
|
||||
[help]
|
||||
autocorrect = 1
|
||||
[achievement]
|
||||
upload = true
|
||||
[difftool "Kaleidoscope"]
|
||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||
[diff]
|
||||
tool = Kaleidoscope
|
||||
[mergetool "Kaleidoscope"]
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustExitCode = true
|
||||
[merge]
|
||||
tool = Kaleidoscope
|
||||
|
|
|
|||
|
|
@ -1690,9 +1690,9 @@
|
|||
<key>NSWindow Frame NSColorPanel</key>
|
||||
<string>307 274 214 309 0 0 1440 878 </string>
|
||||
<key>NSWindow Frame Preferences</key>
|
||||
<string>304 332 924 485 0 0 1440 878 </string>
|
||||
<string>304 314 605 485 0 0 1440 878 </string>
|
||||
<key>NSWindow Frame iTerm Window 0</key>
|
||||
<string>0 380 650 498 0 0 1440 878 </string>
|
||||
<string>38 44 1360 796 0 0 1440 878 </string>
|
||||
<key>NSWindow Frame iTerm Window 1</key>
|
||||
<string>0 452 570 426 0 0 1440 878 </string>
|
||||
<key>NSWindow Frame iTerm Window 2</key>
|
||||
|
|
@ -2246,11 +2246,11 @@
|
|||
<key>Name</key>
|
||||
<string>Default</string>
|
||||
<key>Non Ascii Font</key>
|
||||
<string>Menlo-Regular 14</string>
|
||||
<string>Inconsolata 18</string>
|
||||
<key>Non-ASCII Anti Aliased</key>
|
||||
<true/>
|
||||
<key>Normal Font</key>
|
||||
<string>Menlo-Regular 14</string>
|
||||
<string>Inconsolata 18</string>
|
||||
<key>Option Key Sends</key>
|
||||
<integer>2</integer>
|
||||
<key>Prompt Before Closing 2</key>
|
||||
|
|
@ -2491,7 +2491,7 @@
|
|||
<key>SUHasLaunchedBefore</key>
|
||||
<true/>
|
||||
<key>SULastCheckTime</key>
|
||||
<date>2013-07-05T13:35:54Z</date>
|
||||
<date>2013-07-25T13:58:24Z</date>
|
||||
<key>SavePasteHistory</key>
|
||||
<false/>
|
||||
<key>Show Toolbelt</key>
|
||||
|
|
|
|||
40
vim/vimrc
40
vim/vimrc
|
|
@ -26,6 +26,8 @@ Bundle "sjl/badwolf"
|
|||
Bundle "tomasr/molokai"
|
||||
Bundle "nanotech/jellybeans.vim"
|
||||
Bundle "chriskempson/base16-vim"
|
||||
Bundle "jelera/vim-gummybears-colorscheme"
|
||||
Bundle "tpope/vim-vividchalk"
|
||||
|
||||
syntax on
|
||||
filetype plugin on
|
||||
|
|
@ -33,7 +35,7 @@ filetype indent on
|
|||
|
||||
function! SetRandomColorScheme()
|
||||
let schemes ='peacock grunge freshcut molokai badwolf flatland jellybeans Tomorrow-Night Tomorrow-Night-Eighties '
|
||||
let schemes.='base16-eighties '
|
||||
let schemes.='base16-eighties vividchalk gummybears'
|
||||
let seconds=str2nr(strftime('%S'))
|
||||
|
||||
let scheme=split(schemes)[seconds%10]
|
||||
|
|
@ -44,7 +46,7 @@ function! SetRandomColorScheme()
|
|||
endfunction
|
||||
|
||||
" call SetRandomColorScheme()
|
||||
colorscheme peacock
|
||||
colorscheme vividchalk
|
||||
nmap <Leader>cs :call SetRandomColorScheme()<CR>
|
||||
|
||||
|
||||
|
|
@ -86,8 +88,8 @@ Bundle 'scrooloose/nerdcommenter'
|
|||
let g:NERDCreateDefaultMappings=0
|
||||
let g:NERDCompactSexyComs=1
|
||||
let g:NERDSpaceDelims=1
|
||||
nmap <silent> <Leader>/ <plug>NERDCommenterToggle
|
||||
vmap <silent> <Leader>/ <plug>NERDCommenterToggle
|
||||
nmap <silent> <Leader>cl <plug>NERDCommenterToggle
|
||||
vmap <silent> <Leader>cl <plug>NERDCommenterToggle
|
||||
|
||||
|
||||
|
||||
|
|
@ -107,7 +109,7 @@ let g:ctrlp_match_window_reversed=1
|
|||
|
||||
Bundle 'vim-ruby/vim-ruby'
|
||||
Bundle 'tpope/vim-markdown'
|
||||
|
||||
Bundle 'vim-scripts/nginx.vim'
|
||||
|
||||
" Sugar
|
||||
Bundle 'wavded/vim-stylus'
|
||||
|
|
@ -232,6 +234,7 @@ if has("autocmd")
|
|||
autocmd BufNewFile,BufRead *.slim set syntax=slim
|
||||
autocmd BufNewFile,BufRead *.coffee set syntax=coffee
|
||||
autocmd BufNewFile,BufRead *.md set syntax=markdown
|
||||
autocmd BufNewFile,BufRead *.conf set syntax=nginx
|
||||
endif
|
||||
|
||||
|
||||
|
|
@ -241,12 +244,16 @@ endif
|
|||
" ##########################
|
||||
|
||||
" Set the Leader key to comma instead of backslash
|
||||
let mapleader = ","
|
||||
" let mapleader = ","
|
||||
|
||||
nmap <Leader>v :e $MYVIMRC<CR>
|
||||
|
||||
nmap <Leader>s :w<CR>
|
||||
nmap <Leader>x :q!<CR>
|
||||
" Buffers
|
||||
nmap <Leader>bx :q!<CR>
|
||||
nmap <Leader>bc :bd<CR>
|
||||
nmap <Leader>bb :ls<CR>:b
|
||||
|
||||
nmap <Leader>ss :w<CR>
|
||||
nmap <Leader>rr :source $MYVIMRC<CR>
|
||||
|
||||
" Search for the word under cursor
|
||||
|
|
@ -278,28 +285,27 @@ nmap <Leader>et :tabedit <C-R>=expand("%:p:h")."/"<CR>
|
|||
" Convert Ruby 1.8 hash syntax to 1.9
|
||||
nmap <Leader>r18 :%s/:\(\w\+\)\(\s\+\)=>\s\+/\1:\2/ge<CR>
|
||||
|
||||
" Buffers
|
||||
nmap <Leader>b :ls<CR>:b
|
||||
|
||||
|
||||
" #######################
|
||||
" ### Visual Mappings ###
|
||||
" #######################
|
||||
|
||||
" Indentation TextMate style
|
||||
vmap <M-[> <gv
|
||||
vmap <M-]> >gv
|
||||
nmap <M-{> <<
|
||||
vmap <M-}> >>
|
||||
|
||||
" Sudo to write
|
||||
cmap w!! w !sudo tee % >/dev/null
|
||||
|
||||
" Move 10 lines with Option key
|
||||
nmap <Esc>j 10j
|
||||
nmap <Esc>k 10k
|
||||
nmap <M-j> 10j
|
||||
nmap <M-k> 10k
|
||||
|
||||
" Insert blank lines without entering insert mode
|
||||
nnoremap <Leader>j m`o<Esc>``
|
||||
nnoremap <Leader>k m`O<Esc>``
|
||||
nnoremap <S-M-j> m`o<Esc>``
|
||||
nnoremap <S-M-k> m`O<Esc>``
|
||||
|
||||
nmap m @a
|
||||
|
||||
function! ToggleLineNumbers()
|
||||
if (&relativenumber == 1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue