9 files changed, 248 insertions, 220 deletions

diff --git a/lua/plugins/core/auto-session.lua b/lua/plugins/core/auto-session.lua
index 9bfcac0..aeed968 100644
--- a/lua/plugins/core/auto-session.lua
+++ b/lua/plugins/core/auto-session.lua
@@ -1,6 +1,6 @@
 return {
-	"rmagatti/auto-session",
-	config = function()
-		require("auto-session").setup({ log_level = "info" })
-	end,
+   "rmagatti/auto-session",
+   config = function()
+      require("auto-session").setup({ log_level = "info" })
+   end,
 }
diff --git a/lua/plugins/core/gitsigns.lua b/lua/plugins/core/gitsigns.lua
index e856855..8373701 100644
--- a/lua/plugins/core/gitsigns.lua
+++ b/lua/plugins/core/gitsigns.lua
@@ -1,8 +1,8 @@
 return {
-	"lewis6991/gitsigns.nvim",
-	event = { "BufRead" },
-	config = function()
-		require("gitsigns").setup()
-	end,
-	dependencies = { "nvim-lua/plenary.nvim" },
+   "lewis6991/gitsigns.nvim",
+   event = { "BufRead" },
+   config = function()
+      require("gitsigns").setup()
+   end,
+   dependencies = { "nvim-lua/plenary.nvim" },
 }
diff --git a/lua/plugins/core/luasnip.lua b/lua/plugins/core/luasnip.lua
index 622af58..3761578 100644
--- a/lua/plugins/core/luasnip.lua
+++ b/lua/plugins/core/luasnip.lua
@@ -1,50 +1,52 @@
 return {
-	{
-		"L3MON4D3/LuaSnip",
-		dependencies = { "rafamadriz/friendly-snippets" },
-		build = "make install_jsregexp",
-		config = function()
-			local ls = require("luasnip")
-			local types = require("luasnip.util.types")
+   {
+      "L3MON4D3/LuaSnip",
+      dependencies = { "rafamadriz/friendly-snippets" },
+      build = "make install_jsregexp",
+      config = function()
+         local ls = require("luasnip")
+         local types = require("luasnip.util.types")
 
-			ls.config.set_config({
-				history = true,
-				updateevents = "TextChanged,TextChangedI",
-				enable_autosnippets = true,
-				ext_opts = {
-					[types.choiceNode] = {
-						active = {
-							virt_text = { { "<-", "Error" } },
-						},
-					},
-				},
-			})
+         ls.config.set_config({
+            history = true,
+            updateevents = "TextChanged,TextChangedI",
+            enable_autosnippets = true,
+            ext_opts = {
+               [types.choiceNode] = {
+                  active = {
+                     virt_text = { { "<-", "Error" } },
+                  },
+               },
+            },
+         })
 
-			-- luasnip keymaps are defined as cmp keymaps
+         -- luasnip keymaps are defined as cmp keymaps
 
-			vim.keymap.set(
-				"n",
-				"<leader><leader>s",
-				'<cmd>lua require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })<CR>'
-			)
+         vim.keymap.set(
+            "n",
+            "<leader><leader>s",
+            '<cmd>lua require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })<CR>'
+         )
 
-			require("luasnip.loaders.from_lua").lazy_load({ paths = "~/.config/nvim/lua/snippets" })
-		end,
-	},
+         require("luasnip.loaders.from_lua").lazy_load({
+            paths = "~/.config/nvim/lua/snippets",
+         })
+      end,
+   },
 
-	-- VSCode like (JSON) snippets
-	-- For the full list of supported languages see:
-	-- https://github.com/rafamadriz/friendly-snippets/blob/main/package.json
-	{
-		"rafamadriz/friendly-snippets",
-		opts = { include = {} },
-		config = function(_, opts)
-			if #opts.include == 0 then
-				return
-			end
+   -- VSCode like (JSON) snippets
+   -- For the full list of supported languages see:
+   -- https://github.com/rafamadriz/friendly-snippets/blob/main/package.json
+   {
+      "rafamadriz/friendly-snippets",
+      opts = { include = {} },
+      config = function(_, opts)
+         if #opts.include == 0 then
+            return
+         end
 
-			opts.path = "~/.local/share/nvim/lazy/friendly-snippets"
-			require("luasnip.loaders.from_vscode").lazy_load(opts)
-		end,
-	},
+         opts.path = "~/.local/share/nvim/lazy/friendly-snippets"
+         require("luasnip.loaders.from_vscode").lazy_load(opts)
+      end,
+   },
 }
