From daf9816886112d9667fc0bc3696387e4eede5315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?=
 <yps@yaroslavps.com>
Date: Tue, 3 Nov 2020 01:54:05 +0300
Subject: Move filetype-specific preferences to main config

---
 dotfiles/.config/nvim/init.vim                              | 12 ++++++++++++
 dotfiles/.local/share/nvim/site/after/ftplugin/go.vim       |  1 -
 dotfiles/.local/share/nvim/site/after/ftplugin/mail.vim     |  3 ---
 dotfiles/.local/share/nvim/site/after/ftplugin/markdown.vim |  3 ---
 dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim     |  7 -------
 dotfiles/.local/share/nvim/site/after/ftplugin/tex.vim      |  3 ---
 dotfiles/.local/share/nvim/site/after/ftplugin/text.vim     |  3 ---
 7 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/go.vim
 delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/mail.vim
 delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/markdown.vim
 delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim
 delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/tex.vim
 delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/text.vim

(limited to 'dotfiles')

diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim
index 08b01a4..b652ce3 100644
--- a/dotfiles/.config/nvim/init.vim
+++ b/dotfiles/.config/nvim/init.vim
@@ -222,3 +222,15 @@ call plug#end()
 " Goyo
 	let g:goyo_width = 100
 	map <leader>g :Goyo<CR>
+
+" File format preferences
+	autocmd FileType rust setlocal noet ci pi sts=0 ts=4 sw=4 tw=80
+	autocmd FileType meson setlocal noet ci pi sts=0 ts=4 sw=4 tw=80
+	autocmd FileType tex setlocal spell spelllang=en_us,es,ru tw=80 |
+				\ let b:SuperTabContextDefaultCompletionType = "<c-p>"
+	autocmd FileType text setlocal spell spelllang=en_us,es,ru tw=80 |
+				\ let b:SuperTabContextDefaultCompletionType = "<c-p>"
+	autocmd FileType mail setlocal spell spelllang=en_us,es,ru tw=72 |
+				\ let b:SuperTabContextDefaultCompletionType = "<c-p>"
+	autocmd FileType markdown setlocal spell spelllang=en_us,es,ru tw=80 |
+				\ let b:SuperTabContextDefaultCompletionType = "<c-p>"
diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/go.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/go.vim
deleted file mode 100644
index deca82d..0000000
--- a/dotfiles/.local/share/nvim/site/after/ftplugin/go.vim
+++ /dev/null
@@ -1 +0,0 @@
-setlocal tw=80
diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/mail.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/mail.vim
deleted file mode 100644
index 2bc09e9..0000000
--- a/dotfiles/.local/share/nvim/site/after/ftplugin/mail.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal tw=72
-setlocal spell spelllang=en_us,es,ru
-let b:SuperTabContextDefaultCompletionType = "<c-p>"
diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/markdown.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/markdown.vim
deleted file mode 100644
index d248326..0000000
--- a/dotfiles/.local/share/nvim/site/after/ftplugin/markdown.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal tw=80
-setlocal spell spelllang=en_us,es,ru
-let b:SuperTabContextDefaultCompletionType = "<c-p>"
diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim
deleted file mode 100644
index 947bdca..0000000
--- a/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-setlocal noexpandtab
-setlocal copyindent
-setlocal preserveindent
-setlocal softtabstop=0
-setlocal tabstop=4
-setlocal shiftwidth=4
-setlocal tw=80
diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/tex.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/tex.vim
deleted file mode 100644
index d248326..0000000
--- a/dotfiles/.local/share/nvim/site/after/ftplugin/tex.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal tw=80
-setlocal spell spelllang=en_us,es,ru
-let b:SuperTabContextDefaultCompletionType = "<c-p>"
diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/text.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/text.vim
deleted file mode 100644
index d248326..0000000
--- a/dotfiles/.local/share/nvim/site/after/ftplugin/text.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal tw=80
-setlocal spell spelllang=en_us,es,ru
-let b:SuperTabContextDefaultCompletionType = "<c-p>"
-- 
cgit v1.2.3