neovim: refactor after/ftplugin/*

21 files changed, 51 insertions, 67 deletions

diff --git a/.config/nvim/after/ftplugin/c.lua b/.config/nvim/after/ftplugin/c.lua
deleted file mode 100644
index 93b7eec..0000000
--- a/.config/nvim/after/ftplugin/c.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('c', function(conf)
-   conf.indent(conf.SPACE, 4)
-end)
diff --git a/.config/nvim/after/ftplugin/cmake.lua b/.config/nvim/after/ftplugin/cmake.lua
deleted file mode 100644
index ee231d9..0000000
--- a/.config/nvim/after/ftplugin/cmake.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('cmake', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
\ No newline at end of file
diff --git a/.config/nvim/after/ftplugin/cpp.lua b/.config/nvim/after/ftplugin/cpp.lua
deleted file mode 100644
index ddea36e..0000000
--- a/.config/nvim/after/ftplugin/cpp.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('cpp', function(conf)
-   conf.indent(conf.SPACE, 4)
-end)
\ No newline at end of file
diff --git a/.config/nvim/after/ftplugin/css.lua b/.config/nvim/after/ftplugin/css.lua
deleted file mode 100644
index 9fad7cb..0000000
--- a/.config/nvim/after/ftplugin/css.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('css', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/go.lua b/.config/nvim/after/ftplugin/go.lua
deleted file mode 100644
index 30139b1..0000000
--- a/.config/nvim/after/ftplugin/go.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('go', function(conf)
-   conf.indent(conf.TAB, 4)
-end)
\ No newline at end of file
diff --git a/.config/nvim/after/ftplugin/haskell.lua b/.config/nvim/after/ftplugin/haskell.lua
deleted file mode 100644
index 2c507ff..0000000
--- a/.config/nvim/after/ftplugin/haskell.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('haskell', function(conf)
-   conf.indent(conf.SPACE, 4)
-end)
diff --git a/.config/nvim/after/ftplugin/html.lua b/.config/nvim/after/ftplugin/html.lua
deleted file mode 100644
index 8ddc31f..0000000
--- a/.config/nvim/after/ftplugin/html.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('html', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
\ No newline at end of file
diff --git a/.config/nvim/after/ftplugin/javascript.lua b/.config/nvim/after/ftplugin/javascript.lua
deleted file mode 100644
index 49566fc..0000000
--- a/.config/nvim/after/ftplugin/javascript.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('javascript', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/json.lua b/.config/nvim/after/ftplugin/json.lua
deleted file mode 100644
index 6fcd38b..0000000
--- a/.config/nvim/after/ftplugin/json.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('json', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/lisp.lua b/.config/nvim/after/ftplugin/lisp.lua
deleted file mode 100644
index df60187..0000000
--- a/.config/nvim/after/ftplugin/lisp.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('lisp', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/lua.lua b/.config/nvim/after/ftplugin/lua.lua
deleted file mode 100644
index 9e0e5e6..0000000
--- a/.config/nvim/after/ftplugin/lua.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('lua', function(conf)
-   conf.indent(conf.SPACE, 3)
-end)
diff --git a/.config/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua
deleted file mode 100644
index 1ea86d5..0000000
--- a/.config/nvim/after/ftplugin/markdown.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('markdown', function(conf)
-   conf.indent(conf.SPACE, 4)
-end)
diff --git a/.config/nvim/after/ftplugin/php.lua b/.config/nvim/after/ftplugin/php.lua
index 8c03f57..9e4b15b 100644
--- a/.config/nvim/after/ftplugin/php.lua
+++ b/.config/nvim/after/ftplugin/php.lua
@@ -1,6 +1,4 @@
 vimrc.after_ftplugin('php', function(conf)
-   conf.indent(conf.SPACE, 2)
-
    -- If a buffer is empty, insert `<?php` tag and 2 blank lines, and position the
    -- cursor at the end of the buffer (line 3, column 0).
    --
diff --git a/.config/nvim/after/ftplugin/python.lua b/.config/nvim/after/ftplugin/python.lua
deleted file mode 100644
index 428c044..0000000
--- a/.config/nvim/after/ftplugin/python.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('python', function(conf)
-   conf.indent(conf.SPACE, 4)
-end)
\ No newline at end of file
diff --git a/.config/nvim/after/ftplugin/ruby.lua b/.config/nvim/after/ftplugin/ruby.lua
deleted file mode 100644
index 40b8319..0000000
--- a/.config/nvim/after/ftplugin/ruby.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('ruby', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/toml.lua b/.config/nvim/after/ftplugin/toml.lua
deleted file mode 100644
index cc0a03f..0000000
--- a/.config/nvim/after/ftplugin/toml.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('toml', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/typescript.lua b/.config/nvim/after/ftplugin/typescript.lua
deleted file mode 100644
index f16d282..0000000
--- a/.config/nvim/after/ftplugin/typescript.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('typescript', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/after/ftplugin/vim.lua b/.config/nvim/after/ftplugin/vim.lua
index 6f1a84e..bb053d4 100644
--- a/.config/nvim/after/ftplugin/vim.lua
+++ b/.config/nvim/after/ftplugin/vim.lua
@@ -1,5 +1,4 @@
 vimrc.after_ftplugin('vim', function(conf)
-   conf.indent(conf.SPACE, 4)
    vim.wo.colorcolumn = '+1'
    vim.bo.keywordprg = ':help'
    vim.bo.textwidth = 78
diff --git a/.config/nvim/after/ftplugin/yaml.lua b/.config/nvim/after/ftplugin/yaml.lua
deleted file mode 100644
index f810b54..0000000
--- a/.config/nvim/after/ftplugin/yaml.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vimrc.after_ftplugin('yaml', function(conf)
-   conf.indent(conf.SPACE, 2)
-end)
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4396a7c..8559c5f 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -565,6 +565,9 @@ vimrc.autocmd('BufRead', '*', function()
 end)
 
 
+vimrc.register_filetype_autocmds_for_indentation()
+
+
 
 -- Mappings {{{1
 
diff --git a/.config/nvim/lua/vimrc.lua b/.config/nvim/lua/vimrc.lua
index 80a02bc..0a2b9d9 100644
--- a/.config/nvim/lua/vimrc.lua
+++ b/.config/nvim/lua/vimrc.lua
@@ -15,19 +15,6 @@ function vimrc.autocmd(event, filter, callback)
 end
 
 
-local conf = {}
-conf.SPACE = true
-conf.TAB = false
-function conf.indent(style, width)
-   vim.bo.expandtab = style
-   vim.bo.tabstop = width
-   vim.bo.shiftwidth = width
-   vim.bo.softtabstop = width
-
-   if vim.fn.exists(':IndentLinesReset') == 2 then
-      vim.cmd('IndentLinesReset')
-   end
-end
 
 function vimrc.after_ftplugin(ft, callback)
    local var_name = 'did_ftplugin_' .. ft .. '_after'
@@ -42,4 +29,52 @@ end
 
 
 
+local SPACE = true
+local TAB = false
+
+local indentation_settings = {
+   c          = { style = SPACE, width = 4 },
+   cmake      = { style = SPACE, width = 2 },
+   cpp        = { style = SPACE, width = 4 },
+   css        = { style = SPACE, width = 2 },
+   go         = { style = TAB,   width = 4 },
+   haskell    = { style = SPACE, width = 4 },
+   html       = { style = SPACE, width = 2 },
+   javascript = { style = SPACE, width = 2 },
+   json       = { style = SPACE, width = 2 },
+   lisp       = { style = SPACE, width = 2 },
+   lua        = { style = SPACE, width = 3 },
+   markdown   = { style = SPACE, width = 4 },
+   php        = { style = SPACE, width = 2 },
+   python     = { style = SPACE, width = 4 },
+   ruby       = { style = SPACE, width = 2 },
+   toml       = { style = SPACE, width = 2 },
+   typescript = { style = SPACE, width = 2 },
+   vim        = { style = SPACE, width = 4 },
+   yaml       = { style = SPACE, width = 2 },
+}
+
+function vimrc.register_filetype_autocmds_for_indentation()
+   for ft, setting in pairs(indentation_settings) do
+      vim.cmd(([[autocmd Vimrc FileType %s call v:lua.vimrc._set_indentation(%s, %d)]]):format(
+         ft,
+         setting.style and 'v:true' or 'v:false',
+         setting.width
+      ))
+   end
+end
+
+function vimrc._set_indentation(style, width)
+   vim.bo.expandtab = style
+   vim.bo.tabstop = width
+   vim.bo.shiftwidth = width
+   vim.bo.softtabstop = width
+
+   if vim.fn.exists(':IndentLinesReset') == 2 then
+      vim.cmd('IndentLinesReset')
+   end
+end
+
+
+
 return vimrc