Skip to content

Commit

Permalink
New Settings
Browse files Browse the repository at this point in the history
remove vim view
  • Loading branch information
ignu committed Apr 16, 2014
1 parent 9d9fe7e commit 6647f97
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 12 deletions.
11 changes: 2 additions & 9 deletions vim/.netrwhist
@@ -1,10 +1,3 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =8
let g:netrw_dirhist_1='/Users/ignu/bin/dotfiles2.0/vim/bundle/vim-rubocop'
let g:netrw_dirhist_2='/Users/ignu/code/ce_bacchus/app/assets/javascripts/backbone/controls'
let g:netrw_dirhist_3='/Users/ignu/code/ce_bacchus/app/assets/javascripts/backbone/controls/templates'
let g:netrw_dirhist_4='/Users/ignu/code/credoppl/app/admin'
let g:netrw_dirhist_5='/Users/ignu/code/ce_bacchus/app/services/cloud_stack'
let g:netrw_dirhist_6='/Users/ignu/code/ce_bacchus/app/controllers/vms'
let g:netrw_dirhist_7='app/controllers'
let g:netrw_dirhist_8='/Users/ignu/code/ce_bacchus/app/services/cloud_stack'
let g:netrw_dirhist_cnt =1
let g:netrw_dirhist_1='/Users/ignu/code/ce_bacchus'
2 changes: 2 additions & 0 deletions vim/update_bundles
Expand Up @@ -23,6 +23,7 @@ git_bundles = [
"git://github.com/tpope/vim-cucumber.git",
"git://github.com/tpope/vim-haml.git",
"git://github.com/tpope/vim-markdown.git",
"git://github.com/tpope/vim-sleuth.git",
"git://github.com/tpope/vim-rails.git",
"git://github.com/tpope/vim-repeat.git",
"git://github.com/tpope/vim-surround.git",
Expand All @@ -35,6 +36,7 @@ git_bundles = [
"git://github.com/vitaly/vim-syntastic-coffee.git",
"git://github.com/rking/ag.vim.git",
"git://github.com/shinokada/dragvisuals.vim.git",
"git://github.com/jgdavey/vim-blockle.git",
#'git://christoomey/vim-tmux-navigator',

#"git://github.com/tpope/vim-dispatch.git",
Expand Down
19 changes: 16 additions & 3 deletions vimrc
@@ -1,5 +1,6 @@
set shell=bash
set mouse=a
imap jj <Esc>
" ------------
" Pathogen
Expand Down Expand Up @@ -151,6 +152,15 @@ set list listchars=tab:»·,trail:.
" bindings
" ---------
let mapleader = ","
nmap <Space> ,
vmap <Leader>y "+y
vmap <Leader>d "+d
nmap <Leader>p "+p
nmap <Leader>P "+P
vmap <Leader>p "+p
vmap <Leader>P "+P
noremap <D-j> :b#<CR>
noremap <D-r> :bd<CR>
"next quickfix file
Expand Down Expand Up @@ -179,7 +189,7 @@ noremap <Leader><F1> :ResetTmuxVars<CR>
noremap <F1> :echo expand('%:t')<CR>
" remove trailing whitespace and replace tabs with spaces
" Press F4 to toggle highlighting on/off, and show current value.
noremap <F2> :noremap <F1> :Tx
noremap <F2> :noremap <F1> :Tx
:nnoremap <F3> :buffers<CR>:b<Space>
noremap <Leader><F3> :Tx bundle<CR>
noremap <F4> :set hlsearch! hlsearch?<CR>
Expand All @@ -188,6 +198,10 @@ nnoremap <silent> <F5> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR>:
noremap <F12> :NERDTreeToggle<CR>
noremap <F11> :NERDTreeFind<CR>
nmap <Leader><F12> :e ~/Dropbox/Notes/<cr>
nmap <Leader><F12> :e ~/Dropbox/Notes/TIL.md<cr>
nmap <Leader><F1> :e ~/.vim/update_bundles<cr>
" git blame shortcut
vnoremap <Leader>g :<C-U>!git blame -w <C-R>=expand("%:p") <CR> \| sed -n <C-R>=line("'<") <CR>,<C-R>=line("'>") <CR>p <CR>
Expand Down Expand Up @@ -314,8 +328,7 @@ nnoremap <silent> <Leader>r :Bclose<CR>
" \ "test" : "spec/services/cloud_stack/%s_spec.rb"
" \ }

" Bring CtrlP back
nnoremap <leader>f :CtrlP<cr>
nmap <leader>f <Plug>(easymotion-jumptoanywhere)
" DRAG VISUALS
vmap <expr> <LEFT> DVB_Drag('left')
Expand Down
12 changes: 12 additions & 0 deletions zshrc
Expand Up @@ -62,3 +62,15 @@ if [[ -a /etc/zshenv ]]; then
fi
### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH"

fancy-ctrl-z () {
if [[ $#BUFFER -eq 0 ]]; then
fg
zle redisplay
else
zle push-input
zle clear-screen
fi
}
zle -N fancy-ctrl-z
bindkey '^Z' fancy-ctrl-z

0 comments on commit 6647f97

Please sign in to comment.