diff --git a/.gitmodules b/.gitmodules index f203ac0..36b55bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "bundle/ctrlp"] path = bundle/ctrlp url = https://github.com/kien/ctrlp.vim.git +[submodule "bundle/ctrlspace"] + path = bundle/ctrlspace + url = https://github.com/szw/vim-ctrlspace.git diff --git a/.vimrc b/.vimrc index a251989..e835ec2 100755 --- a/.vimrc +++ b/.vimrc @@ -9,6 +9,7 @@ call pathogen#helptags() "Rebind key let mapleader="," +set guioptions-=e set guioptions-=T "remove the icon bar :set guioptions-=r "remove right-hand scroll bar :set guioptions-=L "remove left-hand scroll bar @@ -20,23 +21,36 @@ set ignorecase " vim-airline set laststatus=2 let g:Powerline_symbols = 'unicode' -let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#enabled = 0 let g:airline_theme = "murmur" let g:airline_powerline_fonts = 1 let g:airline_symbols.space = "\ua0" +let g:jedi#goto_command = "jd" + set hidden "nnoremap :bnext "nnoremap :bprevious -nnoremap s :bnext -nnoremap a :bprevious +nnoremap d :tabnext +nnoremap a :tabprevious +nnoremap w :CtrlSpaceGoUp +nnoremap s :CtrlSpaceGoDown nnoremap b :enew -nnoremap q :bd +nnoremap q :bp:bd # +nnoremap z :b# +nnoremap t :tabe "firefox-like tab navigation -nnoremap :tabnext -nnoremap :tabprevious -nnoremap :tabe +"nnoremap :tabnext +"nnoremap :tabprevious +"nnoremap :tabe + +"Ctrl space +set nocompatible + +" CtrlP Setup +map e :CtrlPBuffer + "set swap directory: set noswapfile @@ -70,7 +84,7 @@ set splitright "Color scheme set t_Co=256 -colorscheme wombat256mod +colorscheme michal "syntax highlighting filetype off @@ -106,7 +120,7 @@ set list -nmap l oprint "\n{}\n".format()i +nmap l oprint "\n\x1b[33m{}\x1b[0m\n".format()i "NERDTree nmap nt :NERDTree @@ -183,8 +197,5 @@ let g:pymode_rope_complete_on_dot = 0 set nofoldenable -" CtrlP Setup -map w :CtrlPBuffer - "Python execute code autocmd FileType python nnoremap :exec '!clear;python' shellescape(@%, 1) diff --git a/bundle/ctrlspace b/bundle/ctrlspace new file mode 160000 index 0000000..305db91 --- /dev/null +++ b/bundle/ctrlspace @@ -0,0 +1 @@ +Subproject commit 305db91d34abc436cb243800faf7970985c6aa47 diff --git a/colors/michal.vim b/colors/michal.vim new file mode 100755 index 0000000..3645bee --- /dev/null +++ b/colors/michal.vim @@ -0,0 +1,100 @@ +" Vim color file +" Original Maintainer: Lars H. Nielsen (dengmao@gmail.com) +" Last Change: 2010-07-23 +" +" Modified version of wombat for 256-color terminals by +" David Liang (bmdavll@gmail.com) +" based on version by +" Danila Bespalov (danila.bespalov@gmail.com) + +set background=dark + +if version > 580 + hi clear + if exists("syntax_on") + syntax reset + endif +endif + +let colors_name = "michal" + +" Tabline colors +hi TabLineFill guifg=Black guibg=White +hi TabLine guifg=#444444 guibg=Black +hi TabLineSel guifg=Orange guibg=#444444 + +" General colors +hi Normal ctermfg=252 ctermbg=234 cterm=none guifg=#e3e0d7 guibg=#242424 gui=none +hi Cursor ctermfg=234 ctermbg=228 cterm=none guifg=#242424 guibg=#eae788 gui=none +hi Visual ctermfg=251 ctermbg=239 cterm=none guifg=#c3c6ca guibg=#554d4b gui=none +hi VisualNOS ctermfg=251 ctermbg=236 cterm=none guifg=#c3c6ca guibg=#303030 gui=none +hi Search ctermfg=177 ctermbg=241 cterm=none guifg=#d787ff guibg=#636066 gui=none +hi Folded ctermfg=103 ctermbg=237 cterm=none guifg=#a0a8b0 guibg=#3a4046 gui=none +hi Title ctermfg=230 cterm=bold guifg=#ffffd7 gui=bold +hi StatusLine ctermfg=230 ctermbg=238 cterm=none guifg=#ffffd7 guibg=#444444 gui=italic +hi VertSplit ctermfg=238 ctermbg=238 cterm=none guifg=#444444 guibg=#444444 gui=none +hi StatusLineNC ctermfg=241 ctermbg=238 cterm=none guifg=#857b6f guibg=#444444 gui=none +hi LineNr ctermfg=241 ctermbg=232 cterm=none guifg=#857b6f guibg=#080808 gui=none +hi SpecialKey ctermfg=241 ctermbg=235 cterm=none guifg=#626262 guibg=#2b2b2b gui=none +hi WarningMsg ctermfg=203 guifg=#ff5f55 +hi ErrorMsg ctermfg=196 ctermbg=236 cterm=bold guifg=#ff2026 guibg=#3a3a3a gui=bold + +" Vim >= 7.0 specific colors +if version >= 700 +hi CursorLine ctermbg=236 cterm=none guibg=#32322f +hi MatchParen ctermfg=228 ctermbg=101 cterm=bold guifg=#eae788 guibg=#857b6f gui=bold +hi Pmenu ctermfg=230 ctermbg=238 guifg=#ffffd7 guibg=#444444 +hi PmenuSel ctermfg=232 ctermbg=192 guifg=#080808 guibg=#cae982 +endif + +" Diff highlighting +hi DiffAdd ctermbg=17 guibg=#2a0d6a +hi DiffDelete ctermfg=234 ctermbg=60 cterm=none guifg=#242424 guibg=#3e3969 gui=none +hi DiffText ctermbg=53 cterm=none guibg=#73186e gui=none +hi DiffChange ctermbg=237 guibg=#382a37 + +"hi CursorIM +"hi Directory +"hi IncSearch +"hi Menu +"hi ModeMsg +"hi MoreMsg +"hi PmenuSbar +"hi PmenuThumb +"hi Question +"hi Scrollbar +"hi SignColumn +"hi SpellBad +"hi SpellCap +"hi SpellLocal +"hi SpellRare +"hi TabLine +"hi TabLineFill +"hi TabLineSel +"hi Tooltip +"hi User1 +"hi User9 +"hi WildMenu + + +" Syntax highlighting +hi Keyword ctermfg=111 cterm=none guifg=#88b8f6 gui=none +hi Statement ctermfg=111 cterm=none guifg=#88b8f6 gui=none +hi Constant ctermfg=173 cterm=none guifg=#e5786d gui=none +hi Number ctermfg=173 cterm=none guifg=#e5786d gui=none +hi PreProc ctermfg=173 cterm=none guifg=#e5786d gui=none +hi Function ctermfg=192 cterm=none guifg=#cae982 gui=none +hi Identifier ctermfg=192 cterm=none guifg=#cae982 gui=none +hi Type ctermfg=186 cterm=none guifg=#d4d987 gui=none +hi Special ctermfg=229 cterm=none guifg=#eadead gui=none +hi String ctermfg=113 cterm=none guifg=#95e454 gui=italic +hi Comment ctermfg=246 cterm=none guifg=#9c998e gui=italic +hi Todo ctermfg=101 cterm=none guifg=#857b6f gui=italic + + +" Links +hi! link FoldColumn Folded +hi! link CursorColumn CursorLine +hi! link NonText LineNr + +" vim:set ts=4 sw=4 noet: