Merge branch 'editorconfig' into 'master'

Use EditorConfig instead of vim configuration See merge request fablab/labsync!60
2020-08-13 16:04:41 +00:00 · 2020-08-13 16:04:41 +00:00 · 112a2a4d94
commit 112a2a4d94
parent dc5259c469 6211d3f7f5
3 changed files with 9 additions and 3 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,9 @@
+root = true
+
+[packer/initramfs/labsync*]
+indent_style = tab
+indent_size = 4
+
+[Dockerfile]
+indent_style = tab
+indent_size = 4
--- a/.vimrc
+++ b/.vimrc
@ -1 +0,0 @@
-autocmd Filetype sh setlocal ts=4 sw=4 sts=4 noexpandtab
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@ -49,5 +49,3 @@ RUN gpg --import /usr/local/share/hashicorp.asc \
 	&& mkdir /workdir

 WORKDIR /workdir
-
-# vim: ts=4 sw=4 sts=4 noet:
				`@ -1 +0,0 @@`
				`autocmd Filetype sh setlocal ts=4 sw=4 sts=4 noexpandtab`