init.lua @ efdd9272730ab8c9f6b7e37e81ce6a1c7ed5a0fa

M lazy-lock.json

@@ -1,23 +1,23 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "a89339ffbee677ab0521a483b6dac7e2e67c907e" },
-  "LuaSnip": { "branch": "master", "commit": "eb592e4be52fff5a514b7540d5341b55ca4c3226" },
+  "LuaSnip": { "branch": "master", "commit": "a6355b12a3b7da0aef71f02560e17ff480182b97" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "codeium.vim": { "branch": "main", "commit": "41b718e550b26a34075b79a50128cf853b2b917e" },
-  "debugprint.nvim": { "branch": "main", "commit": "963033ea7926ce84d7302a3c2fb8c6147f6e3bec" },
+  "codeium.vim": { "branch": "main", "commit": "1dc5aff16f906e221b7b73668ed8d8bfc40ecd6b" },
+  "debugprint.nvim": { "branch": "main", "commit": "0538c5de96a1b1cea4462c81d0075635febd7dcb" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "friendly-snippets": { "branch": "main", "commit": "8d91ba2dc2421a54981115f61b914974f938fa77" },
+  "friendly-snippets": { "branch": "main", "commit": "781af8c404ce351e999b5102b9724ee847f3ad18" },
   "gitsigns.nvim": { "branch": "main", "commit": "372d5cb485f2062ac74abc5b33054abac21d8b58" },
   "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" },
   "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
   "lsp-inlayhints.nvim": { "branch": "main", "commit": "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c" },
   "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "84d9c35cda573210f237e6e30c5b9036baf85483" },
-  "mason.nvim": { "branch": "main", "commit": "4c3e920c79e0493819ffdd2260d3c79ab1c0a41d" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "b81c50c4baae7d80b1723b3fa86e814d7754d15b" },
+  "mason.nvim": { "branch": "main", "commit": "6845ccfe009d6fbc5a6a266c285779ad462b234b" },
   "neodev.nvim": { "branch": "main", "commit": "864b35006d3de24c60e44b566de8018f919b13e6" },
-  "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" },
+  "neogit": { "branch": "master", "commit": "69a6ca7c41b023ebf9cad70778e227b3209b40c4" },
   "neotest": { "branch": "master", "commit": "28724010861dbf294f09b9ee1948d2da2823604b" },
   "neotest-go": { "branch": "main", "commit": "756edf3dddcb3b430110f9582e10b7e730428341" },
   "neotest-plenary": { "branch": "master", "commit": "d49bfd9470f791e7c29149e75d56b6f925bb391b" },
@@ -28,9 +28,9 @@ "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
   "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" },
   "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "9dc45a6eb33871f4c5cb2ba08fa307467657471e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6fe69025b8825029ea9bf291ab3b1750f9bcb39e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e52efca5d4f5536533d447ec0d97e4d525b37ace" },
   "nvim-tree.lua": { "branch": "master", "commit": "b601b5aa25627f68d3d73ba9269b49e4f04ce126" },
