feat(impro) add plugins and configs

10 files changed, 128 insertions, 75 deletions

diff --git a/lazy-lock.json b/lazy-lock.json
index ddee939..39bda82 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,7 +2,7 @@
   "Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" },
   "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
   "SmoothCursor.nvim": { "branch": "main", "commit": "b61173fb107455f18099715b88d86002579f2736" },
-  "catppuccin": { "branch": "main", "commit": "dc216c6241fd8439fe6018cca834200aca1a04ad" },
+  "catppuccin": { "branch": "main", "commit": "73587f9c454da81679202f1668c30fea6cdafd5e" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
   "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" },
@@ -13,10 +13,12 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "color-picker.nvim": { "branch": "master", "commit": "6d49c615cb9ff101fdcf85cd7137439e13bdbddc" },
+  "deadcolumn.nvim": { "branch": "master", "commit": "11d1f325b93957d1a5bc65c4bcb6a25bc911ff2f" },
   "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" },
   "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ca473e28382f1524aa3d2b6f04bcf54f2e6a64cb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f412f51d0eaf0905a2759c8087090071689bb8fb" },
   "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" },
   "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
   "icon-picker.nvim": { "branch": "master", "commit": "66d37ceae84099ca76235de44466829eb37118c2" },
@@ -24,58 +26,57 @@
   "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
   "lsp-inlayhints.nvim": { "branch": "main", "commit": "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c" },
   "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
-  "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
+  "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" },
   "markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "b64fdede85fd5e0b720ce722919e0a9b95ed6547" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "a6c4d7df448a78b0a05fd2065bef11ed52bee51c" },
-  "mason.nvim": { "branch": "main", "commit": "1f8e3a51d6370304ad29ca4f22fcb374018840db" },
-  "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" },
-  "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" },
-  "null-ls.nvim": { "branch": "main", "commit": "0180603b6f3cee40f83c6fc226b9ac5f85e691c4" },
-  "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" },
+  "mason.nvim": { "branch": "main", "commit": "dbf34eecc1f06733a2c518ddd5fe6b1472e7d837" },
+  "neogen": { "branch": "main", "commit": "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901" },
+  "null-ls.nvim": { "branch": "main", "commit": "defa0518762abb32279d601443344fb9773f9330" },
+  "nvim-autopairs": { "branch": "master", "commit": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4" },
   "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "7389e85233e3483b31b6a1c4ba69cda77336b7a8" },
+  "nvim-dap": { "branch": "master", "commit": "1dd02e82c77d558e30ba831db4c2e7ed534e874f" },
   "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" },
-  "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" },
+  "nvim-dap-ui": { "branch": "master", "commit": "56a2df0e96bfa64ebd6967e7cad877a1530633d5" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "9dc45a6eb33871f4c5cb2ba08fa307467657471e" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "e99d1590c7dc4c97b7dbc6a9c7e2dd830e204eea" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0bc0c38e1b11dfb6b5f1794d53869f89ccf9e78f" },
   "nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
   "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" },
-  "nvim-spectre": { "branch": "master", "commit": "8fd64743b6390ab151a607fa91d0d74087a80ba6" },
+  "nvim-spectre": { "branch": "master", "commit": "6e5ce371f93625c7dc43f5e2647d3647f2ea15e2" },
   "nvim-transparent": { "branch": "main", "commit": "2d8d650fc8a3b8da6a01031295547295eb473b7d" },
-  "nvim-treesitter": { "branch": "master", "commit": "981f88a0c206e19e99b9990bf95a107e7bc35f14" },
+  "nvim-treesitter": { "branch": "master", "commit": "0a20d1bb63ff0352b1254cc21ad99f4d04327ea6" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "b216290a2a47c856cf95cdc35e0c8d2c6306d89a" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "de9801d4f448df958d09fec60839e0a39d069610" },
-  "nvim-various-textobjs": { "branch": "main", "commit": "1022e42acc62cfe6ddaf6e320c77bec5d47dc1d2" },
-  "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" },
-  "php-code-actions.nvim": { "branch": "main", "commit": "31831cb7c3227ac00ddc7590b31f11148ff4a81c" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b55fe6175f0001347a433c9df358c8cbf8a4e90f" },
+  "nvim-various-textobjs": { "branch": "main", "commit": "a717bd2c30d352d98e3a2e5aea9f14b570954a70" },
+  "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" },
   "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" },
   "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" },
   "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" },
