From 081c3de2af751db0d0074160456b68d1ffb0a733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?= Date: Sat, 10 Oct 2020 16:07:25 +0300 Subject: Switch to more based indentation method Also cleanup indentation in main configuration file, and consolidate several filetype specific settings in the main config file. --- dotfiles/.local/share/nvim/site/after/ftplugin/c.vim | 3 --- dotfiles/.local/share/nvim/site/after/ftplugin/cpp.vim | 3 --- dotfiles/.local/share/nvim/site/after/ftplugin/go.vim | 1 + dotfiles/.local/share/nvim/site/after/ftplugin/html.vim | 2 -- dotfiles/.local/share/nvim/site/after/ftplugin/javascript.vim | 3 --- dotfiles/.local/share/nvim/site/after/ftplugin/json.vim | 2 -- dotfiles/.local/share/nvim/site/after/ftplugin/python.vim | 2 -- dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim | 7 +++++-- dotfiles/.local/share/nvim/site/after/ftplugin/toml.vim | 3 --- dotfiles/.local/share/nvim/site/after/ftplugin/yaml.vim | 2 -- 10 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/c.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/cpp.vim create mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/go.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/html.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/javascript.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/json.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/python.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/toml.vim delete mode 100644 dotfiles/.local/share/nvim/site/after/ftplugin/yaml.vim (limited to 'dotfiles/.local/share/nvim') diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/c.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/c.vim deleted file mode 100644 index acc39c9..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/c.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal shiftwidth=4 -setlocal tabstop=4 -setlocal foldmethod=syntax diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/cpp.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/cpp.vim deleted file mode 100644 index acc39c9..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/cpp.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal shiftwidth=4 -setlocal tabstop=4 -setlocal foldmethod=syntax diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/go.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/go.vim new file mode 100644 index 0000000..deca82d --- /dev/null +++ b/dotfiles/.local/share/nvim/site/after/ftplugin/go.vim @@ -0,0 +1 @@ +setlocal tw=80 diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/html.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/html.vim deleted file mode 100644 index 289b7cd..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/html.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=4 -setlocal tabstop=4 diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/javascript.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/javascript.vim deleted file mode 100644 index acc39c9..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/javascript.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal shiftwidth=4 -setlocal tabstop=4 -setlocal foldmethod=syntax diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/json.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/json.vim deleted file mode 100644 index 810fd8f..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/json.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=2 -setlocal tabstop=2 diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/python.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/python.vim deleted file mode 100644 index 289b7cd..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/python.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=4 -setlocal tabstop=4 diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim index 01d4271..947bdca 100644 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim +++ b/dotfiles/.local/share/nvim/site/after/ftplugin/rust.vim @@ -1,4 +1,7 @@ -setlocal shiftwidth=4 +setlocal noexpandtab +setlocal copyindent +setlocal preserveindent +setlocal softtabstop=0 setlocal tabstop=4 -setlocal fdm=syntax +setlocal shiftwidth=4 setlocal tw=80 diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/toml.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/toml.vim deleted file mode 100644 index 40a20ba..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/toml.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal shiftwidth=2 -setlocal tabstop=2 - diff --git a/dotfiles/.local/share/nvim/site/after/ftplugin/yaml.vim b/dotfiles/.local/share/nvim/site/after/ftplugin/yaml.vim deleted file mode 100644 index 810fd8f..0000000 --- a/dotfiles/.local/share/nvim/site/after/ftplugin/yaml.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=2 -setlocal tabstop=2 -- cgit v1.2.3