Skip to content

Commit

Permalink
Stop using zenroom, nerdtree, tagbar, floobits
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcw committed Apr 17, 2014
1 parent 1783482 commit 957de12
Show file tree
Hide file tree
Showing 30 changed files with 69 additions and 45 deletions.
21 changes: 9 additions & 12 deletions .vimrc
@@ -1,9 +1,9 @@
silent! call pathogen#infect()

set t_Co=256
syntax enable
filetype plugin indent on

set t_Co=256
set vb
set number
set nocompatible
Expand All @@ -27,13 +27,14 @@ set laststatus=2
set timeout timeoutlen=1000 ttimeoutlen=100

set background=dark
" colorscheme tombat
colorscheme base16-chalk
" colorscheme base16-chalk
if has("gui_running")
set go-=T
set guifont=M+_1mn_light:h13
set guifont=M+_1mn_medium:h18
set noballooneval
colorscheme base16-chalk
else
colorscheme desert256
set mouse=a
endif

Expand All @@ -42,6 +43,7 @@ match ExtraWhitespace /\s\+$/

autocmd BufNewFile,BufRead *.json set filetype=javascript
autocmd BufRead,BufNewFile *.md set filetype=markdown
autocmd BufRead,BufNewFile *.gradle set filetype=groovy
autocmd BufNewFile,BufRead *._ set filetype=html
autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
Expand All @@ -54,7 +56,7 @@ function! LightMode()
endfunc

let g:syntastic_enable_signs=1
let g:syntastic_disabled_filetypes = ['cpp']
let g:syntastic_disabled_filetypes = ['cpp', 'html']
let g:syntastic_javascript_checkers = ['jshint']

let g:gist_clip_command = 'pbcopy'
Expand All @@ -66,16 +68,10 @@ inoremap <expr><TAB> pumvisible() ? "<C-n>" : "<TAB>"
au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif

set shell=/bin/bash
map <leader>d :NERDTreeToggle<CR>
let NERDTreeDirArrows=1
let NERDTreeMinimalUI=1
let NERDTreeIgnore=['\.pyc$', 'CVS', '\~$']
let NERDTreeHijackNetrw=1

let g:ackprg = 'ag --nogroup --nocolor --column'

let g:ctrlp_extensions = ['line', 'funky']
let g:ctrlp_extensions = ['line', 'funky', 'csearch']
let g:ctrlp_match_func = {'match' : 'matcher#cmatch' }
nnoremap <C-f> :CtrlPFunky<Cr>
Expand All @@ -92,3 +88,4 @@ endif
set statusline=[%n]\ %<%.99f\ %h%w%m%r%y%{SL('fugitive#statusline')}%{SL('SyntasticStatuslineFlag')}%*%=%-14.(%l,%c%V%)\ %P

nmap <leader>a :Ack
nmap <leader>c :Gcommit --amend<Cr>
1 change: 0 additions & 1 deletion Floobits
Submodule Floobits deleted from 22e17f
1 change: 0 additions & 1 deletion base16
Submodule base16 deleted from 7fc217
1 change: 0 additions & 1 deletion bundle/Floobits
Submodule Floobits deleted from 22e17f
2 changes: 1 addition & 1 deletion bundle/ack.vim
2 changes: 1 addition & 1 deletion bundle/ctrlp-cmatcher
2 changes: 1 addition & 1 deletion bundle/gist-vim
2 changes: 1 addition & 1 deletion bundle/gundu.vim
1 change: 0 additions & 1 deletion bundle/nerdtree
Submodule nerdtree deleted from b0bb78
2 changes: 1 addition & 1 deletion bundle/supertab
Submodule supertab updated 4 files
+6 −0 Makefile
+76 −1 README.rst
+115 −35 doc/supertab.txt
+108 −45 plugin/supertab.vim
2 changes: 1 addition & 1 deletion bundle/syntastic
7 changes: 0 additions & 7 deletions bundle/tagbar/README

This file was deleted.

2 changes: 1 addition & 1 deletion bundle/tern_for_vim
Submodule tern_for_vim updated from 005fca to b5418b
2 changes: 1 addition & 1 deletion bundle/vim-fish
Submodule vim-fish updated 1 files
+3 −3 ftdetect/fish.vim
2 changes: 1 addition & 1 deletion bundle/vim-fugitive
2 changes: 1 addition & 1 deletion bundle/vim-glsl
2 changes: 1 addition & 1 deletion bundle/vim-golang
2 changes: 1 addition & 1 deletion bundle/vim-javascript
2 changes: 1 addition & 1 deletion bundle/vim-rhubarb
Submodule vim-rhubarb updated 3 files
+1 −0 CONTRIBUTING.markdown
+15 −22 README.markdown
+1 −0 plugin/rhubarb.vim
2 changes: 1 addition & 1 deletion bundle/vim-surround
Submodule vim-surround updated 1 files
+9 −0 plugin/surround.vim
2 changes: 1 addition & 1 deletion bundle/vim-unimpaired
2 changes: 1 addition & 1 deletion bundle/vim-vinegar
Submodule vim-vinegar updated 2 files
+1 −1 README.markdown
+42 −8 plugin/vinegar.vim
1 change: 0 additions & 1 deletion bundle/vim-zenroom
Submodule vim-zenroom deleted from 593baf
39 changes: 39 additions & 0 deletions spell/en.utf-8.add
Expand Up @@ -15,3 +15,42 @@ ArcGIS
mouseover
mouseout
keybindings
TileJSON
mapbox
MapBox
tileLayer
getTileJSON
setTileJSON
setFormat
markerLayer
FeatureGroup
GeoJSON
baselayer
offline
MapKit
TileMill
SDK
Geocoder
Prebuilt
UTFGrid
iOS
API
Firefox
plugin
JSON
checkin
geocoding
Metadata
geodata
CartoCSS
GIS
failover
app
apps
APIs
plugins
workflow
Arc2Earth
bloggers
fallback
MapBox's
Binary file modified spell/en.utf-8.add.spl
Binary file not shown.

0 comments on commit 957de12

Please sign in to comment.