diff options
| -rw-r--r-- | lua/lv-which-key/init.lua | 46 | ||||
| -rw-r--r-- | lua/plugins.lua | 34 |
2 files changed, 49 insertions, 31 deletions
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index d5ad771f..084be113 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -87,7 +87,7 @@ vim.api.nvim_set_keymap("n", "<leader>/", ":CommentToggle<CR>", { noremap = true vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", { noremap = true, silent = true }) -- close buffer -vim.api.nvim_set_keymap("n", "<leader>c", ":bdelete!<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", { noremap = true, silent = true }) -- TODO create entire treesitter section @@ -121,14 +121,14 @@ local mappings = { "sort BufferLines automatically by language", }, }, - p = { - name = "Packer", - c = {"<cmd>PackerCompile<cr>", "Compile"}, - i = {"<cmd>PackerInstall<cr>", "Install"}, - r = {":luafile %<cr>", "Reload"}, - s = {"<cmd>PackerSync<cr>", "Sync"}, - u = {"<cmd>PackerUpdate<cr>", "Update"} - }, + p = { + name = "Packer", + c = { "<cmd>PackerCompile<cr>", "Compile" }, + i = { "<cmd>PackerInstall<cr>", "Install" }, + r = { ":luafile %<cr>", "Reload" }, + s = { "<cmd>PackerSync<cr>", "Sync" }, + u = { "<cmd>PackerUpdate<cr>", "Update" }, + }, -- diagnostics vanilla nvim -- -- diagnostic -- function lv_utils.get_all() @@ -158,20 +158,20 @@ local mappings = { -- " https://microsoft.github.io/debug-adapter-protocol/ -- " Debugging d = { - name = "Debug", - t = {"<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Toggle Breakpoint"}, - b = {"<cmd>lua require'dap'.step_back()<cr>", "Step Back"}, - c = {"<cmd>lua require'dap'.continue()<cr>", "Continue"}, - C = {"<cmd>lua require'dap'.run_to_cursor()<cr>", "Run To Cursor"}, - d = {"<cmd>lua require'dap'.disconnect()<cr>", "Disconnect"}, - g = {"<cmd>lua require'dap'.session()<cr>", "Get Session"}, - i = {"<cmd>lua require'dap'.step_into()<cr>", "Step Into"}, - o = {"<cmd>lua require'dap'.step_over()<cr>", "Step Over"}, - u = {"<cmd>lua require'dap'.step_out()<cr>", "Step Out"}, - p = {"<cmd>lua require'dap'.pause.toggle()<cr>", "Pause"}, - r = {"<cmd>lua require'dap'.repl.toggle()<cr>", "Toggle Repl"}, - s = {"<cmd>lua require'dap'.continue()<cr>", "Start"}, - q = {"<cmd>lua require'dap'.stop()<cr>", "Quit"} + name = "Debug", + t = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Toggle Breakpoint" }, + b = { "<cmd>lua require'dap'.step_back()<cr>", "Step Back" }, + c = { "<cmd>lua require'dap'.continue()<cr>", "Continue" }, + C = { "<cmd>lua require'dap'.run_to_cursor()<cr>", "Run To Cursor" }, + d = { "<cmd>lua require'dap'.disconnect()<cr>", "Disconnect" }, + g = { "<cmd>lua require'dap'.session()<cr>", "Get Session" }, + i = { "<cmd>lua require'dap'.step_into()<cr>", "Step Into" }, + o = { "<cmd>lua require'dap'.step_over()<cr>", "Step Over" }, + u = { "<cmd>lua require'dap'.step_out()<cr>", "Step Out" }, + p = { "<cmd>lua require'dap'.pause.toggle()<cr>", "Pause" }, + r = { "<cmd>lua require'dap'.repl.toggle()<cr>", "Toggle Repl" }, + s = { "<cmd>lua require'dap'.continue()<cr>", "Start" }, + q = { "<cmd>lua require'dap'.stop()<cr>", "Quit" }, }, g = { name = "Git", diff --git a/lua/plugins.lua b/lua/plugins.lua index 8752a1ba..4ae2ec1a 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -118,13 +118,21 @@ return require("packer").startup(function(use) use { "glepnir/galaxyline.nvim" } use { - "akinsho/nvim-bufferline.lua", + "romgrk/barbar.nvim", config = function() - require("lv-bufferline").config() + vim.api.nvim_set_keymap("n", "<TAB>", ":BufferNext<CR>", { noremap = true, silent = true }) + vim.api.nvim_set_keymap("n", "<S-TAB>", ":BufferPrevious<CR>", { noremap = true, silent = true }) + vim.api.nvim_set_keymap("n", "<S-x>", ":BufferClose<CR>", { noremap = true, silent = true }) end, event = "BufRead", } + -- use { + -- "akinsho/nvim-bufferline.lua", + -- config = function() require("lv-bufferline").config() end, + -- event = "BufRead" + -- } + -- Extras, these do not load by default -- Better motions @@ -224,7 +232,11 @@ return require("packer").startup(function(use) vim.g.indentLine_enabled = 1 vim.g.indent_blankline_char = "▏" - vim.g.indent_blankline_filetype_exclude = { "help", "terminal", "dashboard" } + vim.g.indent_blankline_filetype_exclude = { + "help", + "terminal", + "dashboard", + } vim.g.indent_blankline_buftype_exclude = { "terminal" } vim.g.indent_blankline_show_trailing_blankline_indent = false @@ -256,9 +268,14 @@ return require("packer").startup(function(use) use { "mfussenegger/nvim-dap", config = function() - require('dap') - vim.fn.sign_define('DapBreakpoint', {text='', texthl='LspDiagnosticsSignError', linehl='', numhl=''}) - require('dap').defaults.fallback.terminal_win_cmd = '50vsplit new' + require "dap" + vim.fn.sign_define("DapBreakpoint", { + text = "", + texthl = "LspDiagnosticsSignError", + linehl = "", + numhl = "", + }) + require("dap").defaults.fallback.terminal_win_cmd = "50vsplit new" end, disable = not O.plugin.debug.active, } @@ -462,6 +479,7 @@ return require("packer").startup(function(use) requires = "hrsh7th/nvim-compe", disable = not O.plugin.tabnine.active, } - for _, plugin in pairs(O.custom_plugins) do packer.use(plugin) end - + for _, plugin in pairs(O.custom_plugins) do + packer.use(plugin) + end end) |