feat: improve lazy configuration on how loading plugins

29 files changed, 175 insertions, 136 deletions

diff --git a/lazy-lock.json b/lazy-lock.json
index f0eb44a..e1e231c 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,6 +1,5 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e89df176e8b38e931b7e71a470f923a317976d86" },
-  "FixCursorHold.nvim": { "branch": "master", "commit": "70a9516a64668cbfe59f31b66d0a21678c5e9b12" },
   "LuaSnip": { "branch": "master", "commit": "563827f00bb4fe43269e3be653deabc0005f1302" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
@@ -23,31 +22,26 @@
   "hydra.nvim": { "branch": "master", "commit": "d00274f05363c13f29ed1fa571026a066a634cce" },
   "indent-blankline.nvim": { "branch": "master", "commit": "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7" },
   "laravel.nvim": { "branch": "main", "commit": "d87c06ecdafc9e1c2b13938f8485b3915fe89d36" },
-  "lazy.nvim": { "branch": "main", "commit": "27ca918bc3d02ea20b3fd901c8919e9925555444" },
+  "lazy.nvim": { "branch": "main", "commit": "c389ad552bd5c2050783ac6cd6e54f5fbba3c7bc" },
   "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
   "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "610f5919fe633ac872239a0ab786572059f0d91d" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "27f61f75a71bb3c2504a17e02b571f79cae43676" },
   "mason.nvim": { "branch": "main", "commit": "5e78970539d937b7aef7a4e10b219d60da0b1425" },
   "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" },
-  "neotest": { "branch": "master", "commit": "fee5ce9bdc3dff4706a29b012e75025ab376becb" },
-  "neotest-go": { "branch": "main", "commit": "981406c12bd3c77eb434211a1b85b964ab5bbdd5" },
-  "neotest-plenary": { "branch": "master", "commit": "d49bfd9470f791e7c29149e75d56b6f925bb391b" },
-  "neotest-rust": { "branch": "main", "commit": "53db2f682e337c2188d81e8ecdf779bff869fb74" },
-  "neotest-vim-test": { "branch": "master", "commit": "07f25ab7ba4e7646b38c84e10002b195a53b0096" },
   "null-ls.nvim": { "branch": "main", "commit": "7bd74a821d991057ca1c0ca569d8252c4f89f860" },
   "nvim-autopairs": { "branch": "master", "commit": "f00eb3b766c370cb34fdabc29c760338ba9e4c6c" },
   "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },
-  "nvim-dap": { "branch": "master", "commit": "5a1479c5d633daa0db06988ed44663f07f10f5dd" },
+  "nvim-dap": { "branch": "master", "commit": "c64a6627bb01eb151da96b28091797beaac09536" },
   "nvim-dap-go": { "branch": "main", "commit": "6f045a72a05a78e4071dd0880f08214a2bb1461b" },
   "nvim-dap-ui": { "branch": "master", "commit": "b80227ea56a48177786904f6322abc8b2dc0bc36" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "191345947a92a5188d791e9786a5b4f205dcaca3" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "e7c05495934a658c8aa10afd995dacd796f76091" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8ebe6894dddaeb1459e1397c865f54fa5ecaac80" },
-  "nvim-notify": { "branch": "master", "commit": "72e77098a145d7b805353a0d94a367739f81214f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a59ba78f164f586d47a2f315dc3d021a630768d0" },
+  "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" },
   "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" },
   "nvim-transparent": { "branch": "main", "commit": "6816751e3d595b3209aa475a83b6fbaa3a5ccc98" },
-  "nvim-treesitter": { "branch": "master", "commit": "fb11ba487caa012b83957e8dd2f8ba45e40da8fd" },
+  "nvim-treesitter": { "branch": "master", "commit": "4583690137cb0b08e0e1f3a56f40152e17a918c9" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "2fb97bd6c53d78517d2022a0b84422c18ce5686e" },
   "nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
