From deb52fd1bf81f52a8a7158bee4f3bed884bc341f Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom.willemsen@archlinux.us>
Date: Sun, 5 Dec 2010 12:44:54 +0100
Subject: [PATCH] Added vim configuration

---
 install.sh               |   3 +
 vim/.netrwhist           |   4 +
 vim/colors/darkdevel.vim | 213 ++++++++++++++++++++++++
 vim/colors/zenburn.vim   | 351 +++++++++++++++++++++++++++++++++++++++
 vim/syntax/vala.vim      | 174 +++++++++++++++++++
 vimrc                    |  23 +++
 6 files changed, 768 insertions(+)
 create mode 100644 vim/.netrwhist
 create mode 100644 vim/colors/darkdevel.vim
 create mode 100644 vim/colors/zenburn.vim
 create mode 100644 vim/syntax/vala.vim
 create mode 100644 vimrc

diff --git a/install.sh b/install.sh
index 153a98e..0689c08 100755
--- a/install.sh
+++ b/install.sh
@@ -21,3 +21,6 @@ linkmy config/awesome .config/awesome
 # EMACS
 linkmy emacs .emacs
 linkmy emacs.d .emacs.d
+# VIM
+linkmy vimrc .vimrc
+linkmy vim .vim
diff --git a/vim/.netrwhist b/vim/.netrwhist
new file mode 100644
index 0000000..6b8ee43
--- /dev/null
+++ b/vim/.netrwhist
@@ -0,0 +1,4 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =2
+let g:netrw_dirhist_1='/etc/X11/xorg.conf.d'
+let g:netrw_dirhist_2='/home/slash/.ssh'
diff --git a/vim/colors/darkdevel.vim b/vim/colors/darkdevel.vim
new file mode 100644
index 0000000..7d77879
--- /dev/null
+++ b/vim/colors/darkdevel.vim
@@ -0,0 +1,213 @@
+" Darkdevel Vim color scheme
+"
+" Name:         darkdevel.vim
+" Maintainer:   Hallison Batista <email@hallisonbatista.com> 
+" Last Change:  2009-03-17 
+" License:      Public Domain
+" Version:      1.1.1
+
+highlight clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let g:colors_name = "darkdevel"
+
+" General settings
+" ================
+set background=dark
+set cursorline
+"set cursorcolumn
+
+" Cursor style
+" ============
+  highlight Cursor          ctermfg=NONE        guifg=#000000     ctermbg=NONE        guibg=#FFFFFF
+  "highlight CursorIM      
+  highlight CursorColumn    ctermfg=NONE        guifg=NONE        ctermbg=DarkGray    guibg=#0F0F0F
+  highlight CursorLine      ctermfg=NONE        guifg=NONE        ctermbg=DarkGray    guibg=#0F0F0F
+
+" Directory style
+" ===============
+  "highlight Directory       ctermbg=NONE        guifg=NONE        ctermbg=NONE        guibg=NONE      cterm=bold    gui=underline
+
+" Diff text style
+" ===============
+  highlight DiffAdd         ctermfg=DarkGreen   guifg=#32BE32     ctermbg=NONE        guibg=NONE
+  "highlight DiffChange  
+  highlight DiffDelete      ctermfg=DarkRed     guifg=#BE3232     ctermbg=NONE        guibg=NONE
+  "highlight DiffText  
+
+" Text and message style
+" ======================
+  highlight ErrorMsg        ctermfg=Red         guifg=#FF0000     ctermbg=NONE        guibg=NONE
+  highlight WarningMsg      ctermfg=Yellow      guifg=Yellow      ctermbg=NONE        guibg=NONE
+  highlight MoreMsg         ctermfg=Green       guifg=#00FF00     ctermbg=NONE        guibg=NONE
+  highlight link ModeMsg    WarningMsg
+  "highlight VertSplit
+  highlight Folded          ctermfg=Gray        guifg=#777777     ctermbg=DarkGray    guibg=#0F0F0F
+  "highlight FoldColumn
+  "highlight SignColumn
+  "highlight IncSearch
+  highlight LineNr          ctermfg=DarkGray    guifg=#777777     ctermbg=DarkGray    guibg=#0F0F0F 
+  "highlight MatchParen
+  highlight NonText         ctermfg=Gray        guifg=#777777     ctermbg=NONE        guibg=#000000
+  highlight Normal          ctermfg=Gray        guifg=#F0F0F0     ctermbg=NONE        guibg=#000000
+
+" Popup menu style
+" ================
+  highlight Pmenu           ctermfg=Gray        guifg=#FFFFFF     ctermbg=DarkGray    guibg=#0F0F0F
+  highlight PmenuSel        ctermfg=White       guifg=#0F0F0F     ctermbg=Gray        guibg=#F0F0F0
+  highlight PmenuSbar       ctermfg=NONE        guifg=NONE        ctermbg=DarkGray    guibg=#777777
+  highlight PmenuThumb      ctermfg=Gray        guifg=#F0F0F0     ctermbg=NONE        guibg=NONE
+
+  "highlight Question
+  "highlight Search
+  "highlight SpecialKey
+  "highlight Error                     guifg=#FFFFFF   guibg=#990000
+
+" Spelling style
+" ==============
+  "highlight SpellBad
+  "highlight SpellCap
+  "highlight SpellLocal
+  "highlight SpellRare
+
+" Status style
+" ============
+  highlight StatusLine      ctermfg=DarkGray    guifg=#0F0F0F     ctermbg=Gray        guibg=#777777   cterm=bold  gui=bold
+  highlight StatusLineNC    ctermfg=DarkGray    guifg=#777777     ctermbg=DarkGray    guibg=#0F0F0F   cterm=bold  gui=bold
+
+  "highlight TabLine
+  "highlight TabLineFill
+  "highlight TabLineSel
+
+  highlight Title           ctermfg=Gray        guifg=#0F0F0F
+  highlight Visual          ctermfg=Gray        guifg=#FFFFFF     ctermbg=DarkBlue    guibg=#505064
+  highlight VisualNOS       ctermfg=NONE        guifg=NONE        ctermbg=DarkGreen   guibg=#506450
+  highlight WildMenu        ctermfg=NONE        guifg=#777777     ctermbg=DarkGray    guibg=#0F0F0F
+
+" Win32 specific style
+" --------------------
+  "highlight Menu
+  "highlight Scrollbar
+  "highlight Tooltip
+
+" Syntax style
+" ============
+
+" Style for constants
+" -------------------
+  highlight Constant          ctermfg=DarkRed     guifg=#6496C8
+  highlight String            ctermfg=DarkGreen   guifg=#64C896
+  highlight Character         ctermfg=DarkBlue    guifg=#6496C8
+  highlight Number            ctermfg=DarkGreen   guifg=#64C896
+  highlight Boolean           ctermfg=DarkBlue    guifg=#6496C8
+  highlight Float             ctermfg=DarkGreen   guifg=#64C896
+
+  highlight Comment           ctermfg=DarkGray    guifg=#646464     ctermbg=NONE      guibg=NONE
+
+" Style for identifier and variable names
+" ----------------------------------------
+  highlight Identifier        ctermfg=DarkCyan    guifg=#6496C8     gui=NONE
+  highlight Function          ctermfg=Yellow      guifg=#FFC864     gui=NONE
+
+" Style for statements
+" ---------------------
+  highlight Statement         ctermfg=Brown       guifg=#C89664     gui=NONE
+  highlight link Conditional  Statement
+  highlight link Repeat       Statement
+  highlight link Label        Statement
+  highlight Operator          ctermfg=Green       guifg=#64C864
+  highlight Keyword           ctermfg=DarkRed     guifg=#C86432
+  highlight link Exception    Statement
+
+" Style for generic preprocessor
+" ------------------------------
+  highlight PreProc           ctermfg=Gray        guifg=#DCDCDC     ctermbg=NONE      guibg=NONE
+  highlight Include           ctermfg=DarkRed     guifg=#C86432     ctermbg=NONE      guibg=NONE
+  highlight link Define       Include
+  highlight link Macro        Include
+  highlight link PreCondit    Include
+
+" Style for types and objects
+" ---------------------------
+  highlight Type              ctermfg=DarkRed     guifg=#DC4B32     gui=NONE
+  highlight link StorageClass Type
+  highlight link Structure    Type
+  highlight link Typedef      Type
+
+" Style for special symbols
+" -------------------------
+  "highlight Special         
+  "highlight SpecialChar     
+  "highlight Tag             
+  "highlight Delimiter       
+  "highlight SpecialComment  
+  "highlight Debug           
+
+" Style for text format
+" ---------------------
+  "highlight Underlined 
+  "highlight Ignore     
+  "highlight Error      
+  "highlight Todo       
+
+" Style for Shell Syntax
+" ----------------------
+  "highlight shTest
+  "highlight shCase
+  "highlight shCaseExSingleQuote
+  "highlight shCaseEsac
+  "highlight shDo
+  "highlight shExpr
+  "highlight shFor
+  "highlight shIf
+  "highlight shSubSh
+  "highlight shComma
+  "highlight shDerefVarArray
+  "highlight shDblBrace
+  "highlight shSpecialVar
+  "highlight shDblParen
+  "highlight shCurlyIn
+  "highlight bashSpecialVariables
+  "highlight bashStatement
+  "highlight bashAdminStatement
+  "highlight kshSpecialVariables
+  "highlight kshStatement
+  "highlight shSetIdentifier
+  "highlight shFunctionTwo
+  "highlight shFunctionStart
+  "highlight shFunctionOne
+  "highlight shDerefPattern
+  "highlight shDerefEscape
+  "highlight shDerefPPSleft
+  "highlight shDerefPPSright
+  "highlight shCaseEsacSync
+  "highlight shDoSync
+  "highlight shForSync
+  "highlight shIfSync
+  "highlight shUntilSync
+  "highlight shWhileSync
+
+" Style for Ruby Syntax
+" ---------------------
+  highlight rubyBlockParameter        guifg=#FFFFFF
+  highlight rubyClass                 guifg=#FFFFFF
+  highlight rubyConstant              guifg=#DA4939
+  highlight rubyInstanceVariable      guifg=#D0D0FF
+  highlight rubyInterpolation         guifg=#519F50
+  highlight rubyLocalVariableOrMethod guifg=#D0D0FF
+  highlight rubyPredefinedConstant    guifg=#DA4939
+  highlight rubyPseudoVariable        guifg=#FFC66D
+  highlight rubyStringDelimiter       guifg=#A5C261
+
+" Style for XML and (X)HTML Syntax
+  highlight xmlTag                    guifg=#E8BF6A
+  highlight xmlTagName                guifg=#E8BF6A
+  highlight xmlEndTag                 guifg=#E8BF6A
+
+  highlight link htmlTag              xmlTag
+  highlight link htmlTagName          xmlTagName
+  highlight link htmlEndTag           xmlEndTag
+
diff --git a/vim/colors/zenburn.vim b/vim/colors/zenburn.vim
new file mode 100644
index 0000000..edbd6d7
--- /dev/null
+++ b/vim/colors/zenburn.vim
@@ -0,0 +1,351 @@
+" Vim color file
+" Maintainer:   Jani Nurminen <slinky@iki.fi>
+" Last Change:  $Id: zenburn.vim,v 2.13 2009/10/24 10:16:01 slinky Exp $
+" URL:      	http://slinky.imukuppi.org/zenburnpage/
+" License:      GPL
+"
+" Nothing too fancy, just some alien fruit salad to keep you in the zone.
+" This syntax file was designed to be used with dark environments and 
+" low light situations. Of course, if it works during a daybright office, go
+" ahead :)
+"
+" Owes heavily to other Vim color files! With special mentions
+" to "BlackDust", "Camo" and "Desert".
+"
+" To install, copy to ~/.vim/colors directory.
+"
+" Alternatively, you can use Vimball installation:
+"     vim zenburn.vba
+"     :so %
+"     :q
+"
+" For details, see :help vimball
+"
+" After installation, use it with :colorscheme zenburn.
+" See also :help syntax
+"
+" Credits:
+"  - Jani Nurminen - original Zenburn
+"  - Steve Hall & Cream posse - higher-contrast Visual selection
+"  - Kurt Maier - 256 color console coloring, low and high contrast toggle,
+"                 bug fixing
+"  - Charlie - spotted too bright StatusLine in non-high contrast mode
+"  - Pablo Castellazzi - CursorLine fix for 256 color mode
+"  - Tim Smith - force dark background
+"  - John Gabriele - spotted bad Ignore-group handling
+"  - Zac Thompson - spotted invisible NonText in low contrast mode
+"  - Christophe-Marie Duquesne - suggested making a Vimball
+"
+" CONFIGURABLE PARAMETERS:
+"
+" You can use the default (don't set any parameters), or you can
+" set some parameters to tweak the Zenburn colours.
+"
+" To use them, put them into your .vimrc file before loading the color scheme,
+" example:
+"    let g:zenburn_high_Contrast=1
+"    colors zenburn
+"
+" * You can now set a darker background for bright environments. To activate, use:
+"   contrast Zenburn, use:
+"
+"      let g:zenburn_high_Contrast = 1
+"
+" * For example, Vim help files uses the Ignore-group for the pipes in tags 
+"   like "|somelink.txt|". By default, the pipes are not visible, as they
+"   map to Ignore group. If you wish to enable coloring of the Ignore group,
+"   set the following parameter to 1. Warning, it might make some syntax files
+"   look strange.
+"
+"      let g:zenburn_color_also_Ignore = 1
+"
+" * To get more contrast to the Visual selection, use
+"
+"      let g:zenburn_alternate_Visual = 1
+"
+" * To use alternate colouring for Error message, use
+"
+"      let g:zenburn_alternate_Error = 1
+"
+" * The new default for Include is a duller orange. To use the original
+"   colouring for Include, use
+"
+"      let g:zenburn_alternate_Include = 1
+"
+" * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237
+"   as light values, and sets background to light for some people. If you have
+"   this problem, use:
+"
+"      let g:zenburn_force_dark_Background = 1
+"
+" NOTE:
+"
+" * To turn the parameter(s) back to defaults, use UNLET:
+"
+"      unlet g:zenburn_alternate_Include
+"
+"   Setting to 0 won't work!
+"
+" That's it, enjoy!
+"
+" TODO
+"   - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
+"   - IME colouring (CursorIM)
+
+set background=dark
+hi clear
+if exists("syntax_on")
+    syntax reset
+endif
+let g:colors_name="zenburn"
+
+hi Boolean         guifg=#dca3a3
+hi Character       guifg=#dca3a3 gui=bold
+hi Comment         guifg=#7f9f7f gui=italic
+hi Conditional     guifg=#f0dfaf gui=bold
+hi Constant        guifg=#dca3a3 gui=bold
+hi Cursor          guifg=#000d18 guibg=#8faf9f gui=bold
+hi Debug           guifg=#bca3a3 gui=bold
+hi Define          guifg=#ffcfaf gui=bold
+hi Delimiter       guifg=#8f8f8f
+hi DiffAdd         guifg=#709080 guibg=#313c36 gui=bold
+hi DiffChange      guibg=#333333
+hi DiffDelete      guifg=#333333 guibg=#464646
+hi DiffText        guifg=#ecbcbc guibg=#41363c gui=bold
+hi Directory       guifg=#dcdccc gui=bold
+hi ErrorMsg        guifg=#80d4aa guibg=#2f2f2f gui=bold
+hi Exception       guifg=#c3bf9f gui=bold
+hi Float           guifg=#c0bed1
+hi FoldColumn      guifg=#93b3a3 guibg=#3f4040
+hi Folded          guifg=#93b3a3 guibg=#3f4040
+hi Function        guifg=#efef8f
+hi Identifier      guifg=#efdcbc
+hi IncSearch       guibg=#f8f893 guifg=#385f38
+hi Keyword         guifg=#f0dfaf gui=bold
+hi Label           guifg=#dfcfaf gui=underline
+hi LineNr          guifg=#9fafaf guibg=#262626
+hi Macro           guifg=#ffcfaf gui=bold
+hi ModeMsg         guifg=#ffcfaf gui=none
+hi MoreMsg         guifg=#ffffff gui=bold
+hi Number          guifg=#8cd0d3
+hi Operator        guifg=#f0efd0
+hi PreCondit       guifg=#dfaf8f gui=bold
+hi PreProc         guifg=#ffcfaf gui=bold
+hi Question        guifg=#ffffff gui=bold
+hi Repeat          guifg=#ffd7a7 gui=bold
+hi Search          guifg=#ffffe0 guibg=#284f28
+hi SpecialChar     guifg=#dca3a3 gui=bold
+hi SpecialComment  guifg=#82a282 gui=bold
+hi Special         guifg=#cfbfaf
+hi SpecialKey      guifg=#9ece9e
+hi Statement       guifg=#e3ceab gui=none
+hi StatusLine      guifg=#313633 guibg=#ccdc90
+hi StatusLineNC    guifg=#2e3330 guibg=#88b090
+hi StorageClass    guifg=#c3bf9f gui=bold
+hi String          guifg=#cc9393
+hi Structure       guifg=#efefaf gui=bold
+hi Tag             guifg=#e89393 gui=bold
+hi Title           guifg=#efefef gui=bold
+hi Todo            guifg=#dfdfdf guibg=bg gui=bold
+hi Typedef         guifg=#dfe4cf gui=bold
+hi Type            guifg=#dfdfbf gui=bold
+hi Underlined      guifg=#dcdccc gui=underline
+hi VertSplit       guifg=#2e3330 guibg=#688060
+hi VisualNOS       guifg=#333333 guibg=#f18c96 gui=bold,underline
+hi WarningMsg      guifg=#ffffff guibg=#333333 gui=bold
+hi WildMenu        guibg=#2c302d guifg=#cbecd0 gui=underline
+
+hi SpellBad   guisp=#bc6c4c guifg=#dc8c6c
+hi SpellCap   guisp=#6c6c9c guifg=#8c8cbc
+hi SpellRare  guisp=#bc6c9c guifg=#bc8cbc
+hi SpellLocal guisp=#7cac7c guifg=#9ccc9c
+
+" Entering Kurt zone
+if &t_Co > 255
+    hi Boolean         ctermfg=181
+    hi Character       ctermfg=181   cterm=bold
+    hi Comment         ctermfg=108
+    hi Conditional     ctermfg=223   cterm=bold
+    hi Constant        ctermfg=181   cterm=bold
+    hi Cursor          ctermfg=233   ctermbg=109     cterm=bold
+    hi Debug           ctermfg=181   cterm=bold
+    hi Define          ctermfg=223   cterm=bold
+    hi Delimiter       ctermfg=245
+    hi DiffAdd         ctermfg=66    ctermbg=237     cterm=bold
+    hi DiffChange      ctermbg=236
+    hi DiffDelete      ctermfg=236   ctermbg=238
+    hi DiffText        ctermfg=217   ctermbg=237     cterm=bold
+    hi Directory       ctermfg=188   cterm=bold
+    hi ErrorMsg        ctermfg=115   ctermbg=236     cterm=bold
+    hi Exception       ctermfg=249   cterm=bold
+    hi Float           ctermfg=251
+    hi FoldColumn      ctermfg=109   ctermbg=238
+    hi Folded          ctermfg=109   ctermbg=238
+    hi Function        ctermfg=228
+    hi Identifier      ctermfg=223
+    hi IncSearch       ctermbg=228   ctermfg=238
+    hi Keyword         ctermfg=223   cterm=bold
+    hi Label           ctermfg=187   cterm=underline
+    hi LineNr          ctermfg=248   ctermbg=235
+    hi Macro           ctermfg=223   cterm=bold
+    hi ModeMsg         ctermfg=223   cterm=none
+    hi MoreMsg         ctermfg=15    cterm=bold
+    hi Number          ctermfg=116
+    hi Operator        ctermfg=230
+    hi PreCondit       ctermfg=180   cterm=bold
+    hi PreProc         ctermfg=223   cterm=bold
+    hi Question        ctermfg=15    cterm=bold
+    hi Repeat          ctermfg=223   cterm=bold
+    hi Search          ctermfg=230   ctermbg=236
+    hi SpecialChar     ctermfg=181   cterm=bold
+    hi SpecialComment  ctermfg=108   cterm=bold
+    hi Special         ctermfg=181
+    hi SpecialKey      ctermfg=151
+    hi Statement       ctermfg=187   ctermbg=234     cterm=none
+    hi StatusLine      ctermfg=236   ctermbg=186
+    hi StatusLineNC    ctermfg=235   ctermbg=108
+    hi StorageClass    ctermfg=249   cterm=bold
+    hi String          ctermfg=174
+    hi Structure       ctermfg=229   cterm=bold
+    hi Tag             ctermfg=181   cterm=bold
+    hi Title           ctermfg=7     ctermbg=234     cterm=bold
+    hi Todo            ctermfg=108   ctermbg=234     cterm=bold
+    hi Typedef         ctermfg=253   cterm=bold
+    hi Type            ctermfg=187   cterm=bold
+    hi Underlined      ctermfg=188   ctermbg=234     cterm=bold
+    hi VertSplit       ctermfg=236   ctermbg=65
+    hi VisualNOS       ctermfg=236   ctermbg=210     cterm=bold
+    hi WarningMsg      ctermfg=15    ctermbg=236     cterm=bold
+    hi WildMenu        ctermbg=236   ctermfg=194     cterm=bold
+    hi CursorLine      ctermbg=236   cterm=none
+
+    " spellchecking, always "bright" background
+    hi SpellLocal ctermfg=14  ctermbg=237
+    hi SpellBad   ctermfg=9   ctermbg=237
+    hi SpellCap   ctermfg=12  ctermbg=237
+    hi SpellRare  ctermfg=13  ctermbg=237
+
+    " pmenu
+    hi PMenu      ctermfg=248  ctermbg=0
+    hi PMenuSel   ctermfg=223 ctermbg=235
+
+    if exists("g:zenburn_high_Contrast")
+        hi Normal ctermfg=188 ctermbg=234
+        hi NonText         ctermfg=238
+
+        if exists("g:zenburn_color_also_Ignore")
+            hi Ignore          ctermfg=238
+        endif
+    else
+        hi Normal ctermfg=188 ctermbg=237
+        hi Cursor          ctermbg=109
+        hi diffadd         ctermbg=237
+        hi diffdelete      ctermbg=238
+        hi difftext        ctermbg=237
+        hi errormsg        ctermbg=237
+        hi foldcolumn      ctermbg=238
+        hi folded          ctermbg=238
+        hi incsearch       ctermbg=228
+        hi linenr          ctermbg=238
+        hi search          ctermbg=238
+        hi statement       ctermbg=237
+        hi statusline      ctermbg=144
+        hi statuslinenc    ctermbg=108
+        hi title           ctermbg=237
+        hi todo            ctermbg=237
+        hi underlined      ctermbg=237
+        hi vertsplit       ctermbg=65
+        hi visualnos       ctermbg=210
+        hi warningmsg      ctermbg=236
+        hi wildmenu        ctermbg=236
+        hi NonText         ctermfg=240
+        
+        if exists("g:zenburn_color_also_Ignore")
+            hi Ignore          ctermfg=240
+        endif
+    endif
+
+    if exists("g:zenburn_alternate_Error")
+        " use more jumpy Error
+        hi Error ctermfg=210 ctermbg=52 gui=bold
+    else
+        " default is something more zenburn-compatible
+        hi Error ctermfg=228 ctermbg=95 gui=bold
+    endif
+endif
+
+if exists("g:zenburn_force_dark_Background")
+    " Force dark background, because of a bug in VIM:  VIM sets background
+    " automatically during "hi Normal ctermfg=X"; it misinterprets the high
+    " value (234 or 237 above) as a light color, and wrongly sets background to
+    " light.  See ":help highlight" for details.
+    set background=dark
+endif
+
+if exists("g:zenburn_high_Contrast")
+    " use new darker background
+    hi Normal          guifg=#dcdccc guibg=#1f1f1f
+    hi CursorLine      guibg=#121212 gui=bold
+    hi Pmenu           guibg=#242424 guifg=#ccccbc
+    hi PMenuSel        guibg=#353a37 guifg=#ccdc90 gui=bold
+    hi PmenuSbar       guibg=#2e3330 guifg=#000000
+    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
+    hi MatchParen      guifg=#f0f0c0 guibg=#383838 gui=bold
+    hi SignColumn      guifg=#9fafaf guibg=#181818 gui=bold
+    hi TabLineFill     guifg=#cfcfaf guibg=#181818 gui=bold
+    hi TabLineSel      guifg=#efefef guibg=#1c1c1b gui=bold
+    hi TabLine         guifg=#b6bf98 guibg=#181818 gui=bold
+    hi CursorColumn    guifg=#dcdccc guibg=#2b2b2b
+    hi NonText         guifg=#404040 gui=bold
+else
+    " Original, lighter background
+    hi Normal          guifg=#dcdccc guibg=#3f3f3f
+    hi CursorLine      guibg=#434443
+    hi Pmenu           guibg=#2c2e2e guifg=#9f9f9f
+    hi PMenuSel        guibg=#242424 guifg=#d0d0a0 gui=bold
+    hi PmenuSbar       guibg=#2e3330 guifg=#000000
+    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
+    hi MatchParen      guifg=#b2b2a0 guibg=#2e2e2e gui=bold
+    hi SignColumn      guifg=#9fafaf guibg=#343434 gui=bold
+    hi TabLineFill     guifg=#cfcfaf guibg=#353535 gui=bold
+    hi TabLineSel      guifg=#efefef guibg=#3a3a39 gui=bold
+    hi TabLine         guifg=#b6bf98 guibg=#353535 gui=bold
+    hi CursorColumn    guifg=#dcdccc guibg=#4f4f4f
+    hi NonText         guifg=#5b605e gui=bold
+endif
+
+
+if exists("g:zenburn_alternate_Visual")
+    " Visual with more contrast, thanks to Steve Hall & Cream posse
+    " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
+    hi Visual          guifg=#000000 guibg=#71d3b4 gui=none
+    hi VisualNOS       guifg=#000000 guibg=#71d3b4 gui=none
+else
+    " use default visual
+    hi Visual          guifg=#233323 guibg=#71d3b4 gui=none
+    hi VisualNOS       guifg=#233323 guibg=#71d3b4 gui=none
+endif
+
+if exists("g:zenburn_alternate_Error")
+    " use more jumpy Error
+    hi Error        guifg=#e37170 guibg=#664040 gui=bold
+else
+    " default is something more zenburn-compatible
+    hi Error        guifg=#e37170 guibg=#3d3535 gui=none
+endif
+
+if exists("g:zenburn_alternate_Include")
+    " original setting
+    hi Include      guifg=#ffcfaf gui=bold
+else
+    " new, less contrasted one
+    hi Include      guifg=#dfaf8f gui=bold
+endif
+
+if exists("g:zenburn_color_also_Ignore")
+    " color the Ignore groups
+    " note: if you get strange coloring for your files, turn this off (unlet)
+    hi Ignore guifg=#545a4f
+endif
+
+" TODO check for more obscure syntax groups that they're ok
diff --git a/vim/syntax/vala.vim b/vim/syntax/vala.vim
new file mode 100644
index 0000000..e827193
--- /dev/null
+++ b/vim/syntax/vala.vim
@@ -0,0 +1,174 @@
+" Vim syntax file
+" Language:	Vala
+" Maintainers:	Emmanuele Bassi <ebassi@gnome.org>
+" 		Hans Vercammen <hveso3@gmail.com>
+" 		pancake <pancake@nopcode.org>
+" Last Change: 	2009-10-28
+" Filenames: 	*.vala *.vapi
+"
+" REFERENCES:
+" [1] http://live.gnome.org/Vala
+"
+" TODO: Possibly when reaching vala 1.0 release
+" 	- validate code attributes
+" 	- better error checking for known errors
+" 	- full support for valadoc
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:vala_cpo_save = &cpo
+set cpo&vim
+
+" Types
+syn keyword valaType			bool char double float size_t ssize_t string unichar void
+syn keyword valaType 			int int8 int16 int32 int64 long short
+syn keyword valaType 			uint uint8 uint16 uint32 uint64 ulong ushort
+" Storage keywords
+syn keyword valaStorage			class delegate enum errordomain interface namespace struct
+" repeat / condition / label
+syn keyword valaRepeat			break continue do for foreach return while
+syn keyword valaConditional		else if switch assert
+" User Labels
+syn keyword valaLabel			case default
+
+" Modifiers
+syn keyword valaModifier		abstract const dynamic ensures extern inline internal override 
+syn keyword valaModifier 		private protected public requires signal static virtual volatile weak
+syn keyword valaModifier 		async owned unowned
+" Constants
+syn keyword valaConstant		false null true
+" Exceptions
+syn keyword valaException		try catch finally throw
+" Unspecified Statements
+syn keyword valaUnspecifiedStatement	as base construct delete get in is lock new out params ref sizeof set this throws typeof using value var yield
+
+" Comments
+syn cluster valaCommentGroup 		contains=valaTodo
+syn keyword valaTodo 			contained TODO FIXME XXX NOTE
+
+" valadoc Comments (ported from javadoc comments in java.vim)
+" TODO: need to verify valadoc syntax
+if !exists("vala_ignore_valadoc")
+  syn cluster valaDocCommentGroup 	contains=valaDocTags,valaDocSeeTag
+  syn region  valaDocTags 		contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn match   valaDocTags 		contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=valaDocParam
+  syn match   valaDocParam 		contained "\s\S\+"
+  syn match   valaDocTags 		contained "@\(author\|brief\|version\|return\|deprecated\)\>"
+  syn region  valaDocSeeTag       	contained matchgroup=valaDocTags start="@see\s\+" matchgroup=NONE end="\_."re=e-1 contains=valaDocSeeTagParam
+  syn match   valaDocSeeTagParam  	contained @"\_[^"]\+"\|<a\s\+\_.\{-}</a>\|\(\k\|\.\)*\(#\k\+\((\_[^)]\+)\)\=\)\=@ extend
+endif
+
+" Comment Strings (ported from c.vim)
+if exists("vala_comment_strings")
+  syn match  	valaCommentSkip		contained "^\s*\*\($\|\s\+\)"
+  syn region 	valaCommentString	contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=valaSpecialChar,valaCommentSkip
+  syn region 	valaComment2String	contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=valaSpecialChar
+  syn cluster 	valaCommentStringGroup 	contains=valaCommentString,valaCharacter,valaNumber
+
+  syn region 	valaCommentL		start="//" end="$" keepend contains=@valaCommentGroup,valaComment2String,valaCharacter,valaNumber,valaSpaceError,@Spell
+  syn region 	valaComment		matchgroup=valaCommentStart start="/\*" end="\*/" contains=@valaCommentGroup,@valaCommentStringGroup,valaCommentStartError,valaSpaceError,@Spell extend
+  if !exists("vala_ignore_valadoc")
+    syn region 	valaDocComment 		matchgroup=valaCommentStart start="/\*\*" end="\*/" keepend contains=@valaCommentGroup,@valaDocCommentGroup,@valaCommentStringGroup,valaCommentStartError,valaSpaceError,@Spell
+  endif
+else
+  syn region	valaCommentL		start="//" end="$" keepend contains=@valaCommentGroup,valaSpaceError,@Spell
+  syn region	valaComment		matchgroup=valaCommentStart start="/\*" end="\*/" contains=@valaCommentGroup,valaCommentStartError,valaSpaceError,@Spell
+  if !exists("vala_ignore_valadoc")
+    syn region 	valaDocComment 		matchgroup=valaCommentStart start="/\*\*" end="\*/" keepend contains=@valaCommentGroup,@valaDocCommentGroup,valaCommentStartError,valaSpaceError,@Spell
+  endif
+endif
+" match comment errors
+syntax match valaCommentError 		display "\*/"
+syntax match valaCommentStartError 	display "/\*"me=e-1 contained
+" match the special comment /**/
+syn match   valaComment		 	"/\*\*/"
+
+" Vala Code Attributes
+syn region  valaAttribute 		start="^\s*\[" end="\]$" contains=valaComment,valaString keepend
+syn region  valaAttribute 		start="\[CCode" end="\]" contains=valaComment,valaString
+
+" Avoid escaped keyword matching
+syn match   valaUserContent 		display "@\I*"
+
+" Strings and constants
+syn match   valaSpecialError		contained "\\."
+syn match   valaSpecialCharError	contained "[^']"
+syn match   valaSpecialChar		contained +\\["\\'0abfnrtvx]+
+syn region  valaString			start=+"+  end=+"+ end=+$+ contains=valaSpecialChar,valaSpecialError,valaUnicodeNumber,@Spell
+syn region  valaVerbatimString		start=+"""+ end=+"""+ contains=@Spell
+syn match   valaUnicodeNumber		+\\\(u\x\{4}\|U\x\{8}\)+ contained contains=valaUnicodeSpecifier
+syn match   valaUnicodeSpecifier	+\\[uU]+ contained
+syn match   valaCharacter		"'[^']*'" contains=valaSpecialChar,valaSpecialCharError
+syn match   valaCharacter		"'\\''" contains=valaSpecialChar
+syn match   valaCharacter		"'[^\\]'"
+syn match   valaNumber			display "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   valaNumber			display "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   valaNumber			display "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   valaNumber			display "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+" when wanted, highlight trailing white space
+if exists("vala_space_errors")
+  if !exists("vala_no_trail_space_error")
+    syn match valaSpaceError		display excludenl "\s\+$"
+  endif
+  if !exists("vala_no_tab_space_error")
+    syn match valaSpaceError 		display " \+\t"me=e-1
+  endif
+endif
+
+" when wanted, set minimum lines for comment syntax syncing
+if exists("vala_minlines")
+  let b:vala_minlines = vala_minlines
+else
+  let b:vala_minlines = 50
+endif
+exec "syn sync ccomment valaComment minlines=" . b:vala_minlines
+
+" The default highlighting.
+hi def link valaType			Type
+hi def link valaStorage			StorageClass
+hi def link valaRepeat			Repeat
+hi def link valaConditional		Conditional
+hi def link valaLabel			Label
+hi def link valaModifier		StorageClass
+hi def link valaConstant		Constant
+hi def link valaException		Exception
+hi def link valaUnspecifiedStatement	Statement
+hi def link valaUnspecifiedKeyword	Keyword
+hi def link valaContextualStatement	Statement
+
+hi def link valaCommentError		Error
+hi def link valaCommentStartError	Error
+hi def link valaSpecialError		Error
+hi def link valaSpecialCharError	Error
+hi def link valaSpaceError 		Error
+
+hi def link valaTodo			Todo
+hi def link valaCommentL		valaComment
+hi def link valaCommentStart		valaComment
+hi def link valaCommentSkip		valaComment
+hi def link valaComment			Comment
+hi def link valaDocComment		Comment
+hi def link valaDocTags 		Special
+hi def link valaDocParam 		Function
+hi def link valaDocSeeTagParam 		Function
+hi def link valaAttribute 		PreCondit
+
+hi def link valaCommentString		valaString
+hi def link valaComment2String		valaString
+hi def link valaString			String
+hi def link valaVerbatimString		String
+hi def link valaCharacter		Character
+hi def link valaSpecialChar		SpecialChar
+hi def link valaNumber			Number
+hi def link valaUnicodeNumber		SpecialChar
+hi def link valaUnicodeSpecifier	SpecialChar
+
+let b:current_syntax = "vala"
+
+let &cpo = s:vala_cpo_save
+unlet s:vala_cpo_save
+
+" vim: ts=8
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..542a485
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,23 @@
+syntax on
+colorscheme zenburn
+
+autocmd FileType make setlocal noexpandtab
+autocmd BufWritePre *.php :%s/\s\+$//e
+
+" Highlight everything right of the 80th column
+highlight rightMargin ctermfg=darkred guifg=darkred
+autocmd BufWinEnter * let w:m1=matchadd('rightMargin', '\%>79v', -1)
+" Highlight all trailing whitespace
+highlight trailWhite ctermbg=darkgray guibg=darkgray
+autocmd BufWinEnter * let w:m2=matchadd('trailWhite',  '\s\+$',  -1)
+
+set expandtab
+set number
+set smartindent
+set tabstop=4
+set shiftwidth=4
+set nowrap
+
+" Swap file location
+set backupdir=/var/tmp//
+set directory=/var/tmp//