+  "smart-splits.nvim": { "branch": "master", "commit": "6027452995f56e0f4b126e7b9a38daa5fb2ecb17" },
   "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "920c705f03c139f21c9b38ceff05c7c743de7d7f" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "e0fcb12702ad0d2873544a31730f9aaef04fd032" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
   "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" },
-  "todo-comments.nvim": { "branch": "main", "commit": "0874bda6848ff6f3da3ffdf4bd8297a5c951c5d4" },
+  "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
   "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
   "vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" },
-  "vim-dadbod": { "branch": "master", "commit": "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f" },
+  "vim-dadbod": { "branch": "master", "commit": "3f57c0cd41523423fd781422dfc833820095a3e8" },
   "vim-dadbod-completion": { "branch": "master", "commit": "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1" },
   "vim-dadbod-ui": { "branch": "master", "commit": "986324fa6372170ec47b28a5558ae7f7185e1d71" },
   "vim-dispatch": { "branch": "master", "commit": "6cc2691576f97d43f8751664d1a1a908b99927e5" },
   "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
   "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" },
   "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" },
-  "vim-fugitive": { "branch": "master", "commit": "9acbad1335ee6f30a8497733dcb2373c4550c8a2" },
+  "vim-fugitive": { "branch": "master", "commit": "ef99f1d90cdb33a52931aed5868785b51fb9411d" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "vim-rhubarb": { "branch": "master", "commit": "cad60fe382f3f501bbb28e113dfe8c0de6e77c75" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vim-test": { "branch": "master", "commit": "3995a9419dbea1d93ab916bc8f53ee9f19435223" },
+  "vim-test": { "branch": "master", "commit": "739024ba3264cf153d54ab8da5cdaaa978f7628c" },
   "vimwiki": { "branch": "dev", "commit": "dec6a9ecab3e5ec9ceff28b84cabb5c62d05ee9f" }
 }
\ No newline at end of file
diff --git a/lua/alpha/harpoon.lua b/lua/alpha/harpoon.lua
deleted file mode 100644
index 78e6e9b..0000000
--- a/lua/alpha/harpoon.lua
+++ /dev/null
@@ -1,44 +0,0 @@
-local M = {}
-
--- changing this values will require re-compile packer
-local terms = vim.g.harpoon_terms or 3
-local quick_binds = vim.g.harpoon_quick_binds or 5
-
-M.keymaps = {
-  { "<leader>ss" },
-  { "<leader>sa" },
-}
-
-for i = 1, terms do
-  table.insert(M.keymaps, { string.format("<leader><leader>%s", i) })
-end
-
-for i = 1, quick_binds do
-  table.insert(M.keymaps, { string.format("<leader>%s", i) })
-end
-
-M.setup = function()
-  require("harpoon").setup()
-
-  vim.keymap.set(
-    "n",
-    "<leader>ss",
-    require("harpoon.ui").toggle_quick_menu,
-    { noremap = true, silent = true, expr = false }
-  )
-  vim.keymap.set("n", "<leader>sa", require("harpoon.mark").add_file, { noremap = true, silent = true, expr = false })
-
-  for i = 1, terms do
-    vim.keymap.set("n", string.format("<leader><leader>%s", i), function()
-      require("harpoon.term").gotoTerminal(i)
-    end, { noremap = true, silent = true, expr = false })
-  end
-
-  for i = 1, quick_binds do
-    vim.keymap.set("n", string.format("<leader>%s", i), function()
-      require("harpoon.ui").nav_file(i)
-    end, { noremap = true, silent = true, expr = false })
-  end
-end
-
-return M
diff --git a/lua/alpha/snips/ft/go.lua b/lua/alpha/snips/ft/go.lua
index 58c6bfc..637f57d 100644
--- a/lua/alpha/snips/ft/go.lua
+++ b/lua/alpha/snips/ft/go.lua
@@ -13,7 +13,12 @@ local ts_utils = require "nvim-treesitter.ts_utils"
 
 local get_node_text = vim.treesitter.get_node_text
 
-vim.treesitter.set_query(
+if vim.fn.has "nvim-0.9.0" ~= 1 then
+  vim.treesitter.query.get = vim.treesitter.get_query
+  vim.treesitter.query.set = vim.treesitter.set_query
+end
+
+vim.treesitter.query.set(
   "go",
   "LuaSnip_Result",
   [[
@@ -83,7 +88,7 @@ local function go_result_type(info)
     end
   end
 
-  local query = vim.treesitter.get_query("go", "LuaSnip_Result")
+  local query = vim.treesitter.query.get_query("go", "LuaSnip_Result")
   for _, node in query:iter_captures(function_node, 0) do
     if handlers[node:type()] then
       return handlers[node:type()](node, info)
diff --git a/lua/config/init.lua b/lua/config/init.lua
index 2028a53..008ebf5 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -5,6 +5,7 @@ vim.api.nvim_create_autocmd("User", {
   pattern = "VeryLazy",
   callback = function()
     require "config.autocmds"
+    require "config.usercmds"
     require "config.keymaps"
     require "config.diagnostic"
   end,
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 30a3127..0768bc3 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -37,6 +37,7 @@ opt.cmdheight = 1
 opt.updatetime = 50
 opt.signcolumn = "yes"
 opt.equalalways = false
+opt.colorcolumn = "80,120"
 
 if vim.fn.has "nvim-0.9.0" == 1 then
   opt.splitkeep = "screen"
diff --git a/lua/config/usercmds.lua b/lua/config/usercmds.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lua/config/usercmds.lua
diff --git a/lua/plugins/deadcolumn.lua b/lua/plugins/deadcolumn.lua
new file mode 100644
index 0000000..4aa9d87
--- /dev/null
+++ b/lua/plugins/deadcolumn.lua
@@ -0,0 +1,4 @@
+return {
+  "Bekaboo/deadcolumn.nvim",
+  event = { "VeryLazy" },
+}
diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
index d8a4b70..06ec2aa 100644
--- a/lua/plugins/harpoon.lua
+++ b/lua/plugins/harpoon.lua
@@ -1,11 +1,67 @@
+local keys = {}
+local terms = 3
+local binds = 5
+
+table.insert(keys, {
+  "<leader>ss",
+  function()
+    require("harpoon.ui").toggle_quick_menu()
+  end,
+})
+
+table.insert(keys, {
+  "<leader>sa",
+  function()
+    require("harpoon.mark").add_file()
+  end,
+})
+
+table.insert(keys, {
+  "<leader>st",
+  function ()
+    vim.api.nvim_command([[vsplit]])
+    require("harpoon.term").gotoTerminal(1)
+    vim.api.nvim_command([[startinsert]])
+  end
+})
+
+for i = 1, terms do
+  table.insert(keys, {
+    string.format("<leader><leader>%s", i),
+    function()
+      require("harpoon.term").gotoTerminal(i)
+    end,
+  })
+end
+
+for i = 1, binds do
+  table.insert(keys, {
+    string.format("<leader>%s", i),
+    function()
+      require("harpoon.ui").nav_file(i)
+    end,
+  })
+end
+
 return {
   "ThePrimeagen/harpoon",
   dependencies = {
     "nvim-lua/plenary.nvim",
     "nvim-lua/popup.nvim",
   },
-  keys = require("alpha.harpoon").keymaps,
-  config = function()
-    require("alpha.harpoon").setup()
-  end,
+  keys = keys,
+  opts = {
+    global_settings = {
+      enter_on_sendcmd = true,
+    },
+    projects = {
+      ["$HOME/code/svelte/snippets"] = {
+        term = {
+          cmds = {
+            "npm run dev",
+          },
+        },
+      },
+    },
+  },
 }
diff --git a/lua/plugins/laravel.lua b/lua/plugins/laravel.lua
index 055ef9a..b236e54 100644
--- a/lua/plugins/laravel.lua
+++ b/lua/plugins/laravel.lua
@@ -9,7 +9,6 @@ return {
     { "<leader>la", ":Laravel artisan<cr>" },
     { "<leader>lr", ":Laravel routes<cr>" },
   },
-  event = { "VeryLazy" },
   config = function()
     vim.g.laravel_log_level = "debug"
     require("laravel").setup()
diff --git a/lua/plugins/smart-splits.lua b/lua/plugins/smart-splits.lua
new file mode 100644
index 0000000..49e1df3
--- /dev/null
+++ b/lua/plugins/smart-splits.lua
@@ -0,0 +1,30 @@
+return {
+  "mrjones2014/smart-splits.nvim",
+  config = true,
+  keys = {
+    {
+      "<A-h>",
+      function()
+        require("smart-splits").resize_left()
+      end,
+    },
+    {
+      "<A-j>",
+      function()
+        require("smart-splits").resize_down()
+      end,
+    },
+    {
+      "<A-k>",
+      function()
+        require("smart-splits").resize_up()
+      end,
+    },
+    {
+      "<A-l>",
+      function()
+        require("smart-splits").resize_right()
+      end,
+    },
+  },
+}