diff options
| author | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-06-14 16:58:18 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-06-14 16:58:18 -0400 |
| commit | c45579674c8ea5c1022e614774a979e11a367983 (patch) | |
| tree | 968f10569d8fee8f870e67fe447cdb7fd157334a /nvim | |
| parent | add barbar for tabs (diff) | |
| download | dotfiles-c45579674c8ea5c1022e614774a979e11a367983.zip | |
update dotfiles
Diffstat (limited to 'nvim')
| -rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 20 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/config/keymaps.lua | 11 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/lsp.lua | 27 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/telescope.lua | 1 |
4 files changed, 31 insertions, 28 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index c61ca2b..3d93509 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -2,28 +2,28 @@ "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, - "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, + "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, + "gitsigns.nvim": { "branch": "main", "commit": "731b581428ec6c1ccb451b95190ebbc6d7006db7" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "d3ada78a941ff09d21dd9b4c2ec36f0cf44a4ccb" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, - "mini.nvim": { "branch": "main", "commit": "ecbb9b1e2223a04171388887765e7695f5a0c132" }, + "mini.nvim": { "branch": "main", "commit": "3f5d06a6f710966cb93baaadc4897eeb6d6210e5" }, "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, - "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" }, + "nvim-dap": { "branch": "master", "commit": "40a8189b8a57664a1850b0823fdcb3ac95b9f635" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" }, - "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, + "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" }, + "nvim-lspconfig": { "branch": "master", "commit": "7ad4a11cc5742774877c529fcfb2702f7caf75e4" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua index 617f3b9..baa81f8 100644 --- a/nvim/.config/nvim/lua/config/keymaps.lua +++ b/nvim/.config/nvim/lua/config/keymaps.lua @@ -40,3 +40,14 @@ map('n', '<C-S-h>', '<C-w>H', { desc = 'Move window to the left' }) map('n', '<C-S-l>', '<C-w>L', { desc = 'Move window to the right' }) map('n', '<C-S-j>', '<C-w>J', { desc = 'Move window to the lower' }) map('n', '<C-S-k>', '<C-w>K', { desc = 'Move window to the upper' }) + +local function confirm_and_delete_buffer() + local confirm = vim.fn.confirm("Delete buffer and file?", "&Y\n&N", 2) + + if confirm == 1 then + os.remove(vim.fn.expand "%") + vim.api.nvim_buf_delete(0, { force = true }) + end +end + +map('n', '<leader>df', confirm_and_delete_buffer) diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index f7b9a2a..ced27a2 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -173,7 +173,15 @@ return { -- See `:help lspconfig-all` for a list of all the pre-configured LSPs clangd = {}, gopls = {}, - pyright = {}, + pyright = { + settings = { + python = { + analysis = { + autoImportCompletions = true, + }, + }, + }, + }, rust_analyzer = {}, -- NOTE: https://github.com/pmizio/typescript-tools.nvim may be a better -- LSP to use here at some point. @@ -216,23 +224,6 @@ return { -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - - -- When we're editing the monolith project, the dependencies are so old - -- we can't install them locally on an ARM mac. Therefore, we want to use - -- a pyright server *within* the docker container. - print("[DEBUG] server_name: " .. server_name) - if server_name == "pyright" then - local cwd = vim.loop.cwd() - print("[DEBUG] cwd: " .. cwd) - if cwd and cwd:match("monolith") then - print("[DEBUG] Using Dockerized Pyright setup") - vim.notify("[LSP] Using Docker for pyright in " .. cwd, vim.log.levels.INFO) - server.cmd = { - "docker", "exec", "-i", "monolith-web", "pyright-langserver", "--stdio" - } - end - end - require('lspconfig')[server_name].setup(server) end, }, diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua index 8ca3d26..5157aea 100644 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -64,6 +64,7 @@ return { vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', '<leader>sc', builtin.commands, { desc = '[S]earch [C]ommands'}) vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) |