diff --git a/.vimrc b/.vimrc
index 4f377be..9075fa6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -6,12 +6,15 @@
 set nocompatible
 
 " Sets how many lines of history VIM has to remember
-set history=1000
+"set history=1000
 
 " Enable filetype plugins
 filetype plugin on
 filetype indent on
 
+" Enable syntax completion
+set omnifunc=syntaxcomplete#Complete
+
 " automatisches Indenting aktivieren
 set ai
 
@@ -58,6 +61,10 @@ set showcmd
 " How many tenths of a second to blink when matching brackets
 set mat=4
 
+" Setup tab completion
+set wildmode=list:longest,full
+set wildmenu
+
 " Enable syntax highlighting
 syntax enable