migrate from packer to lazy

most of my config has been carried over, still need to do colorizer and markdown. added a few new plugins, based off of josean's 2024 video
2024-10-31 16:45:27 -04:00
parent 3494df804e
commit 28c75e157a
35 changed files with 883 additions and 236 deletions
@@ -1,49 +1,84 @@
-local setup, gitsigns = pcall(require, "gitsigns")
-if not setup then
-   return
-end
+return {
+   "lewis6991/gitsigns.nvim",
+   event = { "BufReadPre", "BufNewFile" },
+   opts = {
+      on_attach = function(bufnr)
+         local gs = package.loaded.gitsigns
+   
+         local function map(mode, l, r, desc)
+            vim.keuymap.set(mode, l, r, { buffer = bufnr, desc = desc })
+         end

-gitsigns.setup {
-   _on_attach_pre = 
-      function(_, callback)
-         require("gitsigns-yadm").yadm_signs(callback)
+         map("n", "]h", gs.next_hunk, "Next Hunk")
+         map("n", "[h", gs.prev_hunk, "Prev Hunk")
+
+         map("n", "<leader>hs", gs.stage_hunk, "Stage Hunk")
+         map("n", "<leader>hr", gs.reset_hunk, "Reset Hunk")
+         map("v", "<leader>hs", function()
+            gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) 
+         end, "Reset Hunk")
+
+         map("n", "<leader>hS", gs.stage_buffer, "Stage buffer")
+         map("n", "<leader>hR", gs.reset_buffer, "Reset buffer")
+         map("n", "<leader>hu", gs.undo_stage_hunk, "Undo stage hunk")
+         map("n", "<leader>hp", gs.preview_hunk, "Preview hunk")
+
+         map("n", "<leader>hb", function()
+            gs.blame_line({ full = true })
+         end, "Blame line")
+
+         map("n", "<leader>hB", gs.toggle_current_line_blame, "Toggle line blame")
+
+         map("n", "<leader>hd", gs.diffthis, "Diff this")
+         map("n", "<leader>hD", function()
+            gs.diffthis("~")
+         end, "Diff this ~")
+
+         map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Gitsigns select hunk")
      end,
-   signs = {
-      add          = { text = '+' },
-      change       = { text = '│' },
-      delete       = { text = '_' },
-      topdelete    = { text = '‾' },
-      changedelete = { text = '~' },
-      untracked    = { text = '┆' },
   },
-   signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
-   numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
-   linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
-   word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
-   watch_gitdir = {
-     interval = 1000,
-     follow_files = true
-   },
-   attach_to_untracked = true,
-   current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
-   current_line_blame_opts = {
-     virt_text = true,
-     virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
-     delay = 200,
-     ignore_whitespace = false,
-   },
-   current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
-   sign_priority = 6,
-   update_debounce = 100,
-   status_formatter = nil, -- Use default
-   max_file_length = 40000, -- Disable if file is longer than this (in lines)
-   preview_config = {
-     -- Options passed to nvim_open_win
-     border = 'single',
-     style = 'minimal',
-     relative = 'cursor',
-     row = 0,
-     col = 1
-   },
-   -- on_attach = function(bufnr)
+
+   config = function()
+      local gitsigns = require("gitsigns")
+   
+      gitsigns.setup {
+         signs = {
+            add          = { text = '+' },
+            change       = { text = '│' },
+            delete       = { text = '_' },
+            topdelete    = { text = '‾' },
+            changedelete = { text = '~' },
+            untracked    = { text = '┆' },
+         },
+         signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
+         numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+         linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
+         word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
+         watch_gitdir = {
+           interval = 1000,
+           follow_files = true
+         },
+         attach_to_untracked = true,
+         current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
+         current_line_blame_opts = {
+           virt_text = true,
+           virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
+           delay = 200,
+           ignore_whitespace = false,
+         },
+         current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
+         sign_priority = 6,
+         update_debounce = 100,
+         status_formatter = nil, -- Use default
+         max_file_length = 40000, -- Disable if file is longer than this (in lines)
+         preview_config = {
+           -- Options passed to nvim_open_win
+           border = 'single',
+           style = 'minimal',
+           relative = 'cursor',
+           row = 0,
+           col = 1
+         },
+      }
+   end,
 }