summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinstall1
-rw-r--r--vimrc23
2 files changed, 15 insertions, 9 deletions
diff --git a/install b/install
index 5240515..01aba99 100755
--- a/install
+++ b/install
@@ -25,6 +25,7 @@ GIT_URLS="
github.com/tpope/vim-haml.git
github.com/tpope/vim-markdown.git
github.com/majutsushi/tagbar
+ github.com/altercation/vim-colors-solarized.git
"
[ ! -d $DIR/bundle ] && mkdir $DIR/bundle
cd $DIR/bundle
diff --git a/vimrc b/vimrc
index 79443b1..3485114 100644
--- a/vimrc
+++ b/vimrc
@@ -3,16 +3,21 @@
call pathogen#infect()
" color scheme
-map <F12> :let &background = ( &background == "dark" ? "light" : "dark" )<CR>
-if !empty($DISPLAY)
- set t_Co=256
- colorscheme desert256
-else
- colorscheme adobe
-endif
+" map <F12> :let &background = ( &background == "dark" ? "light" : "dark" )<CR>
+" if !empty($DISPLAY)
+" set t_Co=256
+" colorscheme desert256
+" else
+" colorscheme adobe
+" endif
+
+syntax enable
+set background=dark
+colorscheme solarized
+call togglebg#map("<F5>")
-" Switch syntax highlighting on, when the terminal has colors
" Also switch on highlighting the last used search pattern.
+" Switch syntax highlighting on, when the terminal has colors
if &t_Co > 2 || has("gui_running")
syntax on
set hlsearch
@@ -30,7 +35,7 @@ set nofsync
:au BufNewFile * :exe("0r! ~/.vim/skeletons.rb %:p " . &filetype)
:au Filetype html,xml,xsl source ~/.vim/scripts/closetag.vim
-set list
+" set list
" set cursorline
" set cursorcolumn
set foldmethod=marker