From ef434789000d522ecf48b723bf78aadb36e3b283 Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <stefan@imhoff.name>
Date: Wed, 10 Aug 2022 11:03:55 +0200
Subject: [PATCH] chore(nvim): move plugins into after plugin folder

---
 nvim/{lua/kogakure => after/plugin}/alpha.lua |  0
 nvim/after/plugin/autopairs.lua               | 34 ++++++++++++++++++
 .../kogakure => after/plugin}/autotag.lua     |  4 ++-
 .../{lua/kogakure => after/plugin}/blamer.lua |  0
 .../kogakure => after/plugin}/bufferline.lua  |  0
 nvim/{lua/kogakure => after/plugin}/cmp.lua   |  0
 .../kogakure => after/plugin}/colorizer.lua   |  0
 .../kogakure => after/plugin}/comment.lua     |  0
 .../kogakure => after/plugin}/cursorline.lua  |  0
 .../plugin}/export-to-vscode.lua              |  0
 nvim/{lua/kogakure => after/plugin}/fzf.lua   |  0
 .../kogakure => after/plugin}/gitsigns.lua    |  0
 nvim/{lua/kogakure => after/plugin}/goyo.lua  |  0
 .../kogakure => after/plugin}/harpoon.lua     |  0
 .../kogakure => after/plugin}/impatient.lua   |  0
 .../kogakure => after/plugin}/indentline.lua  |  0
 .../kogakure => after/plugin}/lualine.lua     |  0
 .../kogakure => after/plugin}/neoscroll.lua   |  0
 .../kogakure => after/plugin}/nvim-tree.lua   |  0
 .../kogakure => after/plugin}/project.lua     |  0
 .../kogakure => after/plugin}/spectre.lua     |  0
 .../kogakure => after/plugin}/speeddating.lua |  0
 .../kogakure => after/plugin}/telescope.lua   |  0
 .../kogakure => after/plugin}/toggleterm.lua  |  0
 .../kogakure => after/plugin}/treesitter.lua  |  0
 .../plugin}/vim-easymotion.lua                |  0
 .../kogakure => after/plugin}/vim-gh-line.lua |  0
 nvim/{lua/kogakure => after/plugin}/vimux.lua |  0
 .../kogakure => after/plugin}/whichkey.lua    |  0
 nvim/init.lua                                 | 35 ++-----------------
 nvim/lua/kogakure/autopairs.lua               | 34 ------------------
 nvim/lua/kogakure/lsp/handlers.lua            |  2 +-
 32 files changed, 41 insertions(+), 68 deletions(-)
 rename nvim/{lua/kogakure => after/plugin}/alpha.lua (100%)
 create mode 100644 nvim/after/plugin/autopairs.lua
 rename nvim/{lua/kogakure => after/plugin}/autotag.lua (70%)
 rename nvim/{lua/kogakure => after/plugin}/blamer.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/bufferline.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/cmp.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/colorizer.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/comment.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/cursorline.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/export-to-vscode.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/fzf.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/gitsigns.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/goyo.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/harpoon.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/impatient.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/indentline.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/lualine.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/neoscroll.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/nvim-tree.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/project.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/spectre.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/speeddating.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/telescope.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/toggleterm.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/treesitter.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/vim-easymotion.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/vim-gh-line.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/vimux.lua (100%)
 rename nvim/{lua/kogakure => after/plugin}/whichkey.lua (100%)
 delete mode 100644 nvim/lua/kogakure/autopairs.lua