diff --git a/lua/plugins/core/nvim-tree.lua b/lua/plugins/core/nvim-tree.lua
index 36305d0..08efb3e 100644
--- a/lua/plugins/core/nvim-tree.lua
+++ b/lua/plugins/core/nvim-tree.lua
@@ -1,36 +1,36 @@
 return {
-	{
-		"nvim-tree/nvim-tree.lua",
-		config = function()
-			require("nvim-tree").setup({
-				sync_root_with_cwd = false,
-				update_focused_file = {
-					enable = true,
-					update_root = false,
-				},
-				renderer = {
-					indent_markers = { enable = true },
-					highlight_git = true,
-					highlight_opened_files = "all",
-				},
-			})
-		end,
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-	},
+   {
+      "nvim-tree/nvim-tree.lua",
+      config = function()
+         require("nvim-tree").setup({
+            sync_root_with_cwd = false,
+            update_focused_file = {
+               enable = true,
+               update_root = false,
+            },
+            renderer = {
+               indent_markers = { enable = true },
+               highlight_git = true,
+               highlight_opened_files = "all",
+            },
+         })
+      end,
+      dependencies = { "nvim-tree/nvim-web-devicons" },
+   },
 
-	 -- Add nvim-tree which-key shortcuts
-	{
-		"folke/which-key.nvim",
-		opts = function(_, opts)
-			if type(opts) ~= "table" then
-				opts = {}
-			end
+   -- Add nvim-tree which-key shortcuts
+   {
+      "folke/which-key.nvim",
+      opts = function(_, opts)
+         if type(opts) ~= "table" then
+            opts = {}
+         end
 
-			if type(opts.f) ~= "table" then
-				opts["f"] = {}
-			end
+         if type(opts.f) ~= "table" then
+            opts["f"] = {}
+         end
 
-			opts.f["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" }
-		end,
-	},
+         opts.f["e"] = { "<cmd>NvimTreeToggle<cr>", "Explorer" }
+      end,
+   },
 }
diff --git a/lua/plugins/core/tabline.lua b/lua/plugins/core/tabline.lua
index 0a8305d..280d5a3 100644
--- a/lua/plugins/core/tabline.lua
+++ b/lua/plugins/core/tabline.lua
@@ -1,3 +1,3 @@
 return {
-	"mkitt/tabline.vim",
+   "mkitt/tabline.vim",
 }
diff --git a/lua/plugins/core/telescope.lua b/lua/plugins/core/telescope.lua
index 92d2ef2..1560442 100644
--- a/lua/plugins/core/telescope.lua
+++ b/lua/plugins/core/telescope.lua
@@ -1,34 +1,34 @@
 return {
-	{
-		"nvim-telescope/telescope.nvim",
-		config = function()
-			require("telescope").load_extension("file_browser")
-		end,
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"nvim-telescope/telescope-file-browser.nvim",
-		},
-	},
+   {
+      "nvim-telescope/telescope.nvim",
+      config = function()
+         require("telescope").load_extension("file_browser")
+      end,
+      dependencies = {
+         "nvim-lua/plenary.nvim",
+         "nvim-telescope/telescope-file-browser.nvim",
+      },
+   },
 
-	{
-		"folke/which-key.nvim",
-		opts = function(_, opts)
-			if type(opts) == "table" then
-				opts.b = opts.b or {}
-				opts.f = opts.f or {}
+   {
+      "folke/which-key.nvim",
+      opts = function(_, opts)
+         if type(opts) == "table" then
+            opts.b = opts.b or {}
+            opts.f = opts.f or {}
 
-				opts.b["b"] = { "<cmd>Telescope buffers<cr>", "All" }
-				opts.f["f"] = { "<cmd>Telescope find_files<cr>", "Find" }
-				opts.f["g"] = {
-					function()
-						require("telescope.builtin").live_grep({
-							additional_args = { "--hidden" },
-						})
-					end,
-					"Grep",
-				}
-				opts.f["b"] = { "<cmd>Telescope file_browser<cr>", "Browse" }
-			end
-		end,
-	},
+            opts.b["b"] = { "<cmd>Telescope buffers<cr>", "All" }
+            opts.f["f"] = { "<cmd>Telescope find_files<cr>", "Find" }
+            opts.f["g"] = {
+               function()
+                  require("telescope.builtin").live_grep({
+                     additional_args = { "--hidden" },
+                  })
+               end,
+               "Grep",
+            }
+            opts.f["b"] = { "<cmd>Telescope file_browser<cr>", "Browse" }
+         end
+      end,
+   },
 }
