Add leftover plugins from old config · bas.sh/dotfiles@ffcb694

+20 -11

nvim/.config/nvim/lazy-lock.json

··· 1 1 { 2 2 "42header_codam": { "branch": "master", "commit": "727e299117075f87b154a40f2e4ec8a48594d7de" }, 3 + "c_formatter_42.vim": { "branch": "master", "commit": "7a2d50f6683d6f58a2c95375524b4406d6bdc2c3" }, 3 4 "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, 4 5 "comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, 5 6 "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, 6 - "dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" }, 7 + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, 8 + "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, 7 9 "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, 8 10 "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, 9 11 "guard-collection": { "branch": "main", "commit": "13e00d19f418d68977c6bc803f0d23d09dce580d" }, 10 12 "guard.nvim": { "branch": "main", "commit": "394317c25a6b0f0e064aebcfcf902e46fb0a04ba" }, 11 13 "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" }, 12 - "inc-rename.nvim": { "branch": "main", "commit": "e346532860e1896b1085815e854ed14e2f066a2c" }, 14 + "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, 13 15 "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, 14 - "lsp-zero.nvim": { "branch": "v3.x", "commit": "b9044716e675354357ab8269ccf7bd0fcdc0991e" }, 15 - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, 16 - "luasnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, 16 + "lsp-zero.nvim": { "branch": "v3.x", "commit": "ae66805dcfcc473aa30f317549fd6928c330adce" }, 17 + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, 18 + "luasnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, 17 19 "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, 18 20 "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, 19 21 "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, 20 - "neodev.nvim": { "branch": "main", "commit": "269051a7093fa481128904a33a6c4e1ca8de4340" }, 22 + "neodev.nvim": { "branch": "main", "commit": "8526ce7de23e04735827a4e3f78ff634880181c5" }, 23 + "neogit": { "branch": "master", "commit": "3718664bb62e89930f0c3c836188c2a4f44fa119" }, 21 24 "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, 22 25 "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, 23 26 "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, 24 27 "nrpattern.nvim": { "branch": "master", "commit": "f862ce687761078ef3155688151c55f69d28453e" }, 25 - "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, 28 + "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, 26 29 "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, 27 30 "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, 31 + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, 32 + "nvim-dap-projects": { "branch": "main", "commit": "f319ffd99c6c8a0b930bcfc4bee0c751ffbf5808" }, 33 + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, 34 + "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" }, 28 35 "nvim-hlslens": { "branch": "main", "commit": "8ffc64bb6b624612cf762982b92633f283f7a715" }, 29 36 "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, 30 37 "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" }, 31 - "nvim-notify": { "branch": "master", "commit": "27a6649ba6b22828ccc67c913f95a5407a2d8bec" }, 38 + "nvim-notify": { "branch": "master", "commit": "ebcdd8219e2a2cbc0a4bef68002f6867f1fde269" }, 32 39 "nvim-pqf": { "branch": "main", "commit": "ba0e291cb5c0249838132e197dac082777bdc7d6" }, 33 40 "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, 34 41 "nvim-surround": { "branch": "main", "commit": "633a0ab03159569a66b65671b0ffb1a6aed6cf18" }, 35 - "nvim-treesitter": { "branch": "master", "commit": "cd4de5f7b14b878ac8f5c459c9d579cc58ba1ac5" }, 42 + "nvim-treesitter": { "branch": "master", "commit": "7a2c6211d6f550988fccd8800de8426d5e480a2d" }, 36 43 "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, 37 - "nvim-treesitter-textobjects": { "branch": "master", "commit": "4795812635c7b90cec41637314862b0a229d2b24" }, 44 + "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, 38 45 "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, 39 46 "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, 40 47 "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, 41 48 "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, 42 49 "qf_helper.nvim": { "branch": "master", "commit": "582838f2601c6a7517b010d8acafba6a1eb4c14a" }, 43 50 "schemastore.nvim": { "branch": "main", "commit": "771c9517bf36f431361cbaac1ddc8499c7e5c5d3" }, 51 + "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, 52 + "swap-split.nvim": { "branch": "main", "commit": "d2c705d279b384a6b47a67f85a6dc8569c4d775d" }, 44 53 "tabout.nvim": { "branch": "master", "commit": "0d275c8d25f32457e67b5c66d6ae43f26a61bce5" }, 45 54 "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, 46 55 "toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" }, 47 56 "treesj": { "branch": "main", "commit": "1d6e89f4790aa04eaae38fa9460a3ee191961c96" }, 48 57 "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, 49 - "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "8fb4db507ec80de952ac49f12ae76b3190f485bc" }, 58 + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "4f01418547c7e27c3aa779da8cc30c9998dc6843" }, 50 59 "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } 51 60 }

+1 -6

