2 files changed, 35 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e941970..3a5ca3d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,13 @@ INSTALL = \
 	emacs.d \
 	gitconfig \
 	gitignore \
-	tmux.conf
-
+	tmux.conf \
+	vimrc
 
 INSTALLED = $(patsubst %,$(INTO)/.%,$(INSTALL))
 FONTS     = $(patsubst fonts/%.ttf,$(FONTS_DIR)/%.ttf,$(MYFONTS))
 LN        = @ln -sf
 
-
 $(INTO)/.% : %
 	@[ ! -e $@ ] || [ -h $@ ] || mv -f $@ $@.bak
 	$(LN) $(PWD)/$< $@
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..382b5be
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,33 @@
+setlocal spell spelllang=en_us
+
+syn off
+
+set autoindent
+set autowrite
+set expandtab
+set ignorecase
+set list
+set listchars=tab:>-,trail:~,extends:>,precedes:<
+set nohls
+set nospell
+set ruler
+set viminfo=""
+
+set shiftwidth=2
+set smarttab
+set tabstop=2
+
+set nobackup                    " Don't create annoying backup files
+set noswapfile                  " Don't use swapfile
+set nowritebackup
+
+set noerrorbells                " No beeps
+
+set autoread                    " Automatically reread changed files without asking me anything
+set autowrite                   " Automatically save before :next, :make etc.
+set encoding=utf-8              " Set default encoding to UTF-8
+
+set winminheight=0              " minimize split window
+
+
+au BufNewFile,BufRead *.go setlocal noet ts=4 sw=4 sts=4