diff options
author | David Luevano Alvarado <david@luevano.xyz> | 2023-06-04 17:02:43 -0600 |
---|---|---|
committer | David Luevano Alvarado <david@luevano.xyz> | 2023-06-04 17:02:43 -0600 |
commit | 2ae591cb0a56746bb6c5023b96234d46b946d32c (patch) | |
tree | b67470166838c68e081953df1dc518f0c026024c /lua | |
parent | 7bd97062c98418a9bdf31df0b84737da67bed38b (diff) |
final changes from kickstart.nvim, moved sets and remaps to separatefiles, removed unnecessary stuff
Diffstat (limited to 'lua')
-rw-r--r-- | lua/config/keymap.lua | 12 | ||||
-rw-r--r-- | lua/config/set.lua | 43 | ||||
-rw-r--r-- | lua/kickstart/plugins/debug.lua | 34 |
3 files changed, 56 insertions, 33 deletions
diff --git a/lua/config/keymap.lua b/lua/config/keymap.lua new file mode 100644 index 0000000..2280d15 --- /dev/null +++ b/lua/config/keymap.lua @@ -0,0 +1,12 @@ +-- Better default experience +vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true }) + +-- Dealing with word wrap +vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) +vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) + +-- Diagnostic +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' }) +vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) +vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) diff --git a/lua/config/set.lua b/lua/config/set.lua new file mode 100644 index 0000000..866eba4 --- /dev/null +++ b/lua/config/set.lua @@ -0,0 +1,43 @@ +-- :h vim.<dict> (dict: g, w, b, t, v, etc) for global variable help +-- and :h (vim.<dict>.)<something> for the option help (without the "()" part) +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' + +vim.o.hlsearch = true + +vim.wo.number = true +vim.wo.relativenumber = true + +vim.o.mouse = 'a' +vim.o.clipboard = 'unnamedplus' + +vim.o.breakindent = true + +-- Basically a persistent undo file, useful for undotree plugin +vim.o.undofile = true + +-- Case insensitive searching UNLESS /C or capital in search +vim.o.ignorecase = true +vim.o.smartcase = true + +vim.wo.signcolumn = 'yes' + +-- vim.o.updatetime = 250 +vim.o.timeout = true +vim.o.timeoutlen = 300 + +-- Not sure if these affect some plugins, or if the plugins set their own options +-- Set completeopt to have a better completion experience +vim.o.completeopt = 'menuone,noselect' + +vim.o.termguicolors = true + +-- Highlight on yank +local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) +vim.api.nvim_create_autocmd('TextYankPost', { + callback = function() + vim.highlight.on_yank() + end, + group = highlight_group, + pattern = '*', +}) diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index deeda56..0150db8 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -1,23 +1,9 @@ --- debug.lua --- --- Shows how to use the DAP plugin to debug your code. --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. That's why it's called --- kickstart.nvim and not kitchen-sink.nvim ;) - return { - -- NOTE: Yes, you can install new plugins here! 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well dependencies = { - -- Creates a beautiful debugger UI 'rcarriga/nvim-dap-ui', - - -- Installs the debug adapters for you 'williamboman/mason.nvim', 'jay-babu/mason-nvim-dap.nvim', - -- Add your own debuggers here 'leoluz/nvim-dap-go', }, @@ -26,23 +12,12 @@ return { local dapui = require 'dapui' require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations automatic_setup = true, - - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want 'delve', }, } - - -- Basic debugging keymaps, feel free to change to your liking! vim.keymap.set('n', '<F5>', dap.continue) vim.keymap.set('n', '<F1>', dap.step_into) vim.keymap.set('n', '<F2>', dap.step_over) @@ -52,12 +27,7 @@ return { dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') end) - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, controls = { icons = { @@ -73,14 +43,12 @@ return { }, }, } - -- toggle to see last session result. Without this ,you can't see session output in case of unhandled exception. vim.keymap.set("n", "<F7>", dapui.toggle) - + dap.listeners.after.event_initialized['dapui_config'] = dapui.open dap.listeners.before.event_terminated['dapui_config'] = dapui.close dap.listeners.before.event_exited['dapui_config'] = dapui.close - -- Install golang specific config require('dap-go').setup() end, } |