Permalink
Browse files

Config slightly reorganized

  • Loading branch information...
1 parent e6b4b7b commit 44cb907a8e8c75839f1c2116c79aa6715705c4c8 @abonec committed Apr 13, 2012
Showing with 70 additions and 60 deletions.
  1. +1 −1 bundle/vim-ruby-debugger
  2. +69 −59 vimrc
2 bundle/vim-ruby-debugger
@@ -1 +1 @@
-Subproject commit 9008a57b8501f2ac80715741a964a59b3161036c
+Subproject commit a83d9cbb7d3c3f48586e6e44aa8a9d8874586b49
View
128 vimrc
@@ -1,8 +1,59 @@
call pathogen#infect()
+call pathogen#helptags()
syntax on
filetype plugin indent on
syntax enable
+"Use Vim settings, rather then Vi settings (much better!).
+"This must be first, because it changes other options as a side effect.
+set nocompatible
+"allow backspacing over everything in insert mode
+set backspace=indent,eol,start
+"store lots of :cmdline history
+set history=1000
+
+set showcmd "show incomplete cmds down the bottom
+set showmode "show current mode down the bottom
+
+set incsearch "find the next match as we type the search
+set hlsearch "hilight searches by default
+
+set number "add line numbers
+
+" When you type the first tab hit will complete as much as possible, the second tab hit will provide a list, the third and subsequent tabs will cycle through completion options so you can complete the file without further keys
+set wildmode=longest,list,full
+
+" To disable a plugin, add it's bundle name to the following list
+let g:pathogen_disabled = []
+
+" call add(g:pathogen_disabled, 'vim-commentary')
+
+" tab settings
+set tabstop=2
+set expandtab
+set shiftwidth=2
+set softtabstop=2
+set autoindent
+
+"disable visual bell
+set visualbell t_vb=
+
+"statusline setup
+set statusline=%f "tail of the filename
+
+"Git
+set statusline+=%{fugitive#statusline()}
+
+"RVM
+set statusline+=%{exists('g:loaded_rvm')?rvm#statusline():''}
+
+set statusline+=%= "left/right separator
+set statusline+=%c, "cursor column
+set statusline+=%l/%L "cursor line/total lines
+set statusline+=\ %P "percent through file
+set laststatus=2
+" set statusline=%{ruby_debugger#statusline()}
+
set pastetoggle=<F2>
" copy and paste bind
nnoremap <C-y> "+y
@@ -44,21 +95,28 @@ nmap <Leader><right> :rightbelow vnew<CR>
nmap <Leader><up> :leftabove new<CR>
nmap <Leader><down> :rightbelow new<CR>
-" Open file in a tab before the current one
-com! -nargs=1 -complete=file TabEdit :exe ( tabpagenr() - 1 ) . "tabedit " . <q-args>
-command Gdt tabedit %|Gdiff
-" map <C-t> <ESC>:tabnew<CR>
-
" nnoremap <Leader>d :NERDTree<CR>
nmap <silent> <Leader>p :NERDTreeToggle<CR>
-nnoremap <Leader>B :CommandTBuffer<CR>
-nnoremap <Leader>r :RunSpec<CR>
+nnoremap <Leader>b :CommandTBuffer<CR>
+nnoremap <Leader>r :call RunRspecCurrentFileConque()<CR>
+nnoremap <Leader>l :call RunRspecCurrentLineConque()<CR>
+
+nnoremap <silent> <Leader>] :tabe ~/.vim/vimrc<CR>
+nnoremap <Leader>[ :lcd %:p:h<CR>
+
+" tags
+map <A-b> :tp<CR>
+map <A-n> :tn<CR>
+
+" map <C-t> <ESC>:tabnew<CR>
+
nmap ,t :ToggleWord<CR>
" Vim Ruby Debugger settings
" let g:ruby_debugger_debug_mode = 1
let g:ruby_debugger_spec_path = 'rspec'
let g:ruby_debugger_default_script = 'script/rails s'
+let g:ruby_debugger_no_maps = 1
" let g:ruby_debugger_progname = 'mvim'
map <A-b> :call g:RubyDebugger.toggle_breakpoint()<CR>
@@ -70,55 +128,6 @@ map <F8> :call g:RubyDebugger.continue()<CR>
map <A-e> :call g:RubyDebugger.exit()<CR>
map <A-d> :call g:RubyDebugger.remove_breakpoints()<CR>
-"Use Vim settings, rather then Vi settings (much better!).
-"This must be first, because it changes other options as a side effect.
-set nocompatible
-"allow backspacing over everything in insert mode
-set backspace=indent,eol,start
-"store lots of :cmdline history
-set history=1000
-
-set showcmd "show incomplete cmds down the bottom
-set showmode "show current mode down the bottom
-
-set incsearch "find the next match as we type the search
-set hlsearch "hilight searches by default
-
-set number "add line numbers
-
-" When you type the first tab hit will complete as much as possible, the second tab hit will provide a list, the third and subsequent tabs will cycle through completion options so you can complete the file without further keys
-set wildmode=longest,list,full
-
-" To disable a plugin, add it's bundle name to the following list
-let g:pathogen_disabled = []
-
-" call add(g:pathogen_disabled, 'vim-commentary')
-
-" tab settings
-set tabstop=2
-set expandtab
-set shiftwidth=2
-set softtabstop=2
-set autoindent
-
-"disable visual bell
-set visualbell t_vb=
-
-"statusline setup
-set statusline=%f "tail of the filename
-
-"Git
-set statusline+=%{fugitive#statusline()}
-
-"RVM
-set statusline+=%{exists('g:loaded_rvm')?rvm#statusline():''}
-
-set statusline+=%= "left/right separator
-set statusline+=%c, "cursor column
-set statusline+=%l/%L "cursor line/total lines
-set statusline+=\ %P "percent through file
-set laststatus=2
-" set statusline=%{ruby_debugger#statusline()}
@@ -135,7 +144,8 @@ highlight Pmenu ctermbg=238 gui=bold
" abbreviations
cab help tab help
+" Open file in a tab before the current one
+com! -nargs=1 -complete=file Te :exe ( tabpagenr() - 1 ) . "tabedit " . <q-args>
+command Gdt tabedit %|Gdiff
+
-" tags
-map <A-b> :tp<CR>
-map <A-n> :tn<CR>

0 comments on commit 44cb907

Please sign in to comment.