Skip to content
Browse files

Merge branch 'master' of github.com:brantb/dotfiles

  • Loading branch information...
2 parents 5d76059 + 694d2d1 commit e8dd1c226c1be0048b5a7c848d0f6672085a7b9d @brantb committed Feb 14, 2012
Showing with 15 additions and 1 deletion.
  1. +3 −0 .gitmodules
  2. +1 −0 vim/bundle/vim-css3-syntax
  3. +11 −1 vimrc
View
3 .gitmodules
@@ -42,3 +42,6 @@
[submodule "vim/bundle/vim-repeat"]
path = vim/bundle/vim-repeat
url = https://github.com/tpope/vim-repeat.git
+[submodule "vim/bundle/vim-css3-syntax"]
+ path = vim/bundle/vim-css3-syntax
+ url = https://github.com/hail2u/vim-css3-syntax.git
1 vim/bundle/vim-css3-syntax
@@ -0,0 +1 @@
+Subproject commit f55d4889093225e3bc50bd01b70e2035838b50e5
View
12 vimrc
@@ -23,9 +23,19 @@ if has("win32")
cd $HOME " Default cwd is System32, which is stupid
endif
-set number
+" Search options
+set hlsearch " Highlight search results
+set smartcase " Search strings that are all-lowercase will do a case-insensitive search
+set incsearch " Incremental search
+nnoremap <CR> :noh<CR><CR> " Clear search highlight by hitting enter
+
+set number " Show line numbers
set shiftwidth=4
set tabstop=4
+set hlsearch " Highlight search results
+set smartcase " Search strings that are all-lowercase will do a case-insensitive search
+set incsearch " Incremental search
+
syntax enable
filetype plugin indent on
colorscheme solarized

0 comments on commit e8dd1c2

Please sign in to comment.
Something went wrong with that request. Please try again.