summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Ilvokhin <d@ilvokhin.com>2024-03-08 21:53:55 +0000
committerDmitry Ilvokhin <d@ilvokhin.com>2024-03-08 21:53:55 +0000
commita4bdc09d5e6ff3643aef9daff94931def6942fae (patch)
tree8e4ec5e57cf025bccc6de00a90d0ec7eafd94f94
parentb8d90587492becebbc8828a79deee1edb0792083 (diff)
downloadinfra-a4bdc09d5e6ff3643aef9daff94931def6942fae.tar.gz
infra-a4bdc09d5e6ff3643aef9daff94931def6942fae.tar.bz2
infra-a4bdc09d5e6ff3643aef9daff94931def6942fae.zip
Add proper indent settings for yaml and makefiles
-rw-r--r--misc/dotfiles/vimrc10
1 files changed, 9 insertions, 1 deletions
diff --git a/misc/dotfiles/vimrc b/misc/dotfiles/vimrc
index 9e3afc2..ac02df6 100644
--- a/misc/dotfiles/vimrc
+++ b/misc/dotfiles/vimrc
@@ -7,11 +7,19 @@ syntax on
" Expand tabs to spaces.
set expandtab
-" Use four-space indentation.
+" Use four-space indentation by default.
set tabstop=4
set softtabstop=4
set shiftwidth=4
+" In Makefiles, don't expand tabs to spaces, since we need the actual tabs.
+autocmd FileType make setlocal noexpandtab
+
+" Use two-space indentation for yaml files.
+autocmd FileType yaml setlocal tabstop=2
+autocmd FileType yaml setlocal softtabstop=2
+autocmd FileType yaml setlocal shiftwidth=2
+
" Limit text width.
set textwidth=79