@@ -61,8 +55,10 @@
   "telescope-file-browser.nvim": { "branch": "master", "commit": "304508fb7bea78e3c0eeddd88c4837501e403ae8" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
+  "telescope-makefile": { "branch": "master", "commit": "23239f86ed0b443272c03848d23059f9cbe29197" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
   "telescope.nvim": { "branch": "master", "commit": "2f32775405f6706348b71d0bb8a15a22852a61e4" },
+  "toggleterm.nvim": { "branch": "main", "commit": "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" },
   "tokyonight.nvim": { "branch": "main", "commit": "73671f5dd48a577e753def35b410ef1157d6560b" },
   "trouble.nvim": { "branch": "main", "commit": "83ec606e7065adf134d17f4af6bae510e3c491c1" },
   "vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" },
diff --git a/lua/alpha/completition/init.lua b/lua/alpha/completition/init.lua
index 6ac3333..dc3d73b 100644
--- a/lua/alpha/completition/init.lua
+++ b/lua/alpha/completition/init.lua
@@ -128,11 +128,3 @@ cmp.setup.filetype({ "sql", "mysql", "plsql" }, {
 		{ name = "buffer" },
 	}),
 })
-
-cmp.setup.filetype({ "dap-repl", "dapui_watches" }, {
-	sources = cmp.config.sources({
-		{ name = "dap" },
-	}, {
-		{ name = "buffer" },
-	}),
-})
diff --git a/lua/alpha/database.lua b/lua/alpha/database.lua
index 7715875..32121eb 100644
--- a/lua/alpha/database.lua
+++ b/lua/alpha/database.lua
@@ -41,9 +41,3 @@ vim.g.db_ui_icons = {
     connection_ok = '✓',
     connection_error = '✕',
 }
-
--- opening it in a new tab
-vim.keymap.set('n', '<leader><leader>db', ':tab DBUI<cr>', {})
-
--- just close the tab, but context related of the keybinding
-vim.keymap.set('n', '<leader><leader>tq', ':tabclose<cr>')
diff --git a/lua/alpha/harpoon.lua b/lua/alpha/harpoon.lua
index 677a527..108737e 100644
--- a/lua/alpha/harpoon.lua
+++ b/lua/alpha/harpoon.lua
@@ -5,16 +5,16 @@ local terms = vim.g.harpoon_terms or 3
 local quick_binds = vim.g.harpoon_quick_binds or 5
 
 M.keymaps = {
-	"<leader>ss",
-	"<leader>sa",
+    {"<leader>ss"},
+	{"<leader>sa"},
 }
 
 for i = 1, terms do
-	table.insert(M.keymaps, string.format("<leader><leader>%s", i))
+	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))
+	table.insert(M.keymaps, {string.format("<leader>%s", i)})
 end
 
 M.setup = function()
diff --git a/lua/alpha/laravel.lua b/lua/alpha/laravel.lua
deleted file mode 100644
index 99ba41c..0000000
--- a/lua/alpha/laravel.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local laravel = require("laravel")
-local artisan = require("laravel.artisan")
-local notify = require("notify")
-
-laravel.setup()
-
-vim.keymap.set("n", "<leader>ac", function()
-	artisan.clean_cmd_list_cache()
-	notify.notify("Artisan cmd list cache clean", "info", { title = "Laravel.nvim" })
-end, { noremap = true })
diff --git a/lua/alpha/lsp/null-ls.lua b/lua/alpha/lsp/null-ls.lua
index f7f925c..5700fcf 100644
--- a/lua/alpha/lsp/null-ls.lua
+++ b/lua/alpha/lsp/null-ls.lua
@@ -1,7 +1,7 @@
 local null_ls = require("null-ls")
 local composer = require("composer")
 local php_actions = require("php-code-actions")
