From fdd75214837275a1fe37ba991e45bd1ae4fa5814 Mon Sep 17 00:00:00 2001 From: Nick Moore Date: Fri, 21 Nov 2025 09:54:29 -0600 Subject: Updating config a little more --- nvim/.config/nvim/init.lua | 62 +++------------------- nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua | 2 +- nvim/.config/nvim/lua/kickstart/plugins/debug.lua | 44 ++++++++++++--- 3 files changed, 45 insertions(+), 63 deletions(-) (limited to 'nvim') diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 18523e9..0f92497 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,7 +1,3 @@ ---[[ --- Setup initial configuration ---]] - -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) @@ -15,75 +11,37 @@ vim.g.have_nerd_font = true -- See `:help vim.opt` -- NOTE: You can change these options as you wish! -- For more options, you can see `:help option-list` - --- Make line numbers default vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! vim.opt.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' - --- Don't show the mode, since it's already in the status line vim.opt.showmode = false - vim.o.winborder = 'rounded' - --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` vim.schedule(function() vim.opt.clipboard = 'unnamedplus' end) - --- Enable break indent vim.opt.breakindent = true - --- Save undo history vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.opt.ignorecase = true vim.opt.smartcase = true - --- Keep signcolumn on by default vim.opt.signcolumn = 'yes' - --- Decrease update time vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened vim.opt.splitright = true vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` vim.opt.list = true vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - --- Preview substitutions live, as you type! vim.opt.inccommand = 'split' - --- Show which line your cursor is on vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), --- instead raise a dialog asking if you wish to save the current file(s) --- See `:help 'confirm'` +vim.opt.scrolloff = 30 vim.opt.confirm = true - --- Set the column width to 80 to match coding conventions vim.opt.colorcolumn = '120' +-- transparent background +vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'FloatBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'Pmenu', { bg = 'none' }) + -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` @@ -102,12 +60,6 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn -- or just use to exit terminal mode vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') - -- Keybinds to make split navigation easier. -- Use CTRL+ to switch between windows -- diff --git a/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua b/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua index ef3d14a..ecd7455 100644 --- a/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua +++ b/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua @@ -12,7 +12,7 @@ return { -- Color whole diagnostic text or only underline vim.g.doom_one_diagnostics_text_color = false -- Enable transparent background - vim.g.doom_one_transparent_background = false + vim.g.doom_one_transparent_background = true -- Pumblend transparency vim.g.doom_one_pumblend_enable = false diff --git a/nvim/.config/nvim/lua/kickstart/plugins/debug.lua b/nvim/.config/nvim/lua/kickstart/plugins/debug.lua index 753cb0c..36e2589 100644 --- a/nvim/.config/nvim/lua/kickstart/plugins/debug.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/debug.lua @@ -23,6 +23,7 @@ return { -- Add your own debuggers here 'leoluz/nvim-dap-go', + 'mfussenegger/nvim-dap-python', }, keys = { -- Basic debugging keymaps, feel free to change to your liking! @@ -95,6 +96,7 @@ return { ensure_installed = { -- Update this to ensure that you have the debuggers for the langs you want 'delve', + 'debugpy', }, } @@ -136,13 +138,41 @@ return { 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 { - delve = { - -- On Windows delve must be run attached or it crashes. - -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring - detached = vim.fn.has 'win32' == 0, + dap.configurations = + { + python = { + { + -- The first three options are required by nvim-dap + type = 'python', -- the type here established the link to the adapter definition: `dap.adapters.python` + request = 'launch', + name = 'Launch file', + + -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options + + program = '${file}', -- This configuration will launch the current file if used. + pythonPath = function() + -- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself. + -- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within. + -- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable. + local cwd = vim.fn.getcwd() + if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then + return cwd .. '/venv/bin/python' + elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then + return cwd .. '/.venv/bin/python' + else + return '/usr/bin/python' + end + end, + }, + }, }, - } + -- Install golang specific config + require('dap-go').setup { + delve = { + -- On Windows delve must be run attached or it crashes. + -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring + detached = vim.fn.has 'win32' == 0, + }, + } end, } -- cgit v1.3