init.lua @ fb038ed468e3aec564b32465b16f3def60ca2821

M lua/core/keymaps.lua

@@ -7,15 +7,14 @@ map("i", "jk", "<esc>")
 map("n", "<leader>h", "<cmd>nohlsearch<cr>")
 map("n", "<C-d>", "<C-d>zz")
 map("n", "<C-u>", "<C-u>zz")
-map("x", "<leader>p", [["_dP]])
 map("n", "Q", "<nop>") -- Q is the worth thing ever
-map("n", "H", ":bp<cr>")
-map("n", "L", ":bn<cr>")
+map("n", "[b", ":bp<cr>")
+map("n", "]b", ":bn<cr>")
 
 -- quickfix
 map("n", "]q", "<cmd>cnext<cr>")
 map("n", "[q", "<cmd>cprev<cr>")
--- map("n", "<leader>F", u.qf_toggle)
+map("n", "<lader>x", u.qf_toggle)
 
 -- macros
 map("n", "Q", "@qj")

M lua/plugins/completion.lua

@@ -3,9 +3,6 @@ {
     "zbirenbaum/copilot.lua",
     cmd = "Copilot",
     build = ":Copilot auth",
-    keys = {
-      { "<leader>lc", ":Copilot panel<cr>" },
-    },
     opts = {
       suggestion = { enabled = false },
       panel = {

M lua/plugins/core.lua

@@ -1,8 +1,6 @@
-local map = require("core.utils").smap
 return {
   "nvim-lua/plenary.nvim",
   "kyazdani42/nvim-web-devicons",
-  { "olexsmir/gopher.nvim", ft = "go", dev = true },
   { "tpope/vim-surround", keys = { "c", "d", "y" } },
   { "tpope/vim-repeat", event = "VeryLazy" },
   { "tweekmonster/helpful.vim", cmd = "HelpfulVersion" },

M lua/plugins/git.lua

@@ -1,16 +1,19 @@
-local map = require("core.utils").smap
 return {
   {
     "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") },
-    },
+    keys = function()
+      local g = require "gitsigns"
+      return {
+        { "]g", g.next_hunk },
+        { "[g", g.prev_hunk },
+        { "<leader>gs", g.stage_hunk },
+        { "<leader>gu", g.undo_stage_hunk },
+        { "<leader>gr", g.reset_hunk },
+        { "<leader>gb", g.preview_hunk },
+        { "<leader>gB", g.blame_line },
+      }
+    end,
     opts = {
       max_file_length = 1000,
       current_line_blame = true,

M lua/plugins/mini.lua

@@ -1,10 +1,14 @@
-local map = require("core.utils").smap
 return {
   {
     "echasnovski/mini.bufremove",
     config = true,
     keys = {
-      { "<leader>c", map("mini.bufremove", "delete", "0, false") },
+      {
+        "<leader>c",
+        function()
+          require("mini.bufremove").delete(0, false)
+        end,
+      },
     },
   },
   {

M lua/plugins/navigation.lua

@@ -1,4 +1,3 @@
-local map = require("core.utils").smap
 return {
   {
     "mbbill/undotree",
@@ -38,7 +37,14 @@
   {
     "stevearc/oil.nvim",
     event = "VeryLazy",
-    keys = { { "<leader>e", map("oil", "open") } },
+    keys = {
+      {
+        "<leader>e",
+        function()
+          require("oil").open()
+        end,
+      },
+    },
     opts = {
       columns = { "icon" },
       delete_to_trash = true,

M lua/plugins/neotest.lua

@@ -1,44 +1,42 @@
-local map = require("core.utils").smap
 return {
   "nvim-neotest/neotest",
-  keys = {
-    { "<leader>tn", map("neotest", "run.run") },
-    { "<leader>ts", map("neotest", "summary.toggle") },
-    { "<leader>tS", map("neotest", "run.stop") },
-    { "<leader>to", map("neotest", "output.open") },
-    { "<leader>tO", map("neotest", "output_panel.toggle") },
-    { "]t", map("neotest", "jump.next") },
-    { "[t", map("neotest", "jump.prev") },
-    { "]T", map("neotest", "jump.next", "{status = 'failed'}") },
-    { "[T", map("neotest", "jump.prev", "{status = 'failed'}") },
-    { "<leader>tw", map("neotest", "watch.toggle") },
-    {
-      "<leader>tt",
-      function()
-        require("neotest").run.run(vim.fn.expand "%")
-      end,
-    },
-  },
+  keys = function()
+    local n = require "neotest"
+
+    -- stylua: ignore
+    return {
+      { "<leader>tn", function() n.run.run() end },
+      { "<leader>ts", function() n.summary.toggle() end },
+      { "<leader>tS", function() n.run.stop() end },
+      { "<leader>to", function() n.output.open() end },
+      { "<leader>tO", function() n.output_panel.toggle() end },
+      { "<leader>tw", function() n.watch.toggle() end },
+      { "<leader>tt", function() n.run.run(vim.fn.expand "%") end },
+      { "]t", function() n.jump.next() end },
+      { "[t", function() n.jump.prev() end },
+      { "]T", function() n.jump.next {status = "failed"} end },
+      { "[T", function() n.jump.prev {status = "failed"} end },
+    }
+  end,
   dependencies = {
     { "roveo/neotest-go", branch = "feat/testify-suite" },
     "nvim-neotest/neotest-plenary",
     "nvim-treesitter",
   },
-  config = function()
-    local neotest_ns = vim.api.nvim_create_namespace "neotest"
+  init = function()
     vim.diagnostic.config({
       virtual_text = {
         format = function(diagnostic)
-          local message = diagnostic.message
+          return diagnostic.message
             :gsub("\n", " ")
             :gsub("\t", " ")
             :gsub("%s+", " ")
             :gsub("^%s+", "")
-          return message
         end,
       },
-    }, neotest_ns)
-
+    }, vim.api.nvim_create_namespace "neotest")
+  end,
+  config = function()
     require("neotest").setup {
       adapters = {
         require "neotest-plenary",

M lua/plugins/telescope.lua

@@ -10,6 +10,7 @@ { "<leader>f", "<cmd>Telescope find_files<cr>" },
     { "<leader>b", "<cmd>Telescope buffers<cr>" },
     { "<leader>sr", "<cmd>Telescope oldfiles<cr>" },
     { "<leader>st", "<cmd>Telescope live_grep<cr>" },
+    { "<leader>sh", "<cmd>Telescope help_tags<cr>" },
   },
   config = function()
     local telescope = require "telescope"