Permalink
Browse files

fixed a bunch of small issues

  • Loading branch information...
1 parent 22df633 commit 80f2abf40b2c8896581467b3c3ddd4f8477ce6f0 Tammer Saleh committed Jun 20, 2012
Showing with 35 additions and 11 deletions.
  1. +16 −0 vim/gvimrc
  2. +19 −11 vim/vimrc
View
@@ -1,2 +1,18 @@
colorscheme vividchalk
set guioptions=egmrLt
+
+hi IncSearch gui=underline guifg=yellow guibg=blue
+hi Search gui=underline guifg=yellow guibg=black
+hi Visual gui=bold guifg=black guibg=#FFCC66
+hi CursorColumn guibg=#111111
+hi CursorLine guibg=#111111
+
+hi PmenuSel gui=bold guifg=yellow guibg=#008080
+hi Pmenu guifg=#444444 guibg=#008080
+hi PmenuSbar guibg=grey
+hi PmenuThumb guifg=yellow guibg=black
+
+if has("gui_macvim")
+ macmenu File.New\ Tab key=<nop>
+ macmenu File.Print key=<nop>
+endif
View
@@ -7,6 +7,8 @@ call pathogen#helptags()
syntax on
filetype plugin indent on
+nmap <D-t> :tabedit .<CR>
+
" nocomplcache stuff
let g:neocomplcache_enable_at_startup = 1
" Snippets still don't work the way I want - tab doesn't jump to next
@@ -17,6 +19,12 @@ let g:neocomplcache_enable_auto_select = 1
let g:neocomplcache_auto_completion_start_length = 1
let g:neocomplcache_enable_auto_select = 0
+" CTRL-P
+let g:ctrlp_open_new_file = 't'
+let g:ctrlp_open_multiple_files = 't'
+let g:ctrlp_map = '<D-p>'
+let g:ctrlp_prompt_mappings = { 'AcceptSelection("e")': [], 'AcceptSelection("t")': ['<cr>', '<c-m>'], }
+
set nocompatible
set autoread
@@ -47,10 +55,14 @@ set expandtab
set shiftwidth=2
set tabstop=2
set helpheight=1000
+set list
set completeopt=menu,menuone,preview
set wildmode=longest,list:longest
+set cursorcolumn " highlight the screen column of the cursor
+set cursorline " highlight the screen line of the cursor
+
setlocal numberwidth=3
map gb <C-^>
@@ -68,19 +80,11 @@ nnoremap gk k
nnoremap gj j
set hlsearch
-set listchars=tab:>-,trail:-
-hi IncSearch term=reverse gui=underline guibg=Blue guifg=Yellow
-hi Search term=reverse gui=underline guibg=Black guifg=Yellow
-hi Visual term=reverse cterm=reverse ctermbg=9 guibg=#555577 guifg=Black
-
-hi Pmenu guifg=White guibg=Blue
-hi PmenuSel gui=italic guifg=Yellow guibg=Blue
-hi PmenuSbar ctermbg=Black guibg=Grey
-hi PmenuThumb guifg=Yellow guibg=Black
+set listchars=tab:××,trail:×,nbsp:×
if has("gui_running")
- set lines=80
- set columns=120
+ set lines=80
+ set columns=120
set number
endif
@@ -103,3 +107,7 @@ autocmd BufNewFile,BufRead *.css set fdm=marker fmr={,}
" Fuck tpope
xmap s <Plug>VSurround
+
+hi IncSearch term=reverse
+hi Search term=reverse
+hi Visual term=reverse cterm=reverse ctermbg=9

0 comments on commit 80f2abf

Please sign in to comment.