diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
new file mode 100644
index 0000000000000000000000000000000000000000..a8eead3c73d55e64adebf8183ff51160fccb33a3
--- /dev/null
+++ b/.vim/after/ftplugin/python.vim
@@ -0,0 +1,3 @@
+setlocal smartindent
+setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class
+setlocal nocindent
diff --git a/.vim/after/ftplugin/tf.vim b/.vim/after/ftplugin/tf.vim
new file mode 100644
index 0000000000000000000000000000000000000000..b892e77f711a0e154dcc389bbb7d801bc96c29aa
--- /dev/null
+++ b/.vim/after/ftplugin/tf.vim
@@ -0,0 +1,3 @@
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
diff --git a/.vim/after/ftplugin/yaml.vim b/.vim/after/ftplugin/yaml.vim
new file mode 100644
index 0000000000000000000000000000000000000000..b892e77f711a0e154dcc389bbb7d801bc96c29aa
--- /dev/null
+++ b/.vim/after/ftplugin/yaml.vim
@@ -0,0 +1,3 @@
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
diff --git a/.vimrc b/.vimrc
index e867ed2d9b9e81a3ad4d0410065d946910dc94c6..d8436c25d993c2a36a89315ac20364bd4714829b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,3 @@
-"autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
-"autocmd BufRead *.py set nocindent
-"autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``
 filetype plugin indent on
 setlocal tabstop=4
 setlocal softtabstop=4
@@ -12,3 +9,4 @@ setlocal incsearch
 syntax on
 setlocal modeline
 set viminfo='20,<9999,s1024,h
+setlocal fileformat=unix