diff --git a/etc/soft/nvim/ftdetect/detect.vim b/etc/soft/nvim/ftdetect/detect.vim
index c2ed197..8d0f657 100644
--- a/etc/soft/nvim/ftdetect/detect.vim
+++ b/etc/soft/nvim/ftdetect/detect.vim
@@ -58,7 +58,8 @@ au BufNewFile,BufRead	*.rename set filetype=rename
 
 au BufNewFile,BufRead	Vagrantfile set filetype=ruby
 
-au BufNewFile,BufRead	*.tf setlocal filetype=terraform
+au BufNewFile,BufRead	*.tf     setlocal filetype=terraform
+au BufNewFile,BufRead	*.tfvars setlocal filetype=terraform
 
 " Открывать справку в вертикальном окне
 au! BufEnter * if &ft ==# 'help' | wincmd L | endif
diff --git a/etc/soft/nvim/syntax/terraform.vim b/etc/soft/nvim/syntax/terraform.vim
index efe31e0..679ff12 100644
--- a/etc/soft/nvim/syntax/terraform.vim
+++ b/etc/soft/nvim/syntax/terraform.vim
@@ -123,4 +123,6 @@ function! TerraformFoldText()
 endfunction
 setlocal foldtext=TerraformFoldText()
 
+setlocal noexpandtab shiftwidth=2 indentexpr=
+
 let b:current_syntax = "terraform"