diff --git a/lua/plugins/core/tmux.lua b/lua/plugins/core/tmux.lua
index 0d63aa4..dde127f 100644
--- a/lua/plugins/core/tmux.lua
+++ b/lua/plugins/core/tmux.lua
@@ -1,13 +1,33 @@
 return {
-	"christoomey/vim-tmux-navigator",
-	config = function()
-		local nvim_set_keymap = vim.api.nvim_set_keymap
-		vim.g.tmux_navigator_no_mappings = 1
-		for _, mode in pairs({ "n", "v", "i", "t" }) do
-			nvim_set_keymap(mode, "<C-j>", "<cmd>:TmuxNavigateDown<CR>", { noremap = true })
-			nvim_set_keymap(mode, "<C-k>", "<cmd>:TmuxNavigateUp<CR>", { noremap = true })
-			nvim_set_keymap(mode, "<C-h>", "<cmd>:TmuxNavigateLeft<CR>", { noremap = true })
-			nvim_set_keymap(mode, "<C-l>", "<cmd>:TmuxNavigateRight<CR>", { noremap = true })
-		end
-	end,
+   "christoomey/vim-tmux-navigator",
+   config = function()
+      local nvim_set_keymap = vim.api.nvim_set_keymap
+      vim.g.tmux_navigator_no_mappings = 1
+      for _, mode in pairs({ "n", "v", "i", "t" }) do
+         nvim_set_keymap(
+            mode,
+            "<C-j>",
+            "<cmd>:TmuxNavigateDown<CR>",
+            { noremap = true }
+         )
+         nvim_set_keymap(
+            mode,
+            "<C-k>",
+            "<cmd>:TmuxNavigateUp<CR>",
+            { noremap = true }
+         )
+         nvim_set_keymap(
+            mode,
+            "<C-h>",
+            "<cmd>:TmuxNavigateLeft<CR>",
+            { noremap = true }
+         )
+         nvim_set_keymap(
+            mode,
+            "<C-l>",
+            "<cmd>:TmuxNavigateRight<CR>",
+            { noremap = true }
+         )
+      end
+   end,
 }
diff --git a/lua/plugins/core/treesitter.lua b/lua/plugins/core/treesitter.lua
index 065190f..f7b46b9 100644
--- a/lua/plugins/core/treesitter.lua
+++ b/lua/plugins/core/treesitter.lua
@@ -1,55 +1,55 @@
 ---@param tbl table
 ---@return table
 local tbl_uniq = function(tbl)
-	---@type table<string, boolean>
-	local added = {}
-	local res = {}
-	res = vim.tbl_filter(function(k)
-		if added[k] then
-			return false
-		end
-		added[k] = true
-		return true
-	end, tbl)
+   ---@type table<string, boolean>
+   local added = {}
+   local res = {}
+   res = vim.tbl_filter(function(k)
+      if added[k] then
+         return false
+      end
+      added[k] = true
+      return true
+   end, tbl)
 
-	return res
+   return res
 end
 
 return {
-	{
-		"nvim-treesitter/nvim-treesitter",
-    -- Disable for now, this has been a big source of pain and errors in the
-    -- past
-		enabled = false,
-		build = ":TSUpdate",
-		cmd = { "TSUpdateSync" },
-		event = { "BufReadPost", "BufNewFile" },
-		init = function()
-			vim.o.foldmethod = "expr"
-			vim.o.foldexpr = "nvim_treesitter#foldexpr()"
-		end,
-		opts = {
-			indent = { enable = true },
-			ensure_installed = { "query" },
-			ignore_install = {},
-			highlight = {
-				enable = true,
-				additional_vim_regex_highlighting = false,
-			},
-			query_linter = {
-				enable = true,
-				use_virtual_text = true,
-				lint_events = { "BufWrite", "CursorHold" },
-			},
-		},
-		config = function(_, opts)
-			if type(opts.ensure_installed) == "table" then
-				opts.ensure_installed = tbl_uniq(opts.ensure_installed)
-			end
-			if type(opts.ignore_install) == "table" then
-				opts.ignore_install = tbl_uniq(opts.ignore_install)
-			end
-			require("nvim-treesitter.configs").setup(opts)
-		end,
-	},
+   {
+      "nvim-treesitter/nvim-treesitter",
+      -- Disable for now, this has been a big source of pain and errors in the
+      -- past
+      enabled = false,
+      build = ":TSUpdate",
+      cmd = { "TSUpdateSync" },
+      event = { "BufReadPost", "BufNewFile" },
+      init = function()
+         vim.o.foldmethod = "expr"
+         vim.o.foldexpr = "nvim_treesitter#foldexpr()"
+      end,
+      opts = {
+         indent = { enable = true },
+         ensure_installed = { "query" },
+         ignore_install = {},
+         highlight = {
+            enable = true,
+            additional_vim_regex_highlighting = false,
+         },
+         query_linter = {
+            enable = true,
+            use_virtual_text = true,
+            lint_events = { "BufWrite", "CursorHold" },
+         },
+      },
+      config = function(_, opts)
+         if type(opts.ensure_installed) == "table" then
+            opts.ensure_installed = tbl_uniq(opts.ensure_installed)
+         end
+         if type(opts.ignore_install) == "table" then
+            opts.ignore_install = tbl_uniq(opts.ignore_install)
+         end
+         require("nvim-treesitter.configs").setup(opts)
+      end,
+   },
 }
