Permalink
Browse files

Organize bundles a bit more

  • Loading branch information...
1 parent 1a9b29b commit e3289d0ccfa86e2dba70d0ca38cf56e33c113418 @rf- committed Jan 6, 2013
Showing with 52 additions and 50 deletions.
  1. +2 −4 gvimrc
  2. +50 −46 vimrc
View
6 gvimrc
@@ -1,18 +1,16 @@
color Tomorrow-Night-Eighties
-set transparency=3
set guifont=Pragmata:h13
set linespace=0
set antialias
set colorcolumn=80
-"hi ColorColumn guibg=#f7f1dc
set lines=60
set columns=115
-" don't break visual mode with the arrow keys
+" Don't break visual mode with the arrow keys
behave xterm
-" no scrollbars or toolbar
+" No scrollbars or toolbar
set go=egm
" Fullscreen takes up entire screen
View
96 vimrc
@@ -5,7 +5,7 @@ set number
set ruler
set hidden
syntax on
-color Tomorrow
+color Tomorrow-Night-Eighties
" Set encoding
set encoding=utf-8
@@ -107,16 +107,15 @@ call vundle#rc()
Bundle 'gmarik/vundle'
+"" Navigation and search
+
Bundle 'wincent/Command-T'
let g:CommandTMaxHeight=20
map <D-t> :CommandTBuffer<CR>
imap <D-t> <Esc>:CommandTBuffer<CR>
map <D-T> :CommandT<CR>
imap <D-T> <Esc>:CommandT<CR>
-Bundle 'chriskempson/base16-vim'
-Bundle 'kchmck/vim-coffee-script'
-
Bundle 'mileszs/ack.vim'
map <D-F> :Ack<space>
imap <D-F> <Esc>:Ack<space>
@@ -125,39 +124,6 @@ Bundle 'rf-/vim-bclose'
nmap <D-W> :Bclose<CR>
imap <D-W> <Esc>:Bclose<CR>
-Bundle 'tpope/vim-git'
-Bundle 'tpope/vim-fugitive'
- nmap <Leader>gs :Gstatus<CR>
- imap <Leader>gs <Esc>\gs
- vmap <Leader>gs <Esc>\gs
- nmap <Leader>gc :Gcommit<CR>
- imap <Leader>gc <Esc>\gc
- vmap <Leader>gc <Esc>\gc
-
-Bundle 'tpope/vim-repeat'
-Bundle 'tpope/vim-surround'
-Bundle 'tpope/vim-unimpaired'
-Bundle 'tpope/vim-speeddating'
-
-Bundle 'tpope/vim-haml'
-Bundle 'tpope/vim-markdown'
-Bundle 'bbommarito/vim-slim'
-
-Bundle 'sjl/gundo.vim'
- nnoremap <D-u> :GundoToggle<CR>
- let g:gundo_right=1
- let g:gundo_help=0
-
-Bundle 'tpope/vim-rails'
-
-Bundle 'Solarized'
- let g:solarized_style='light'
-
-Bundle 'scrooloose/nerdcommenter'
- map <D-/> <plug>NERDCommenterToggle<CR>
-
-Bundle 'ervandew/supertab'
-
Bundle 'fholgado/minibufexpl.vim'
" C-Tab to switch buffers in the current window (in insert mode too)
let g:miniBufExplMapCTabSwitchBufs = 1
@@ -186,15 +152,57 @@ Bundle 'scrooloose/nerdtree'
map <Leader>n :NERDTreeToggle<CR>
map <Leader>N :NERDTree<CR>
-Bundle 'tomtom/tlib_vim'
-Bundle 'MarcWeber/vim-addon-mw-utils'
-Bundle 'garbas/vim-snipmate'
+Bundle 'majutsushi/tagbar'
+ map <Leader>t :TagbarToggle<CR>
+
+"" Syntax, etc.
+Bundle 'kchmck/vim-coffee-script'
+Bundle 'tpope/vim-git'
+Bundle 'tpope/vim-haml'
+Bundle 'tpope/vim-markdown'
+Bundle 'bbommarito/vim-slim'
Bundle 'pangloss/vim-javascript'
Bundle 'briancollins/vim-jst'
+Bundle 'jnwhiteh/vim-golang'
+Bundle 'digitaltoad/vim-jade'
-Bundle 'majutsushi/tagbar'
- map <Leader>t :TagbarToggle<CR>
+"" Color schemes
+
+Bundle 'chriskempson/base16-vim'
+Bundle 'noahfrederick/Hemisu'
+Bundle 'Solarized'
+ let g:solarized_style='light'
+
+"" Misc.
+
+Bundle 'tpope/vim-fugitive'
+ nmap <Leader>gs :Gstatus<CR>
+ imap <Leader>gs <Esc>\gs
+ vmap <Leader>gs <Esc>\gs
+ nmap <Leader>gc :Gcommit<CR>
+ imap <Leader>gc <Esc>\gc
+ vmap <Leader>gc <Esc>\gc
+
+Bundle 'tpope/vim-rails'
+Bundle 'tpope/vim-repeat'
+Bundle 'tpope/vim-surround'
+Bundle 'tpope/vim-unimpaired'
+Bundle 'tpope/vim-speeddating'
+
+Bundle 'sjl/gundo.vim'
+ nnoremap <D-u> :GundoToggle<CR>
+ let g:gundo_right=1
+ let g:gundo_help=0
+
+Bundle 'scrooloose/nerdcommenter'
+ map <D-/> <plug>NERDCommenterToggle<CR>
+
+Bundle 'ervandew/supertab'
+
+Bundle 'tomtom/tlib_vim'
+Bundle 'MarcWeber/vim-addon-mw-utils'
+Bundle 'garbas/vim-snipmate'
Bundle 'jpalardy/vim-slime'
let g:slime_target = 'tmux'
@@ -209,10 +217,6 @@ Bundle 'mjbrownie/swapit'
\{'name':'todo_done', 'options':
\['TODO', 'DONE']}]
-Bundle 'jnwhiteh/vim-golang'
-
-Bundle 'noahfrederick/Hemisu'
-
filetype plugin indent on
"" File Types

0 comments on commit e3289d0

Please sign in to comment.