diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..f7c3d18
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,53 @@
+" => General
+set history=500
+set number
+" Enable filetype plugins
+filetype plugin on
+filetype indent on
+" :W sudo saves the file 
+" (useful for handling the permission-denied error)
+command W w !sudo tee % > /dev/null
+" With a map leader it's possible to do extra key combinations
+" like <leader>w saves the current file
+let mapleader = ","
+let g:mapleader = ","
+" => VIM user interface
+" Turn on the WiLd menu
+set wildmenu
+"Always show current position
+set ruler
+
+" Height of the command bar
+set cmdheight=2
+" Highlight search results
+set hlsearch
+" Don't redraw while executing macros (good performance config)
+set lazyredraw 
+" Show matching brackets when text indicator is over them
+set showmatch 
+" How many tenths of a second to blink when matching brackets
+set mat=2
+" => Colors and Fonts
+" Enable syntax highlighting
+syntax enable 
+
+" Enable 256 colors palette in Gnome Terminal
+if $COLORTERM == 'gnome-terminal'
+    set t_Co=256
+endif
+
+try
+    colorscheme desert
+catch
+endtry
+
+set background=dark
+
+" => Visual mode related
+""""""""""""""""""""""""""""""
+" Visual mode pressing * or # searches for the current selection
+" Super useful! From an idea by Michael Naumann
+vnoremap <silent> * :<C-u>call VisualSelection('', '')<CR>/<C-R>=@/<CR><CR>
+vnoremap <silent> # :<C-u>call VisualSelection('', '')<CR>?<C-R>=@/<CR><CR>
+
+
diff --git a/make_links.sh b/make_links.sh
new file mode 100644
index 0000000..5627cde
--- /dev/null
+++ b/make_links.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+#check we are in the correct folder, else exit
+ln -s .bash_aliases ~/.bash_aliases
+ln -s .bashrc ~/.bashrc
+ln -s .tmux.conf ~/.tmux.conf
+