nvim/.config/nvim/lua/keymaps.lua

··· 19 19 map("t", "<M-k>", "<Cmd>wincmd k<CR>") 20 20 map("t", "<M-l>", "<Cmd>wincmd l<CR>") 21 21 22 - -- why does this not work :( 23 - --map('i', '<Esc>', 'pumvisible() ? "<C-e><Esc>" : "<Esc>"', { silent = true, expr = true } ) 24 - --map('i', '<C-c>', 'pumvisible() ? "<C-e><C-c>" : "<C-c>"', { silent = true, expr = true } ) 25 - --map('i', '<BS>', 'pumvisible() ? "<C-e><BS>" : "<BS>"', { silent = true, expr = true } ) 26 - --map('i', '<CR>', 'pumvisible() ? (complete_info().selected == -1 ? "<C-e><CR>" : "<C-y>") : "<CR>', { silent = true, expr = true } ) 27 22 vim.cmd('ino <silent><expr> <Esc> pumvisible() ? "\\<C-e><Esc>" : "\\<Esc>"') 28 23 vim.cmd('ino <silent><expr> <C-c> pumvisible() ? "\\<C-e><C-c>" : "\\<C-c>"') 29 24 vim.cmd('ino <silent><expr> <BS> pumvisible() ? "\\<C-e><BS>" : "\\<BS>"') ··· 31 26 'ino <silent><expr> <CR> pumvisible() ? (complete_info().selected == -1 ? "\\<C-e><CR>" : "\\<C-y>") : "\\<CR>"' 32 27 ) 33 28 34 - --map('n', '<leader>s', '<cmd>SwapSplit<CR>') 29 + map("n", "<M-s>", "<cmd>SwapSplit<CR>") 35 30 36 31 map("n", "<Esc>", function() 37 32 if vim.v.hlsearch == 1 then

+77 -2

nvim/.config/nvim/lua/plugins.lua

··· 220 220 local cmp = require("cmp") 221 221 local cmp_format = require("lsp-zero").cmp_format() 222 222 223 - ---@diagnostic disable-next-line: missing-fields 224 223 cmp.setup({ 225 224 sources = { 226 225 -- { name = "copilot" }, ··· 230 229 ["<C-Space>"] = cmp.mapping.complete(), 231 230 }), 232 231 formatting = cmp_format, 232 + window = { 233 + completion = cmp.config.window.bordered(), 234 + documentation = cmp.config.window.bordered(), 235 + }, 233 236 }) 234 237 235 238 lsp_zero.on_attach(function(client, bufnr) ··· 409 412 bottom_search = true, 410 413 long_message_to_split = true, 411 414 inc_rename = true, 415 + lsp_doc_border = true, 412 416 }, 413 417 }, 414 418 }, ··· 541 545 }, 542 546 543 547 { 548 + "TimUntersberger/neogit", 549 + opts = { 550 + commit_popup = { 551 + kind = "floating", 552 + }, 553 + popup = { 554 + kind = "floating", 555 + }, 556 + }, 557 + }, 558 + 559 + { 560 + "sindrets/diffview.nvim", 561 + dependencies = { "nvim-lua/plenary.nvim" }, 562 + }, 563 + 564 + { 544 565 "abecodes/tabout.nvim", 545 566 config = true, 546 567 }, ··· 552 573 553 574 { 554 575 "NvChad/nvim-colorizer.lua", 555 - config = true, 576 + opts = { 577 + filetypes = { "*", "!lazy" }, 578 + RGB = true, -- #RGB hex codes 579 + RRGGBB = true, -- #RRGGBB hex codes 580 + names = false, -- "Name" codes like Blue or blue 581 + RRGGBBAA = false, -- #RRGGBBAA hex codes 582 + AARRGGBB = false, -- 0xAARRGGBB hex codes 583 + rgb_fn = true, -- CSS rgb() and rgba() functions 584 + hsl_fn = true, -- CSS hsl() and hsla() functions 585 + css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB 586 + css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn 587 + -- Available modes for `mode`: foreground, background, virtualtext 588 + mode = "background", 589 + -- Available methods are false / true / "normal" / "lsp" / "both" 590 + -- True is same as normal 591 + tailwind = "both", 592 + sass = { 593 + enable = true, 594 + parsers = { "css" }, 595 + }, 596 + virtualtext = "■", 597 + -- update color values even if buffer is not focused 598 + -- example use: cmp_menu, cmp_docs 599 + always_update = false, 600 + }, 601 + }, 602 + 603 + { 604 + "xorid/swap-split.nvim", 605 + opts = { 606 + ignore_filetypes = { "NvimTree", "notify", "toggleterm", "Trouble", "qf" }, 607 + }, 608 + }, 609 + 610 + { 611 + "lambdalisue/suda.vim", 612 + init = function() 613 + vim.g.suda_smart_edit = true 614 + end, 615 + }, 616 + 617 + { "cacharle/c_formatter_42.vim" }, 618 + 619 + { 620 + "mfussenegger/nvim-dap", 621 + dependencies = { 622 + "rcarriga/nvim-dap-ui", 623 + "theHamsta/nvim-dap-virtual-text", 624 + { 625 + "ldelossa/nvim-dap-projects", 626 + config = function() 627 + require("nvim-dap-projects").search_project_config() 628 + end, 629 + }, 630 + }, 556 631 }, 557 632 })

-291

nvim/.config/nvim/lua/tmp.lua

··· 1 - require('packer').startup { 2 - function(use) 3 - use { 4 - 'pwntester/octo.nvim', 5 - requires = { 6 - 'nvim-lua/plenary.nvim', 7 - 'nvim-telescope/telescope.nvim', 8 - 'kyazdani42/nvim-web-devicons', 9 - }, 10 - config = function() 11 - require('octo').setup() 12 - end, 13 - } 14 - 15 - use { 16 - 'kevinhwang91/nvim-hlslens', 17 - config = function() 18 - require('hlslens').setup { 19 - calm_down = true, 20 - } 21 - end, 22 - } 23 - 24 - -- use { 'tpope/vim-repeat' } 25 - 26 - use { 27 - 'akinsho/toggleterm.nvim', 28 - config = function() 29 - require('toggleterm').setup { 30 - shade_terminals = false, 31 - } 32 - end, 33 - } 34 - 35 - -- use { 36 - -- 'VonHeikemen/lsp-zero.nvim', 37 - -- requires = { 38 - -- 'neovim/nvim-lspconfig', 39 - -- 'williamboman/mason.nvim', 40 - -- 'williamboman/mason-lspconfig.nvim', 41 - 42 - -- 'hrsh7th/nvim-cmp', 43 - -- 'hrsh7th/cmp-buffer', 44 - -- 'hrsh7th/cmp-path', 45 - -- 'saadparwaiz1/cmp_luasnip', 46 - -- 'hrsh7th/cmp-nvim-lsp', 47 - -- 'hrsh7th/cmp-nvim-lua', 48 - 49 - -- 'L3MON4D3/LuaSnip', 50 - -- 'rafamadriz/friendly-snippets', 51 - -- }, 52 - -- config = function() 53 - -- local lsp = require('lsp-zero') 54 - 55 - -- lsp.preset('recommended') 56 - -- lsp.setup() 57 - -- end 58 - -- } 59 - use { 60 - 'williamboman/mason.nvim', 61 - config = function() 62 - require('mason').setup() 63 - end, 64 - } 65 - 66 - use { 67 - 'williamboman/mason-lspconfig.nvim', 68 - requires = { 'neovim/nvim-lspconfig', 'b0o/SchemaStore.nvim' }, 69 - after = { 'coq_nvim', 'neodev.nvim', 'mason.nvim' }, 70 - config = function() 71 - local lsp_formatting = function(bufnr) 72 - vim.lsp.buf.format({ 73 - filter = function(client) 74 - return client.name == 'null-ls' or client.name == 'lua_ls' or client.name == 'tsserver' or 75 - client.name == 'jsonnet_ls' 76 - end, 77 - bufnr = bufnr, 78 - }) 79 - end 80 - local augroup = vim.api.nvim_create_augroup('LspFormatting', {}) 81 - local on_attach = function(client, bufnr) 82 - if client.supports_method('textDocument/formatting') then 83 - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) 84 - vim.api.nvim_create_autocmd('BufWritePre', { 85 - group = augroup, 86 - buffer = bufnr, 87 - callback = function() 88 - if client.name ~= 'clangd' then 89 - lsp_formatting(bufnr) 90 - end 91 - end, 92 - }) 93 - end 94 - end 95 - local lsp_opts = { 96 - on_attach = on_attach, 97 - settings = { 98 - Lua = { 99 - format = { 100 - enable = true, 101 - }, 102 - workspace = { 103 - library = { 104 - '${3rd}/luassert/library', 105 - }, 106 - checkThirdParty = false, 107 - }, 108 - }, 109 - json = { 110 - schemas = require('schemastore').json.schemas(), 111 - validate = { enable = true }, 112 - }, 113 - }, 114 - } 115 - local coq = require('coq') 116 - require('mason-lspconfig').setup() 117 - require('mason-lspconfig').setup_handlers { 118 - function(server_name) 119 - require('lspconfig')[server_name].setup(coq.lsp_ensure_capabilities(lsp_opts)) 120 - end, 121 - } 122 - end, 123 - } 124 - 125 - use { 126 - 'jayp0521/mason-nvim-dap.nvim', 127 - after = { 'mason.nvim', 'nvim-dap' }, 128 - config = function() 129 - require('mason-nvim-dap').setup({ 130 - ensure_installed = { 'cppdbg' }, 131 - handlers = { 132 - function(config) 133 - require('mason-nvim-dap').default_setup(config) 134 - end, 135 - cppdbg = function(config) 136 - config.configurations = { 137 - { 138 - name = 'Launch file', 139 - type = 'cppdbg', 140 - request = 'launch', 141 - program = function() 142 - return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') 143 - end, 144 - cwd = '${workspaceFolder}', 145 - stopAtEntry = true, 146 - MIMode = 'gdb', 147 - }, 148 - } 149 - 150 - require('mason-nvim-dap').default_setup(config) 151 - end, 152 - }, 153 - }) 154 - end, 155 - } 156 - 157 - use { 158 - 'ms-jpq/coq_nvim', 159 - requires = { 'ms-jpq/coq.artifacts' }, 160 - config = function() 161 - vim.g.coq_settings = { 162 - auto_start = 'shut-up', 163 - display = { icons = { mode = 'short' } }, 164 - limits = { completion_auto_timeout = 0.5 }, 165 - keymap = { recommended = false }, 166 - } 167 - require('coq') 168 - end, 169 - } 170 - 171 - use { 172 - 'ms-jpq/coq.thirdparty', 173 - after = { 'coq_nvim' }, 174 - config = function() 175 - require('coq_3p') {} 176 - end, 177 - } 178 - 179 - use { 'tpope/vim-sleuth' } 180 - 181 - use { 182 - 'sindrets/diffview.nvim', 183 - requires = { 'nvim-lua/plenary.nvim' }, 184 - } 185 - 186 - use { 187 - 'TimUntersberger/neogit', 188 - config = function() 189 - require('neogit').setup { 190 - commit_popup = { 191 - kind = 'floating', 192 - }, 193 - popup = { 194 - kind = 'floating', 195 - }, 196 - } 197 - end, 198 - } 199 - 200 - use { 201 - 'lewis6991/hover.nvim', 202 - config = function() 203 - require('hover').setup { 204 - init = function() 205 - require('hover.providers.lsp') 206 - end, 207 - } 208 - vim.keymap.set('n', 'K', require('hover').hover, { desc = 'hover.nvim' }) 209 - vim.keymap.set('n', 'gK', require('hover').hover_select, { desc = 'hover.nvim select' }) 210 - end, 211 - } 212 - 213 - use { 214 - 'lambdalisue/suda.vim', 215 - config = function() 216 - vim.g.suda_smart_edit = true 217 - end, 218 - } 219 - 220 - use { 'cacharle/c_formatter_42.vim' } 221 - 222 - use { 'mfussenegger/nvim-dap' } 223 - 224 - use { 225 - 'ldelossa/nvim-dap-projects', 226 - requires = { 'nvim-dap' }, 227 - config = function() 228 - require('nvim-dap-projects').search_project_config() 229 - end, 230 - } 231 - 232 - use { 233 - 'rcarriga/nvim-dap-ui', 234 - after = { 'nvim-dap' }, 235 - config = function() 236 - require('dapui').setup() 237 - end, 238 - } 239 - 240 - use { 241 - 'theHamsta/nvim-dap-virtual-text', 242 - config = function() 243 - require('nvim-dap-virtual-text').setup {} 244 - end, 245 - } 246 - 247 - use { 248 - 'jose-elias-alvarez/null-ls.nvim', 249 - requires = { 'nvim-lua/plenary.nvim' }, 250 - config = function() 251 - local null_ls = require('null-ls') 252 - null_ls.setup({ 253 - sources = { 254 - null_ls.builtins.formatting.prettierd, 255 - }, 256 - }) 257 - end, 258 - } 259 - 260 - use { 'gpanders/editorconfig.nvim' } 261 - 262 - use { 263 - 'akinsho/git-conflict.nvim', 264 - after = { 'nord.nvim' }, 265 - config = function() 266 - require('git-conflict').setup { 267 - default_mappings = { 268 - ours = '<Leader>o', 269 - theirs = '<Leader>t', 270 - none = '<Leader>0', 271 - both = '<Leader>b', 272 - next = '<Leader>n', 273 - prev = '<Leader>p', 274 - }, 275 - } 276 - end, 277 - } 278 - 279 - use { 'xorid/swap-split.nvim' } 280 - 281 - if packer_bootstrap then 282 - require('packer').sync() 283 - end 284 - end, 285 - config = { 286 - display = { 287 - -- open_cmd = 'vnew \\[packer\\]', 288 - open_fn = require('packer.util').float, 289 - }, 290 - }, 291 - }

Configure Feed

Configure Feed