diff --git a/nvim/lua/kogakure/alpha.lua b/nvim/after/plugin/alpha.lua
similarity index 100%
rename from nvim/lua/kogakure/alpha.lua
rename to nvim/after/plugin/alpha.lua
diff --git a/nvim/after/plugin/autopairs.lua b/nvim/after/plugin/autopairs.lua
new file mode 100644
index 0000000..10ed0de
--- /dev/null
+++ b/nvim/after/plugin/autopairs.lua
@@ -0,0 +1,34 @@
+-- nvim-autopairs – https://github.com/windwp/nvim-autopairs
+local status_ok, autopairs = pcall(require, "nvim-autopairs")
+if not status_ok then
+	return
+end
+
+autopairs.setup({
+	check_ts = true,
+	ts_config = {
+		lua = { "string", "source" },
+		javascript = { "string", "template_string" },
+		java = false,
+	},
+	disable_filetype = { "TelescopePrompt", "spectre_panel" },
+	fast_wrap = {
+		map = "<C-l>",
+		chars = { "{", "[", "(", '"', "'" },
+		pattern = string.gsub([[ [%'%"%)%>%]%)%}%,] ]], "%s+", ""),
+		offset = 0, -- Offset from pattern match
+		end_key = "$",
+		keys = "qwertzuiopyxcvbnmasdfghjkl",
+		check_comma = true,
+		highlight = "PmenuSel",
+		highlight_grey = "LineNr",
+	},
+})
+
+local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+local cmp_status_ok, cmp = pcall(require, "cmp")
+if not cmp_status_ok then
+	return
+end
+
+cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
diff --git a/nvim/lua/kogakure/autotag.lua b/nvim/after/plugin/autotag.lua
similarity index 70%
rename from nvim/lua/kogakure/autotag.lua
rename to nvim/after/plugin/autotag.lua
index 802d857..81c972c 100644
--- a/nvim/lua/kogakure/autotag.lua
+++ b/nvim/after/plugin/autotag.lua
@@ -4,4 +4,6 @@ if not status_ok then
 	return
 end
 
-autotag.setup()
+autotag.setup({
+	disable_filetype = { "TelescopePrompt", "vim" },
+})
diff --git a/nvim/lua/kogakure/blamer.lua b/nvim/after/plugin/blamer.lua
similarity index 100%
rename from nvim/lua/kogakure/blamer.lua
rename to nvim/after/plugin/blamer.lua
diff --git a/nvim/lua/kogakure/bufferline.lua b/nvim/after/plugin/bufferline.lua
similarity index 100%
rename from nvim/lua/kogakure/bufferline.lua
rename to nvim/after/plugin/bufferline.lua
diff --git a/nvim/lua/kogakure/cmp.lua b/nvim/after/plugin/cmp.lua
similarity index 100%
rename from nvim/lua/kogakure/cmp.lua
rename to nvim/after/plugin/cmp.lua
diff --git a/nvim/lua/kogakure/colorizer.lua b/nvim/after/plugin/colorizer.lua
similarity index 100%
rename from nvim/lua/kogakure/colorizer.lua
rename to nvim/after/plugin/colorizer.lua
diff --git a/nvim/lua/kogakure/comment.lua b/nvim/after/plugin/comment.lua
similarity index 100%
rename from nvim/lua/kogakure/comment.lua
rename to nvim/after/plugin/comment.lua
diff --git a/nvim/lua/kogakure/cursorline.lua b/nvim/after/plugin/cursorline.lua
similarity index 100%
rename from nvim/lua/kogakure/cursorline.lua
rename to nvim/after/plugin/cursorline.lua
diff --git a/nvim/lua/kogakure/export-to-vscode.lua b/nvim/after/plugin/export-to-vscode.lua
similarity index 100%
rename from nvim/lua/kogakure/export-to-vscode.lua
rename to nvim/after/plugin/export-to-vscode.lua
diff --git a/nvim/lua/kogakure/fzf.lua b/nvim/after/plugin/fzf.lua
similarity index 100%
rename from nvim/lua/kogakure/fzf.lua
rename to nvim/after/plugin/fzf.lua
diff --git a/nvim/lua/kogakure/gitsigns.lua b/nvim/after/plugin/gitsigns.lua
similarity index 100%
rename from nvim/lua/kogakure/gitsigns.lua
rename to nvim/after/plugin/gitsigns.lua
diff --git a/nvim/lua/kogakure/goyo.lua b/nvim/after/plugin/goyo.lua
similarity index 100%
rename from nvim/lua/kogakure/goyo.lua
rename to nvim/after/plugin/goyo.lua
diff --git a/nvim/lua/kogakure/harpoon.lua b/nvim/after/plugin/harpoon.lua
similarity index 100%
rename from nvim/lua/kogakure/harpoon.lua
rename to nvim/after/plugin/harpoon.lua
diff --git a/nvim/lua/kogakure/impatient.lua b/nvim/after/plugin/impatient.lua
similarity index 100%
rename from nvim/lua/kogakure/impatient.lua
rename to nvim/after/plugin/impatient.lua
diff --git a/nvim/lua/kogakure/indentline.lua b/nvim/after/plugin/indentline.lua
similarity index 100%
rename from nvim/lua/kogakure/indentline.lua
rename to nvim/after/plugin/indentline.lua
diff --git a/nvim/lua/kogakure/lualine.lua b/nvim/after/plugin/lualine.lua
similarity index 100%
rename from nvim/lua/kogakure/lualine.lua
rename to nvim/after/plugin/lualine.lua
diff --git a/nvim/lua/kogakure/neoscroll.lua b/nvim/after/plugin/neoscroll.lua
similarity index 100%
rename from nvim/lua/kogakure/neoscroll.lua
rename to nvim/after/plugin/neoscroll.lua
diff --git a/nvim/lua/kogakure/nvim-tree.lua b/nvim/after/plugin/nvim-tree.lua
similarity index 100%
rename from nvim/lua/kogakure/nvim-tree.lua
rename to nvim/after/plugin/nvim-tree.lua
diff --git a/nvim/lua/kogakure/project.lua b/nvim/after/plugin/project.lua
similarity index 100%
rename from nvim/lua/kogakure/project.lua
rename to nvim/after/plugin/project.lua
diff --git a/nvim/lua/kogakure/spectre.lua b/nvim/after/plugin/spectre.lua
similarity index 100%
rename from nvim/lua/kogakure/spectre.lua
rename to nvim/after/plugin/spectre.lua
diff --git a/nvim/lua/kogakure/speeddating.lua b/nvim/after/plugin/speeddating.lua
similarity index 100%
rename from nvim/lua/kogakure/speeddating.lua
rename to nvim/after/plugin/speeddating.lua
diff --git a/nvim/lua/kogakure/telescope.lua b/nvim/after/plugin/telescope.lua
similarity index 100%
rename from nvim/lua/kogakure/telescope.lua
rename to nvim/after/plugin/telescope.lua
diff --git a/nvim/lua/kogakure/toggleterm.lua b/nvim/after/plugin/toggleterm.lua
similarity index 100%
rename from nvim/lua/kogakure/toggleterm.lua
rename to nvim/after/plugin/toggleterm.lua
diff --git a/nvim/lua/kogakure/treesitter.lua b/nvim/after/plugin/treesitter.lua
similarity index 100%
rename from nvim/lua/kogakure/treesitter.lua
rename to nvim/after/plugin/treesitter.lua
diff --git a/nvim/lua/kogakure/vim-easymotion.lua b/nvim/after/plugin/vim-easymotion.lua
similarity index 100%
rename from nvim/lua/kogakure/vim-easymotion.lua
rename to nvim/after/plugin/vim-easymotion.lua
diff --git a/nvim/lua/kogakure/vim-gh-line.lua b/nvim/after/plugin/vim-gh-line.lua
similarity index 100%
rename from nvim/lua/kogakure/vim-gh-line.lua
rename to nvim/after/plugin/vim-gh-line.lua
diff --git a/nvim/lua/kogakure/vimux.lua b/nvim/after/plugin/vimux.lua
similarity index 100%
rename from nvim/lua/kogakure/vimux.lua
rename to nvim/after/plugin/vimux.lua
diff --git a/nvim/lua/kogakure/whichkey.lua b/nvim/after/plugin/whichkey.lua
similarity index 100%
rename from nvim/lua/kogakure/whichkey.lua
rename to nvim/after/plugin/whichkey.lua
diff --git a/nvim/init.lua b/nvim/init.lua
index 8bcf421..2264820 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,39 +1,10 @@
 require("kogakure.options")
 require("kogakure.keymaps")
-require("kogakure.plugins")
-require("kogakure.colorscheme")
-require("kogakure.cmp")
-require("kogakure.lsp")
-require("kogakure.telescope")
-require("kogakure.fzf")
-require("kogakure.treesitter")
-require("kogakure.autopairs")
-require("kogakure.autotag")
-require("kogakure.comment")
-require("kogakure.harpoon")
-require("kogakure.gitsigns")
-require("kogakure.nvim-tree")
-require("kogakure.bufferline")
-require("kogakure.lualine")
-require("kogakure.toggleterm")
-require("kogakure.colorizer")
-require("kogakure.project")
-require("kogakure.impatient")
-require("kogakure.indentline")
-require("kogakure.alpha")
-require("kogakure.whichkey")
-require("kogakure.cursorline")
-require("kogakure.neoscroll")
-require("kogakure.blamer")
-require("kogakure.vim-gh-line")
-require("kogakure.export-to-vscode")
-require("kogakure.spectre")
-require("kogakure.speeddating")
-require("kogakure.goyo")
-require("kogakure.vim-easymotion")
-require("kogakure.vimux")
 require("kogakure.functions")
 require("kogakure.autocommands")
+require("kogakure.colorscheme")
+require("kogakure.plugins")
+require("kogakure.lsp")
 
 require("kogakure/text-objects").basic_text_objects()
 require("kogakure/text-objects").indent_text_objects()
diff --git a/nvim/lua/kogakure/autopairs.lua b/nvim/lua/kogakure/autopairs.lua
deleted file mode 100644
index 5c69a66..0000000
--- a/nvim/lua/kogakure/autopairs.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- nvim-autopairs – https://github.com/windwp/nvim-autopairs
-local status_ok, autopairs = pcall(require, "nvim-autopairs")
-if not status_ok then
-  return
-end
-
-autopairs.setup {
-  check_ts = true,
-  ts_config = {
-    lua = { "string", "source" },
-    javascript = { "string", "template_string" },
-    java = false,
-  },
-  disable_filetype = { "TelescopePrompt", "spectre_panel" },
-  fast_wrap = {
-    map = "<C-l>",
-    chars = { "{", "[", "(", '"', "'" },
-    pattern = string.gsub([[ [%'%"%)%>%]%)%}%,] ]], "%s+", ""),
-    offset = 0, -- Offset from pattern match
-    end_key = "$",
-    keys = "qwertzuiopyxcvbnmasdfghjkl",
-    check_comma = true,
-    highlight = "PmenuSel",
-    highlight_grey = "LineNr",
-  },
-}
-
-local cmp_autopairs = require "nvim-autopairs.completion.cmp"
-local cmp_status_ok, cmp = pcall(require, "cmp")
-if not cmp_status_ok then
-  return
-end
-
-cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done { map_char = { tex = "" } })
diff --git a/nvim/lua/kogakure/lsp/handlers.lua b/nvim/lua/kogakure/lsp/handlers.lua
index 2d5a291..91cc8e5 100644
--- a/nvim/lua/kogakure/lsp/handlers.lua
+++ b/nvim/lua/kogakure/lsp/handlers.lua
@@ -78,10 +78,10 @@ end
 local lsp_formatting = function(bufnr)
 	-- vim.lsp.buf.format({})
 	vim.lsp.buf.formatting_sync({
+		bufnr = bufnr,
 		filter = function(client)
 			return client.name == "null-ls"
 		end,
-		bufnr = bufnr,
 	})
 end