feat!: migrate to vim.pack

1 files changed, 64 insertions, 30 deletions

diff --git a/lua/pml68/remap.lua b/plugin/10-remap.lua
index 0af8323..a30d6a8 100644
--- a/lua/pml68/remap.lua
+++ b/plugin/10-remap.lua
@@ -21,10 +21,10 @@ vim.keymap.set("n", "<leader>sl", "<cmd>exec \"normal i\".nr2char(getchar()).\"\
 vim.keymap.set("n", "<leader>sc", "<cmd>exec \"normal a\".nr2char(getchar()).\"\\e\"<CR>")
 
 -- u/soer9459
-vim.keymap.set('n', '<leader>,',
+vim.keymap.set("n", "<leader>,",
   function()
     local cursor = vim.api.nvim_win_get_cursor(0)
-    vim.cmd('norm A;')
+    vim.cmd("norm A;")
     vim.api.nvim_win_set_cursor(0, cursor)
   end,
   { noremap = true, silent = true })
@@ -43,9 +43,6 @@ vim.keymap.set("n", "<C-l>", "<cmd>TmuxNavigateRight<CR>")
 vim.keymap.set("n", "<C-j>", "<cmd>TmuxNavigateDown<CR>")
 vim.keymap.set("n", "<C-k>", "<cmd>TmuxNavigateUp<CR>")
 
--- Cellular Automaton
-vim.keymap.set("n", "<leader>gol", "<cmd>CellularAutomaton game_of_life<CR>")
-
 -- Color picker
 vim.keymap.set("n", "<leader>cc", "<cmd>CccPick<CR>")
 
@@ -53,12 +50,6 @@ vim.keymap.set("n", "<leader>cc", "<cmd>CccPick<CR>")
 vim.keymap.set("n", "<leader>ll", "<cmd>VimtexCompile<CR>")
 vim.keymap.set("n", "<leader>vl", "<cmd>VimtexView<CR>")
 
--- Go
-vim.keymap.set("n", "<leader>gj", "<cmd>GoTagAdd json<CR>")
-vim.keymap.set("n", "<leader>gy", "<cmd>GoTagAdd yaml<CR>")
-vim.keymap.set("n", "<leader>ge", "<cmd>GoIfErr<CR>")
-vim.keymap.set("n", "<leader>gt", "<cmd>GoMod tidy<CR>")
-
 -- Screenkey
 vim.keymap.set("n", "<leader>sk", "<cmd>Screenkey<CR>")
 
@@ -67,16 +58,58 @@ vim.cmd("packadd nvim.undotree")
 vim.keymap.set("n", "<leader>u", require("undotree").open)
 
 -- Telescope
-vim.keymap.set('n', '<leader>ff', "<cmd>Telescope find_files<CR>", {})
-vim.keymap.set('n', '<leader>fw', "<cmd>Telescope live_grep<CR>", {})
-vim.keymap.set('n', '<leader>fo', "<cmd>Telescope buffers<CR>", {})
-vim.keymap.set('n', '<leader>fh', "<cmd>Telescope help_tags<CR>", {})
-vim.keymap.set('n', '<leader>fz', "<cmd>Telescope current_buffer_fuzzy_find<CR>", {})
-vim.keymap.set('n', '<leader>fg', "<cmd>Telescope git_files<CR>", {})
-vim.keymap.set('n', '<leader>fd', "<cmd>Telescope diagnostics<CR>", {})
-vim.keymap.set('n', '<leader>ft', function()
+local lazy_telescope = function()
+  vim.pack.add({
+    "https://github.com/nvim-lua/plenary.nvim",
+    {
+      src = "https://github.com/nvim-telescope/telescope.nvim",
+      version = "v0.2.2"
+    },
+  })
+
+  require("telescope").setup({
+    pickers = {
+      find_files = {
+        hidden = true,
+        find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/**" },
+      },
+    },
+  })
+end
+
+vim.keymap.set("n", "<leader>ff", function()
+  lazy_telescope()
+  vim.cmd("Telescope find_files")
+end, {})
+vim.keymap.set("n", "<leader>fw", function()
+  lazy_telescope()
+  vim.cmd("Telescope live_grep")
+end, {})
+vim.keymap.set("n", "<leader>fo", function()
+  lazy_telescope()
+  vim.cmd("Telescope buffers")
+end, {})
+vim.keymap.set("n", "<leader>fh", function()
+  lazy_telescope()
+  vim.cmd("Telescope help_tags")
+end, {})
+vim.keymap.set("n", "<leader>fz", function()
+  lazy_telescope()
+  vim.cmd("Telescope current_buffer_fuzzy_find")
+end, {})
+vim.keymap.set("n", "<leader>fg", function()
+  lazy_telescope()
+  vim.cmd("Telescope git_files")
+end, {})
+vim.keymap.set("n", "<leader>fd", function()
+  lazy_telescope()
+  vim.cmd("Telescope diagnostics")
+end, {})
+vim.keymap.set("n", "<leader>ft", function()
+  lazy_telescope()
   local telescope = require("telescope.builtin")
   local handle = io.popen("rg 'TODO'")
+  if handle == nil then return end
   local result = handle:read("*a")
   handle:close()
 
@@ -84,6 +117,7 @@ vim.keymap.set('n', '<leader>ft', function()
     local todo_files = {}
 
     local files_handle = io.popen("rg --files -g 'TODO.{md,txt}'")
+    if files_handle == nil then return end
     local files_result = files_handle:read("*a")
     files_handle:close()
 
@@ -106,22 +140,22 @@ vim.keymap.set('n', '<leader>ft', function()
 end, { noremap = true, silent = true })
 
 -- Diagnostics, LSP
-vim.keymap.set('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<CR>')
-vim.keymap.set('n', 'gp', '<cmd>lua vim.diagnostic.goto_prev()<CR>')
-vim.keymap.set('n', 'gn', '<cmd>lua vim.diagnostic.goto_next()<CR>')
+vim.keymap.set("n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>")
+vim.keymap.set("n", "gp", "<cmd>lua vim.diagnostic.jump({ count = -1 })<CR>")
+vim.keymap.set("n", "gn", "<cmd>lua vim.diagnostic.jump({ count = 1 })<CR>")
 
-vim.api.nvim_create_autocmd('LspAttach', {
-  desc = 'LSP actions',
+vim.api.nvim_create_autocmd("LspAttach", {
+  desc = "LSP actions",
   callback = function(event)
     local opts = { buffer = event.buf }
 
-    vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-    vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-    vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-    vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-    vim.keymap.set({ 'n', 'x' }, '<S-f>', '<cmd>lua vim.lsp.buf.format({async = true})<CR>', opts)
+    vim.keymap.set("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
+    vim.keymap.set("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
+    vim.keymap.set("n", "go", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
+    vim.keymap.set("n", "gs", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
+    vim.keymap.set({ "n", "x" }, "<S-f>", "<cmd>lua vim.lsp.buf.format({async = true})<CR>", opts)
     -- u/Blan_11
-    vim.keymap.set('n', '<leader>lh', function()
+    vim.keymap.set("n", "<leader>lh", function()
       vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
     end, { silent = true, buffer = event.buf })
   end