diff --git a/etc/vimrc.local b/etc/vimrc.local
index b52ea82..ccbb68c 100644
--- a/etc/vimrc.local
+++ b/etc/vimrc.local
@@ -1,5 +1,7 @@
 set guifont=Fira\ Code\ 11
 
+set encoding=utf-8
+
 set nocompatible
 colorscheme murphy
 syntax on
@@ -35,6 +37,15 @@ let spell_executable = "ispell"
 let spell_auto_type = ""
 "let spell_auto_type = "tex,mail,text,html,sgml,otl,cvs,none"
 
+" other
+set shiftwidth=2
+set tabstop=8
+set softtabstop=2
+set expandtab
+filetype plugin indent on
+autocmd FileType yaml setl indentkeys-=<:>
+autocmd FileType yaml setlocal ts=8 sts=2 sw=2 expandtab
+
 set modeline
 set modelines=7
 
diff --git a/vimrc b/vimrc
index bc490a9..993f792 100644
--- a/vimrc
+++ b/vimrc
@@ -68,5 +68,8 @@ colorscheme murphy
 
 cmap w!! w !sudo tee % > /dev/null 
 
+set modeline
+set modelines=7
+
 
 " vim: ts=8 sw=2 si