-  "nvim-treesitter": { "branch": "master", "commit": "0efa55ae2e6676b1a4cb66c5ee31ea295c6ebc2f" },
+  "nvim-treesitter": { "branch": "master", "commit": "f499a711fa5c573b5ba0af09a3c9955a6c14b062" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "0cf4601c330cf724769a2394df555a57d5fd3f34" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
   "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },

M lua/plugins.lua

@@ -6,10 +6,25 @@ { "mbbill/undotree", cmd = "UndotreeToggle" },
   { "tpope/vim-surround", keys = { "c", "d", "y" } },
   { "tpope/vim-repeat", event = "VeryLazy" },
   {
+    "folke/tokyonight.nvim",
+    lazy = false,
+    config = function()
+      vim.cmd.colorscheme "tokyonight-night"
+    end,
+  },
+  {
     "numToStr/Comment.nvim",
-    keys = "gc",
     event = "BufRead",
+    keys = "gc",
     config = true,
+  },
+  {
+    "windwp/nvim-autopairs",
+    event = "InsertEnter",
+    opts = {
+      check_ts = true,
+      disable_filetype = { "TelescopePrompt", "clojure" },
+    },
   },
   {
     "folke/todo-comments.nvim",

D

@@ -1,8 +0,0 @@
-return {
-  "windwp/nvim-autopairs",
-  event = "InsertEnter",
-  opts = {
-    check_ts = true,
-    disable_filetype = { "TelescopePrompt" },
-  },
-}

D

@@ -1,7 +0,0 @@
-return {
-  "folke/tokyonight.nvim",
-  lazy = false,
-  config = function()
-    vim.cmd.colorscheme "tokyonight-night"
-  end,
-}

M lua/plugins/dap/init.lua

@@ -1,27 +1,42 @@
+local map = require "core.utils".smap
 return {
-  "mfussenegger/nvim-dap",
-  keys = {
-    { "<leader>db", "<cmd>lua require'dap'.toggle_breakpoint()<cr>" },
-    { "<leader>dc", "<cmd>lua require'dap'.continue()<cr>" },
-    { "<leader>di", "<cmd>lua require'dap'.step_into()<cr>" },
-    { "<leader>do", "<cmd>lua require'dap'.step_over()<cr>" },
-    { "<leader>dO", "<cmd>lua require'dap'.step_out()<cr>" },
-    { "<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>" },
-    { "<leader>dl", "<cmd>lua require'dap'.run_last()<cr>" },
-    { "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>" },
-    { "<leader>dt", "<cmd>lua require'dap'.terminate()<cr>" },
+  {
+    "mfussenegger/nvim-dap",
+    keys = {
+      { "<leader>db", map("dap", "toggle_breakpoint") },
+      { "<leader>dc", map("dap", "continue") },
+      { "<leader>di", map("dap", "step_into") },
+      { "<leader>do", map("dap", "step_over") },
+      { "<leader>dO", map("dap", "step_out") },
+      { "<leader>dr", map("dap", "repl.toggle") },
+      { "<leader>dl", map("dap", "run_to_cursor") },
+      { "<leader>du", map("dap", "disconnect") },
+      { "<leader>dt", map("dap", "terminate") },
+    },
+    dependencies = {
+      "rcarriga/nvim-dap-ui",
+      { "theHamsta/nvim-dap-virtual-text", config = true },
+    },
+    config = function()
+      require "plugins.dap.ui"
+      vim.fn.sign_define("DapBreakpoint", {
+        text = "",
+        texthl = "DiagnosticSignError",
+        linehl = "",
+        numhl = "",
+      })
+    end,
   },
-  dependencies = {
-    "rcarriga/nvim-dap-ui",
-    { "theHamsta/nvim-dap-virtual-text", config = true },
+  {
+    "andrewferrier/debugprint.nvim",
+    config = true,
+    keys = {
+      "g?",
+      {
+        "<leader>P",
+        map("debugprint", "debugprint", "{ variable = true }"),
+        expr = true,
+      },
+    },
   },
-  config = function()
-    require "plugins.dap.ui"
-    vim.fn.sign_define("DapBreakpoint", {
-      text = "",
-      texthl = "DiagnosticSignError",
-      linehl = "",
-      numhl = "",
-    })
-  end,
 }

D

@@ -1,14 +0,0 @@
-return {
-  "andrewferrier/debugprint.nvim",
-  config = true,
-  keys = {
-    {
-      "<leader>P",
-      function()
-        return require("debugprint").debugprint { variable = true }
-      end,
-      expr = true,
-    },
-    "g?",
-  },
-}

M lua/plugins/gitsigns.lua

@@ -1,39 +1,40 @@
+local map = require("core.utils").smap
 return {
-  "lewis6991/gitsigns.nvim",
-  event = "BufRead",
-  keys = {
-    "]g",
-    "[g",
-    "<leader>gs",
-    "<leader>gu",
-    "<leader>gr",
-    "<leader>gp",
-    "<leader>gd",
+  {
+    "lewis6991/gitsigns.nvim",
+    event = "BufRead",
+    keys = {
+      { "]g", map("gitsigns", "next_hunk") },
+      { "[g", map("gitsigns", "prev_hunk") },
+      { "<leader>gs", map("gitsigns", "stage_hunk") },
+      { "<leader>gu", map("gitsigns", "undo_stage_hunk") },
+      { "<leader>gr", map("gitsigns", "reset_hunk") },
+      { "<leader>gp", map("gitsigns", "preview_hunk") },
+      { "<leader>gd", map("gitsigns", "diffthis") },
+    },
+    opts = {
+      max_file_length = 1000,
+      current_line_blame = true,
+      current_line_blame_opts = {
+        virt_text_pos = "eol",
+        delay = 300,
+      },
+    },
   },
-  opts = {
-    max_file_length = 1000,
-    current_line_blame = true,
-    current_line_blame_opts = {
-      virt_text_pos = "eol",
-      delay = 300,
+  {
+    "TimUntersberger/neogit",
+    cmd = "Neogit",
+    keys = { { "<leader>gg", vim.cmd.Neogit } },
+    opts = {
+      kind = "vsplit",
+      disable_builtin_notifications = true,
+      disable_commit_confirmation = true,
+      disable_hint = true,
+      signs = {
+        section = { "", "" },
+        item = { "", "" },
+        hunk = { "", "" },
+      },
     },
-    on_attach = function(bufnr)
-      local g = package.loaded.gitsigns
-      local map = function(from, to)
-        vim.keymap.set("n", from, to, {
-          buffer = bufnr,
-          noremap = true,
-          silent = true,
-        })
-      end
-
-      map("]g", g.next_hunk)
-      map("[g", g.prev_hunk)
-      map("<leader>gs", g.stage_hunk)
-      map("<leader>gu", g.undo_stage_hunk)
-      map("<leader>gr", g.reset_hunk)
-      map("<leader>gp", g.preview_hunk)
-      map("<leader>gd", g.diffthis)
-    end,
   },
 }

D

@@ -1,18 +0,0 @@
-return {
-  "TimUntersberger/neogit",
-  cmd = "Neogit",
-  keys = {
-    { "<leader>gg", vim.cmd.Neogit },
-  },
-  opts = {
-    kind = "vsplit",
-    disable_builtin_notifications = true,
-    disable_commit_confirmation = true,
-    disable_hint = true,
-    signs = {
-      section = { "", "" },
-      item = { "", "" },
-      hunk = { "", "" },
-    },
-  },
-}