Permalink
Browse files

One vimrc for vim and macvim. No more Janus madness

  • Loading branch information...
1 parent fcb5fc7 commit e5d3b129e61d34b1eb8b220ba8bda24f4d7cead4 @punjab committed Oct 24, 2012
Showing with 31 additions and 17 deletions.
  1. +0 −6 gvimrc.after
  2. +31 −0 vimrc
  3. +0 −11 vimrc.after
View
@@ -1,6 +0,0 @@
-" ---------------------------------------------------------------------------
-" " Overrides .vimrc.local specific to MacVim
-" "
-" ---------------------------------------------------------------------------
-color molokai
-set transparency=15
View
31 vimrc
@@ -0,0 +1,31 @@
+call pathogen#infect() " runtime manipulator plugin
+set nocompatible " choose no compatibility with legacy vi
+call pathogen#infect() " runtime manipulator plugin
+syntax enable
+set encoding=utf-8
+set showcmd " display incomplete commands
+filetype plugin indent on " load file type plugins + indentation
+
+"" Whitespace
+set nowrap " don't wrap lines
+set tabstop=2 shiftwidth=2 " a tab is two spaces
+set expandtab " use spaces, not tabs
+set backspace=indent,eol,start " backspace through everything in insert mode
+
+"" Searching
+set hlsearch " highlight matches
+set incsearch " incremental searching
+set ignorecase " searches are cases insensitive
+set smartcase " err..unles they contain atleast one cpaital letter.
+
+"" Colors
+colorscheme solarized
+if has("gui_running")
+ set background=light
+ set transparency=15
+ set guioptions=aAce " Get rid of those ugly scrollbars in mvim
+ set guifont=Inconsolata:h16 " Inconsolata looks good at 16pts
+else
+ set background=dark
+endif
+
View
@@ -1,11 +0,0 @@
-" ---------------------------------------------------------------------------
-" " Everything here overwrite default Janus.
-" "
-" ---------------------------------------------------------------------------
-color desert
-
-" Get rid of those ugly scrollbars in mvim
-set guioptions=aAce
-
-" Monaco looks good at 16pts
-set guifont=Monaco:h16

0 comments on commit e5d3b12

Please sign in to comment.