2 files changed, 12 insertions, 8 deletions
diff --git a/.config/nvim/lua/vimrc/init.lua b/.config/nvim/lua/vimrc/init.lua
index 562abd8..3148d02 100644
--- a/.config/nvim/lua/vimrc/init.lua
+++ b/.config/nvim/lua/vimrc/init.lua
@@ -31,10 +31,18 @@ end
 
 
 local function set_indentation(style, width)
-   vim.bo.expandtab = style
-   vim.bo.tabstop = width
-   vim.bo.shiftwidth = width
-   vim.bo.softtabstop = width
+   local editorconfig = vim.b.editorconfig or {}
+
+   if not editorconfig.indent_style then
+      vim.bo.expandtab = style
+   end
+   if not editorconfig.tab_width then
+      vim.bo.tabstop = width
+   end
+   if not editorconfig.indent_size then
+      vim.bo.shiftwidth = width
+      vim.bo.softtabstop = width
+   end
 end
 
 
diff --git a/.config/nvim/lua/vimrc/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua
index 61c62f2..b5f786e 100644
--- a/.config/nvim/lua/vimrc/plugins.lua
+++ b/.config/nvim/lua/vimrc/plugins.lua
@@ -532,10 +532,6 @@ return {
          vim.keymap.set('', '<Plug>(hop-k)',  function() hop_jk({ direction = BEFORE_CURSOR }) end, { silent = true })
       end,
    },
-   -- Integration with EditorConfig (https://editorconfig.org)
-   {
-      'editorconfig/editorconfig-vim',
-   },
    -- Extend J.
    {
       'osyo-manga/vim-jplus',