chore(maps): load lspmaps on attach; dropbar on verylazy

Author: pwnwriter

lua/core/mappings.lua

@@ -79,16 +79,26 @@ end
 
 M.misc = function()
   map("n", "<RightMouse>", "<cmd>:popup mousemenu<CR>")
+
   map("n", "<A-R>", function()
     utils.run_vert_command()
   end, "Run command")
 
   map("n", "<leader>n", function()
     utils.toggle_numbering()
   end, "Toggle line numbering")
+
   map("n", "<leader>tf", function()
     utils.toggle_flow()
   end, "Toggle flow")
+
+  map("n", "<leader>p", function()
+    require("dropbar.api").pick(vim.v.count ~= 0 and vim.v.count)
+  end, "Open dropbar menu")
+
+  map("n", "<leader>td", function()
+    require("core.utils").toggle_dropbar()
+  end, "Toggle dropbar")
 end
 
 M.lsp = function()
@@ -131,16 +141,6 @@ M.lsp = function()
   })
 end
 
-M.dropbar = function()
-  map("n", "<leader>p", function()
-    require("dropbar.api").pick(vim.v.count ~= 0 and vim.v.count)
-  end, "Open dropbar menu")
-
-  map("n", "<leader>td", function()
-    require("core.utils").toggle_dropbar()
-  end, "Toggle dropbar")
-end
-
 M.gitsigns = function()
   map("n", "<leader>gp", function()
     require("gitsigns").preview_hunk()

lua/plugins/configs/lsp.lua

@@ -2,9 +2,6 @@ local lspconfig = require "lspconfig"
 local windows = require "lspconfig.ui.windows"
 local cmp = require "cmp_nvim_lsp"
 
---- mappings
-require("core.mappings").lsp()
-
 windows.default_options.border = "rounded"
 lspconfig.util.on_setup = lspconfig.util.add_hook_after(lspconfig.util.on_setup, function(config)
   config.capabilities = vim.tbl_deep_extend("force", config.capabilities, cmp.default_capabilities())

lua/plugins/init.lua

@@ -112,6 +112,7 @@ local plugins = {
       "LspAttach",
     },
     init = function()
+      require("core.mappings").lsp()
       require("core.utils").lazy_load "lspconfig"
     end,
     config = function()
@@ -161,7 +162,6 @@ local plugins = {
       "nvim-tree/nvim-web-devicons",
     },
     opts = function()
-      require("core.mappings").dropbar()
       return require("plugins.configs.fancy").drop
     end,
   },