diff --git a/.vimrc_template b/.vimrc_template index 137682e..6f70e66 100644 --- a/.vimrc_template +++ b/.vimrc_template @@ -14,15 +14,12 @@ call vundle#begin() Plugin 'VundleVim/Vundle.vim' Plugin 'tmhedberg/SimpylFold' -Plugin 'Valloric/YouCompleteMe' +"Plugin 'Valloric/YouCompleteMe' Plugin 'scrooloose/syntastic' Plugin 'vim-scripts/indentpython.vim' -"Plugin 'vim-airline/vim-airline' Plugin 'scrooloose/nerdtree' Plugin 'tpope/vim-fugitive' Plugin 'majutsushi/tagbar' -"Plugin 'jmcantrell/vim-virtualenv' -Plugin 'petRUShka/vim-opencl' call vundle#end() "}}} @@ -38,4 +35,5 @@ call vundle#end() "Local settings "{{{ set guifont=Consolas:h12 +colorscheme snowhite "}}} diff --git a/README.md b/README.md index 894f0b0..ad0f1cc 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,29 @@ run `setup.sh`, which will create links from the repository to the `~/.vim` folder and install plugin manager Vundle. Because of links, you shouldn't move or remove the directory in which you cloned this repo. The benefit is that you can get updates to the settings with just `git pull`. + +## Recommended terminal colors + +The included colorschemes were meant to be used with the following terminal +color settings: + +``` +0: #000000 (snowhite) +0: #101010 (pitchblack) +1: #c00000 +2: #00c000 +3: #c0c000 +4: #0000c0 +5: #c000c0 +6: #00afaf +7: #c0c0c0 +8: #808080 +9: #ff0000 +10: #00ff00 +11: #ffff00 +12: #0000ff +13: #ff00ff +14: #00c0c0 +15: #ffffff (snowhite) +15: #eeeeee (pitchblack) +``` diff --git a/colors/pitchblack.vim b/colors/pitchblack.vim index ccaf3ea..c4e3ebb 100644 --- a/colors/pitchblack.vim +++ b/colors/pitchblack.vim @@ -42,7 +42,7 @@ hi SyntasticError cterm=bold ctermfg=9 ctermbg=0 gui=bold guifg=#ff0000 guibg= hi SyntasticWarning cterm=underline gui=undercurl guisp=#ffaf00 hi Unstylish cterm=NONE ctermbg=52 gui=NONE guibg=#5f0000 hi def link TrailingWhite Unstylish -hi Identifier cterm=NONE ctermfg=14 ctermbg=NONE gui=NONE guifg=#00ffff guibg=#000000 +hi Identifier cterm=NONE ctermfg=14 ctermbg=NONE gui=NONE guifg=#00c0c0 guibg=#000000 "hi Ignore gui=NONE guifg=bg guibg=NONE hi PreProc cterm=NONE ctermfg=3 ctermbg=0 gui=NONE guifg=#c0c000 guibg=#000000 hi Special cterm=NONE ctermfg=15 ctermbg=0 gui=NONE guifg=#ffffff guibg=#000000 diff --git a/plugin/settings.vim b/plugin/settings.vim index 81cd629..70e9959 100644 --- a/plugin/settings.vim +++ b/plugin/settings.vim @@ -47,7 +47,6 @@ set langmenu=en_US.UTF-8 "Colors "{{{ set t_Co=256 -colorscheme snowhite ""}}} "Tagbar stuff diff --git a/setup.sh b/setup.sh index 42fb710..556e5be 100755 --- a/setup.sh +++ b/setup.sh @@ -28,7 +28,7 @@ WARNING: if you do, the existing ~/.vimrc will be deleted! || ln -vs "$repo/ftplugin" "$HOME/.vim/ftplugin" [ -d "$HOME/.vim/bundle" ] \ - && echo "You seem to already have some plugin manager" \ + && echo "You seem to already have some plugin manager installed" \ || { mkdir -v "$HOME/.vim/bundle"; \ git clone -v https://github.com/VundleVim/Vundle.vim.git \ "$HOME/.vim/bundle/Vundle.vim"; }