diff --git a/lua/plugins/core/which-key.lua b/lua/plugins/core/which-key.lua
index 6513714..3c4a95b 100644
--- a/lua/plugins/core/which-key.lua
+++ b/lua/plugins/core/which-key.lua
@@ -1,52 +1,58 @@
 return {
-	"folke/which-key.nvim",
-	event = "VeryLazy",
-	init = function()
-		vim.o.timeout = true
-		vim.o.timeoutlen = 300
-	end,
+   "folke/which-key.nvim",
+   event = "VeryLazy",
+   init = function()
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+   end,
 
-	opts = {
-		f = { name = "File" },
-		t = {
-			name = "Tab",
-			c = { "<cmd>tabnew<cr>", "Create" },
-			["1"] = { "1gt", "1" },
-			["2"] = { "2gt", "2" },
-			["3"] = { "3gt", "3" },
-			["4"] = { "4gt", "4" },
-			["5"] = { "5gt", "5" },
-			["6"] = { "6gt", "6" },
-			["7"] = { "7gt", "7" },
-			["8"] = { "8gt", "8" },
-			["9"] = { "9gt", "9" },
-		},
-		b = {
-			name = "Buffer",
-			n = { "<cmd>BufferNext<cr>", "Next" },
-			p = { "<cmd>BufferPrevious<cr>", "Previous" },
-			c = { "<cmd>BufferClose<cr>", "Close" },
-		},
-		l = {
-			name = "LSP",
-			a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
-			f = {
-				"<cmd>lua vim.lsp.buf.format({ async = false, timeout_ms = 5000 })<cr>",
-				"Format",
-			},
-			d = { "<cmd>lua vim.diagnostic.open_float()<cr>", "Diagnostic" },
-			h = { "<cmd>lua vim.lsp.buf.hover()<cr>", "Help" },
-			g = {
-				name = "Go to",
-				D = { "<cmd>lua vim.lsp.buf.declaration()<cr>", "Go to declaration" },
-				d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to definition" },
-				i = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to implementation" },
-			},
-		},
-	},
+   opts = {
+      f = { name = "File" },
+      t = {
+         name = "Tab",
+         c = { "<cmd>tabnew<cr>", "Create" },
+         ["1"] = { "1gt", "1" },
+         ["2"] = { "2gt", "2" },
+         ["3"] = { "3gt", "3" },
+         ["4"] = { "4gt", "4" },
+         ["5"] = { "5gt", "5" },
+         ["6"] = { "6gt", "6" },
+         ["7"] = { "7gt", "7" },
+         ["8"] = { "8gt", "8" },
+         ["9"] = { "9gt", "9" },
+      },
+      b = {
+         name = "Buffer",
+         n = { "<cmd>BufferNext<cr>", "Next" },
+         p = { "<cmd>BufferPrevious<cr>", "Previous" },
+         c = { "<cmd>BufferClose<cr>", "Close" },
+      },
+      l = {
+         name = "LSP",
+         a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
+         f = {
+            "<cmd>lua vim.lsp.buf.format({ async = false, timeout_ms = 5000 })<cr>",
+            "Format",
+         },
+         d = { "<cmd>lua vim.diagnostic.open_float()<cr>", "Diagnostic" },
+         h = { "<cmd>lua vim.lsp.buf.hover()<cr>", "Help" },
+         g = {
+            name = "Go to",
+            D = {
+               "<cmd>lua vim.lsp.buf.declaration()<cr>",
+               "Go to declaration",
+            },
+            d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Go to definition" },
+            i = {
+               "<cmd>lua vim.lsp.buf.definition()<cr>",
+               "Go to implementation",
+            },
+         },
+      },
+   },
 
-	config = function(_, opts)
-		local wk = require("which-key")
-		wk.register(opts, { prefix = "<leader>" })
-	end,
+   config = function(_, opts)
+      local wk = require("which-key")
+      wk.register(opts, { prefix = "<leader>" })
+   end,
 }