# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1477618574 18000
# Node ID cae546f293ff9018a1540a1b5f0d14126974045a
# Parent  aa1019ab89b43421df7e225c0d0154f86a801fad# Parent  d17e9bd25f685e080c93f58ab381da408736e18d
Merge

diff -r aa1019ab89b4 -r cae546f293ff vim/.vimrc
--- a/vim/.vimrc	Thu Oct 27 20:32:00 2016 -0500
+++ b/vim/.vimrc	Thu Oct 27 20:36:14 2016 -0500
@@ -51,8 +51,12 @@
 let c_space_errors = 1
 let python_space_error_highlight = 1
 
+"set background=dark
+"colorscheme peaksea2
+syntax enable
 set background=dark
-colorscheme peaksea2
+set rtp+=~/.vim/bundle/vim-colors-solarized
+colorscheme solarized
 
 " shortcut for word completion in insert mode
 imap <S-Tab> <C-n>
diff -r aa1019ab89b4 -r cae546f293ff vim/vimfiles/README-bundle.txt
--- a/vim/vimfiles/README-bundle.txt	Thu Oct 27 20:32:00 2016 -0500
+++ b/vim/vimfiles/README-bundle.txt	Thu Oct 27 20:36:14 2016 -0500
@@ -28,3 +28,8 @@
 -------
 
    $ git clone https://github.com/mxw/vim-jsx.git
+
+solarized color scheme
+----------------------
+
+   $ git clone git://github.com/altercation/vim-colors-solarized.git