diff --git a/vim/vimrc b/vim/vimrc
index 6ac57cf..8f65537 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,21 +1,15 @@
 syntax on
 
-set number
-set relativenumber
-
-set autoindent
-set expandtab
-set smartindent
-set shiftwidth=2
-set softtabstop=2
-set tabstop=2
+set ai et si sts=2 sw=2 ts=2
+set hls ic is
+set nu rnu
 
 set directory=~/.local/share/vim/swap,/tmp
 set undodir=~/.local/share/vim/undo,/tmp
 set undofile
 
-autocmd BufNewFile,BufRead *.es6 set ft=javascript
-autocmd FileType php setlocal sw=4 sts=4 ts=4
-autocmd FileType gitcommit,markdown,text setlocal nosi spell tw=80 wm=2
+autocmd BufNewFile,BufRead *.es6 setl ft=javascript
+autocmd FileType php setl sts=4 sw=4 ts=4
+autocmd FileType gitcommit,markdown,text setl nosi spell tw=80 wm=2
 
 autocmd BufWritePre * :%s/\s\+$//e