-local laravel_actions = require("laravel.code-actions")
+-- local laravel_actions = require("laravel.code-actions")
 
 local sources = {
 	null_ls.builtins.code_actions.gitsigns,
@@ -23,7 +23,7 @@ if composer.query({ "require", "symfony/framework-bundle" }) ~= nil then
 	}))
 elseif composer.query({ "require", "laravel/framework" }) ~= nil then
 	table.insert(sources, null_ls.builtins.formatting.pint)
-	table.insert(sources, laravel_actions.relationships)
+	-- table.insert(sources, laravel_actions.relationships)
 end
 
 null_ls.setup({
diff --git a/lua/alpha/lsp/setups.lua b/lua/alpha/lsp/setups.lua
index 646eec1..8744e67 100644
--- a/lua/alpha/lsp/setups.lua
+++ b/lua/alpha/lsp/setups.lua
@@ -45,6 +45,7 @@ return setmetatable({
 					},
 					workspace = {
 						library = vim.api.nvim_get_runtime_file("", true),
+                        checkThirdParty = false,
 					},
 					telemetry = {
 						enable = false,
diff --git a/lua/alpha/plugins/comment.lua b/lua/alpha/plugins/comment.lua
new file mode 100644
index 0000000..5d1831f
--- /dev/null
+++ b/lua/alpha/plugins/comment.lua
@@ -0,0 +1,7 @@
+return {
+    "numToStr/Comment.nvim",
+    keys = { { "gcc" }, { "gbc" }, { "gc", mode = "v" }, { "gb", mode = "v" } },
+    config = function()
+        require("Comment").setup()
+    end,
+}
diff --git a/lua/alpha/plugins/completition.lua b/lua/alpha/plugins/completition.lua
index 0ab9b89..cf1a37d 100644
--- a/lua/alpha/plugins/completition.lua
+++ b/lua/alpha/plugins/completition.lua
@@ -7,7 +7,6 @@ return {
         "hrsh7th/cmp-nvim-lsp",
         "hrsh7th/cmp-cmdline",
         "hrsh7th/cmp-git",
-        "rcarriga/cmp-dap",
         "saadparwaiz1/cmp_luasnip",
         "onsails/lspkind-nvim",
         { "L3MON4D3/LuaSnip", version = "v1.*" },
diff --git a/lua/alpha/plugins/dap.lua b/lua/alpha/plugins/dap.lua
index 6f33484..f8a7b17 100644
--- a/lua/alpha/plugins/dap.lua
+++ b/lua/alpha/plugins/dap.lua
@@ -6,9 +6,26 @@ return {
         "leoluz/nvim-dap-go",
         "mxsdev/nvim-dap-vscode-js",
         "anuvyklack/hydra.nvim",
+        "nvim-telescope/telescope-dap.nvim",
+        "rcarriga/cmp-dap",
     },
     keys = { { "<leader>d" } },
     config = function()
         require("alpha.dap")
+        local ok_telescope, telescope = pcall(require, "telescope")
+        if  ok_telescope then
+            telescope.load_extension("dap")
+        end
+
+        local ok_cmp, cmp = pcall(require, "cmp")
+        if ok_cmp then
+            cmp.setup.filetype({ "dap-repl", "dapui_watches" }, {
+                sources = cmp.config.sources({
+                    { name = "dap" },
+                }, {
+                    { name = "buffer" },
+                }),
+            })
+        end
     end
 }
diff --git a/lua/alpha/plugins/database.lua b/lua/alpha/plugins/database.lua
index 39e42a5..fceb506 100644
--- a/lua/alpha/plugins/database.lua
+++ b/lua/alpha/plugins/database.lua
@@ -5,7 +5,8 @@ return {
         "kristijanhusak/vim-dadbod-completion",
         "tpope/vim-dotenv",
     },
-    config = function ()
+    keys = {{"<leader><leader>db", ':tab DBUI<cr>'}},
+    init = function ()
         require("alpha.database")
     end
 }
diff --git a/lua/alpha/plugins/fugitive.lua b/lua/alpha/plugins/fugitive.lua
new file mode 100644
index 0000000..bcf7ea8
--- /dev/null
+++ b/lua/alpha/plugins/fugitive.lua
@@ -0,0 +1,12 @@
+return {
+    "tpope/vim-fugitive",
+    keys = {
+        {"<leader>ga", ":Git fetch --all -p<cr>"},
+        {"<leader>gl", ":Git pull<cr>"},
+    },
+    cmd = { "G", "Git" },
+    config = function ()
+        vim.keymap.set("n", "<leader>gdh", ":diffget //2<cr>", nil)
+        vim.keymap.set("n", "<leader>gdl", ":diffget //3<cr>", nil)
+    end
+}
diff --git a/lua/alpha/plugins/gitsigns.lua b/lua/alpha/plugins/gitsigns.lua
index 12a1840..524da78 100644
--- a/lua/alpha/plugins/gitsigns.lua
+++ b/lua/alpha/plugins/gitsigns.lua
@@ -6,6 +6,7 @@ return {
     config = function()
         local gitsigns = require("gitsigns")
         gitsigns.setup({
+            trouble = false,
             on_attach = function(bufnr)
                 vim.keymap.set('n', '<leader>hs', gitsigns.stage_hunk, { buffer = bufnr })
                 vim.keymap.set('n', '<leader>hu', gitsigns.undo_stage_hunk, { buffer = bufnr })
diff --git a/lua/alpha/plugins/harpoon.lua b/lua/alpha/plugins/harpoon.lua
index 8a4ecc6..b410c8e 100644
--- a/lua/alpha/plugins/harpoon.lua
+++ b/lua/alpha/plugins/harpoon.lua
@@ -4,6 +4,7 @@ return {
         "nvim-lua/plenary.nvim",
         "nvim-lua/popup.nvim",
     },
+    keys = require('alpha.harpoon').keymaps,
     config = function ()
         require("alpha.harpoon").setup()
     end
diff --git a/lua/alpha/plugins/init.lua b/lua/alpha/plugins/init.lua
index 334cb01..5fb4f25 100644
--- a/lua/alpha/plugins/init.lua
+++ b/lua/alpha/plugins/init.lua
@@ -13,42 +13,12 @@ return {
             require("nvim-projectconfig").setup()
         end,
     },
-    {
-        "ThePrimeagen/git-worktree.nvim",
-        config = function()
-            require("git-worktree").setup({})
-        end,
-    },
-    {
-        "folke/trouble.nvim",
-        dependencies = "kyazdani42/nvim-web-devicons",
-    },
-    "vim-test/vim-test",
     "rcarriga/nvim-notify",
-
     "Raimondi/delimitMate",
     "lukas-reineke/indent-blankline.nvim",
-
     "tpope/vim-surround",
     "tpope/vim-repeat",
-    "tpope/vim-fugitive",
     "tpope/vim-rhubarb",
     "tpope/vim-dotenv",
     "tpope/vim-eunuch",
-    {
-        "numToStr/Comment.nvim",
-        config = function()
-            require("Comment").setup()
-        end,
-    },
-    {
-        "phaazon/mind.nvim",
-        branch = "v2.2",
-        dependencies = { "nvim-lua/plenary.nvim" },
-    },
-
-    { "adalessa/laravel.nvim", dev = false },
-
-    "adalessa/composer.nvim",
-    "adalessa/php-code-actions.nvim",
 }
diff --git a/lua/alpha/plugins/laravel.lua b/lua/alpha/plugins/laravel.lua
new file mode 100644
index 0000000..0082653
--- /dev/null
+++ b/lua/alpha/plugins/laravel.lua
@@ -0,0 +1,25 @@
+return {
+    "adalessa/laravel.nvim",
+    dependencies = {
+        "rcarriga/nvim-notify",
+        "adalessa/composer.nvim",
+    },
+    cmd = {"Sali", "Artisan", "Composer"},
+    keys = {{"<leader>pa", function ()
+        require("telescope").extensions.laravel.laravel()
+    end}},
+    config = function()
+        local laravel = require("laravel")
+        local artisan = require("laravel.artisan")
+        local notify = require("notify")
+
+        laravel.setup()
+
+        vim.keymap.set("n", "<leader>ac", function()
+            artisan.clean_cmd_list_cache()
+            notify.notify("Artisan cmd list cache clean", "info", { title = "Laravel.nvim" })
+        end, { noremap = true })
+
+        require("telescope").load_extension("laravel")
+    end
+}
diff --git a/lua/alpha/plugins/lsp.lua b/lua/alpha/plugins/lsp.lua
index ac07faf..c7da38a 100644
--- a/lua/alpha/plugins/lsp.lua
+++ b/lua/alpha/plugins/lsp.lua
@@ -2,7 +2,12 @@ return {
     "neovim/nvim-lspconfig",
     dependencies = {
 		"hrsh7th/cmp-nvim-lsp-signature-help",
-		"jose-elias-alvarez/null-ls.nvim",
+        {
+            "jose-elias-alvarez/null-ls.nvim",
+            dependencies = {
+                "adalessa/php-code-actions.nvim",
+            }
+        },
 		"williamboman/mason.nvim",
 		"williamboman/mason-lspconfig.nvim",
 		"WhoIsSethDaniel/mason-tool-installer.nvim",
diff --git a/lua/alpha/plugins/mind.lua b/lua/alpha/plugins/mind.lua
new file mode 100644
index 0000000..70c0e23
--- /dev/null
+++ b/lua/alpha/plugins/mind.lua
@@ -0,0 +1,16 @@
+return {
+    "phaazon/mind.nvim",
+    branch = "v2.2",
+    dependencies = { "nvim-lua/plenary.nvim" },
+    cmd = { "MindOpenMain", "MindOpenProject" },
+    config = function()
+        local dirs = {}
+        if vim.fn.isdirectory("/mnt/nas/alpha/mind/data") == 1 then
+            dirs = {
+                state_path = "/mnt/nas/alpha/mind/mind.json",
+                data_dir = "/mnt/nas/alpha/mind/data",
+            }
+        end
+        require('mind').setup({ persistence = dirs })
+    end
+}
diff --git a/lua/alpha/plugins/neotest.lua b/lua/alpha/plugins/neotest.lua
index 2cecb60..5a332be 100644
--- a/lua/alpha/plugins/neotest.lua
+++ b/lua/alpha/plugins/neotest.lua
@@ -1,5 +1,6 @@
 return {
     "nvim-neotest/neotest",
+    enabled = false,
     dependencies = {
         "nvim-lua/plenary.nvim",
         "nvim-treesitter/nvim-treesitter",
diff --git a/lua/alpha/plugins/refactoring.lua b/lua/alpha/plugins/refactoring.lua
index c8bf7fc..349cc63 100644
--- a/lua/alpha/plugins/refactoring.lua
+++ b/lua/alpha/plugins/refactoring.lua
@@ -4,7 +4,11 @@ return {
         { "nvim-lua/plenary.nvim" },
         { "nvim-treesitter/nvim-treesitter" },
     },
+    keys = { { "<leader>rr", function()
+        require("telescope").extensions.refactoring.refactors()
+    end, mode = { "n", "v" } } },
     config = function()
         require("refactoring").setup({})
+        require("telescope").load_extension("refactoring")
     end
 }
diff --git a/lua/alpha/plugins/rest.lua b/lua/alpha/plugins/rest.lua
index a0ec729..7b60a9d 100644
--- a/lua/alpha/plugins/rest.lua
+++ b/lua/alpha/plugins/rest.lua
@@ -1,6 +1,7 @@
 return {
     "NTBBloodbath/rest.nvim",
     dependencies = { "nvim-lua/plenary.nvim" },
+    ft = "http",
     config = function()
         local rest_nvim = require("rest-nvim")
 
diff --git a/lua/alpha/plugins/telescope.lua b/lua/alpha/plugins/telescope.lua
index ba6ae58..52d7b8b 100644
--- a/lua/alpha/plugins/telescope.lua
+++ b/lua/alpha/plugins/telescope.lua
@@ -6,7 +6,6 @@ return {
         { "nvim-telescope/telescope-fzy-native.nvim" },
         { "kyazdani42/nvim-web-devicons" },
         { "nvim-telescope/telescope-file-browser.nvim" },
-        { "nvim-telescope/telescope-dap.nvim" },
         { "nvim-telescope/telescope-ui-select.nvim" },
         { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
     },
diff --git a/lua/alpha/plugins/test.lua b/lua/alpha/plugins/test.lua
new file mode 100644
index 0000000..7fcabc9
--- /dev/null
+++ b/lua/alpha/plugins/test.lua
@@ -0,0 +1,49 @@
+return {
+    "vim-test/vim-test",
+    keys = {{"<leader>t"}},
+    dependencies = {
+        "anuvyklack/hydra.nvim",
+    },
+    config = function()
+        local hydra = require("hydra")
+
+        vim.g["test#preserve_screen"] = 1
+
+        vim.cmd([[
+    let test#php#pest#executable = './vendor/bin/sail test'
+    let test#strategy = 'neovim'
+    let test#neovim#term_position = 'vert'
+    let g:test#preserve_screen = 1
+]]       )
+
+        local hint = [[
+ Vim Tests
+ _n_: Near test  _f_: Current file   _s_: Test Suit ^
+ _l_: Test Last  _g_: Visit
+ ^ ^                                          _<Esc>_ ^
+]]
+
+        hydra({
+            name = "vimtest",
+            hint = hint,
+            mode = "n",
+            config = {
+                color = "teal",
+                invoke_on_body = true,
+                hint = {
+                    border = "rounded",
+                    position = "bottom",
+                }
+            },
+            body = "<leader>t",
+            heads = {
+                { "n", ":TestNearest<CR>" },
+                { "f", ":TestFile<CR>" },
+                { "s", ":TestSuit<CR>" },
+                { "l", ":TestLast<CR>" },
+                { "g", ":TestVisit<CR>" },
+                { '<Esc>', nil, { exit = true } }
+            }
+        })
+    end
+}
diff --git a/lua/alpha/plugins/trouble.lua b/lua/alpha/plugins/trouble.lua
new file mode 100644
index 0000000..b3ed1c9
--- /dev/null
+++ b/lua/alpha/plugins/trouble.lua
@@ -0,0 +1,8 @@
+return {
+    "folke/trouble.nvim",
+    dependencies = "kyazdani42/nvim-web-devicons",
+    keys = { { "<leader>oo", "<cmd>TroubleToggle<cr>" } },
+    config = function()
+        require("trouble").setup()
+    end
+}
diff --git a/lua/alpha/plugins/worktree.lua b/lua/alpha/plugins/worktree.lua
new file mode 100644
index 0000000..bd7c923
--- /dev/null
+++ b/lua/alpha/plugins/worktree.lua
@@ -0,0 +1,11 @@
+return {
+    "ThePrimeagen/git-worktree.nvim",
+    keys = {
+        { "<leader>gt", function() require("telescope").extensions.git_worktree.git_worktrees() end },
+        { "<leader>gn", function() require("telescope").extensions.git_worktree.create_git_worktree() end },
+    },
+    config = function()
+        require("git-worktree").setup({})
+        require("telescope").load_extension("git_worktree")
+    end,
+}
diff --git a/lua/alpha/telescope/mappings.lua b/lua/alpha/telescope/mappings.lua
index eab56fd..42d2c4b 100644
--- a/lua/alpha/telescope/mappings.lua
+++ b/lua/alpha/telescope/mappings.lua
@@ -23,8 +23,6 @@ vim.api.nvim_set_keymap("c", "<c-r><c-r>", "<Plug>(TelescopeFuzzyCommandSearch)"
 
 map_tele("<leader>pp", "project_files")
 map_tele("<leader>gc", "branches")
-map_tele("<leader>gt", "worktree")
-map_tele("<leader>gn", "worktree_create")
 map_tele("<leader>pw", "grep_word")
 map_tele("<leader>ps", "grep_string")
 map_tele("<leader>pf", "projectionist")
@@ -37,10 +35,7 @@ map_tele("<leader>bp", "file_browser")
 map_tele("<leader>gs", "git_status")
 map_tele("<leader>ve", "diagnostics")
 map_tele("<leader>fp", "my_plugins")
-map_tele("<leader>rr", "refactor", {}, nil, {"n", "v"})
 map_tele("<leader>po", "api_specs")
-
-map_tele("<leader>pa", "laravel_commands")
 map_tele("<leader>pm", "gateway")
 
 return map_tele
diff --git a/lua/alpha/telescope/setup.lua b/lua/alpha/telescope/setup.lua
index e569db7..627eaed 100644
--- a/lua/alpha/telescope/setup.lua
+++ b/lua/alpha/telescope/setup.lua
@@ -159,16 +159,7 @@ require("telescope").setup({
 		},
 	},
 })
-_ = require("telescope").load_extension("dap")
 _ = require("telescope").load_extension("notify")
 _ = require("telescope").load_extension("file_browser")
--- makes the selection like lsp code actions in telescope
 _ = require("telescope").load_extension("ui-select")
 _ = require("telescope").load_extension("fzf")
-_ = require("telescope").load_extension("git_worktree")
--- _ = require("telescope").load_extension "neoclip"
--- _ = require("telescope").load_extension "frecency"
--- _ = require("telescope").load_extension "smart_history"
--- _ = require("telescope").load_extension("projectionist")
-_ = require("telescope").load_extension("laravel")
-_ = require("telescope").load_extension("refactoring")
diff --git a/plugin/git.vim b/plugin/git.vim
deleted file mode 100644
index f347972..0000000
--- a/plugin/git.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-nmap <Leader>gdh :diffget //2<CR>
-nmap <Leader>gdl :diffget //3<CR>
-
-nnoremap <leader>ga :Git fetch --all -p<CR>
-nnoremap <leader>gl :Git pull<CR>
-nnoremap <leader>gpp :Git push<CR>
-nnoremap <leader>gpo :Git push -u origin HEAD<CR>
diff --git a/plugin/test.lua b/plugin/test.lua
deleted file mode 100644
index 110c5c2..0000000
--- a/plugin/test.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-local hydra = require("hydra")
-
-vim.g["test#preserve_screen"] = 1
-
-vim.cmd([[
-    let test#php#pest#executable = './vendor/bin/sail test'
-    let test#strategy = 'neovim'
-    let test#neovim#term_position = 'vert'
-    let g:test#preserve_screen = 1
-]])
-
-local hint = [[
- Vim Tests
- _n_: Near test  _f_: Current file   _s_: Test Suit ^
- _l_: Test Last  _g_: Visit
- ^ ^                                          _<Esc>_ ^
-]]
-
-hydra({
-    name = "vimtest",
-    hint = hint,
-    mode = "n",
-    config = {
-        color = "teal",
-        invoke_on_body = true,
-        hint = {
-            border = "rounded",
-            position = "bottom",
-        }
-    },
-    body = "<leader>t",
-    heads = {
-        { "n", ":TestNearest<CR>" },
-        { "f", ":TestFile<CR>" },
-        { "s", ":TestSuit<CR>" },
-        { "l", ":TestLast<CR>" },
-        { "g", ":TestVisit<CR>" },
-        { '<Esc>', nil, { exit = true } }
-    }
-})