From 63a39b70fe559a7a552c12283305865a26e03a46 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Tue, 13 Jan 2026 09:53:12 +0100 Subject: [PATCH 01/10] Add bullets.vim, fix neogit mapping --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 7d1d651..9f951c6 100644 --- a/init.lua +++ b/init.lua @@ -337,6 +337,7 @@ require('lazy').setup({ } }}, 'ojroques/nvim-bufdel', + 'bullets-vim/bullets.vim', {'stevearc/conform.nvim', config = function () require'conform'.setup { formatters_by_ft = { @@ -962,8 +963,6 @@ require('lazy').setup({ } }}, {'tpope/vim-fugitive', lazy = false, dependencies = {'tpope/vim-rhubarb', 'shumphrey/fugitive-gitlab.vim'}, keys = { - {'g', 'vert Git', desc = 'Git status'}, - {'G', 'tab Git', desc = 'Git status (tab)'}, }}, {'harrisoncramer/gitlab.nvim', dependencies = { 'MunifTanjim/nui.nvim', @@ -1070,6 +1069,7 @@ require('lazy').setup({ {'g', 'Neogit', { desc = 'Neogit' }} }}, {'rcarriga/nvim-notify', dependencies = {'nvim-telescope/telescope.nvim'}, opts = { + background_colour = '#FFFFFF', stages = 'fade', render = 'compact', }, config = function(_, opts) From 21f65c1ed252821bf2f8416f57e03917931fbb32 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 23 Feb 2026 13:20:31 +0100 Subject: [PATCH 02/10] Make format on save opt-in, remove jdtls, add ruff --- init.lua | 85 ++++++++------------------------------------------------ 1 file changed, 12 insertions(+), 73 deletions(-) diff --git a/init.lua b/init.lua index 9f951c6..5e7efdc 100644 --- a/init.lua +++ b/init.lua @@ -343,12 +343,15 @@ require('lazy').setup({ formatters_by_ft = { html = {"prettier"}, }, - format_on_save = { - lsp_fallback = true, - filter = function(client) - return client.name == 'rust-analyzer' + format_on_save = function() + if vim.g.format_on_save then + return { + lsp_fallback = true + } + else + return nil end - } + end, } vim.api.nvim_create_user_command( 'Conform', @@ -450,6 +453,7 @@ require('lazy').setup({ 'jsonls', 'lemminx', 'lua_ls', + 'ruff', 'ty', 'vimls', 'yamlls', @@ -534,74 +538,6 @@ require('lazy').setup({ }, }}, {'Saghen/blink.compat', lazy = true, opts = {}}, - {'mfussenegger/nvim-jdtls', dependencies = {'neovim/nvim-lspconfig'}, config = function() - au('FileType', { - pattern = 'java', - callback = function() - local jdtls = require 'jdtls' - jdtls.tests = require'jdtls.tests' - jdtls.dap = require'jdtls.dap' - _G.jdt = jdtls - local lspconfig = require'lspconfig' - - local root_dir = jdtls.setup.find_root({'.git', 'mvnw', 'gradlew'}) - - local config = { - -- The command to launch jdtls with - cmd = { - 'jdtls', - -- Enable logging - '--jvm-arg=-Dlog.level=ALL', - '--jvm-arg=-Dlog.protocol=true', - -- Enable lombok - '--jvm-arg=-javaagent:' .. mason_path('jdtls') .. '/lombok.jar', - -- Shut the warning up - '--jvm-arg=-XX:+EnableDynamicAgentLoading', - -- store workpace data in ~/.local/share/eclipse/ - '-data', vim.fn.expand('~/.local/share/eclipse/') .. vim.fn.fnamemodify(root_dir, ':p:h:t') - }, - - root_dir = root_dir, - - capabilities = lspconfig.util.default_config.capabilities, - - settings = { - java = { - autobuild = { enabled = false }, - }, - }, - - init_options = { - -- JDTLS plugins - bundles = (function() - -- add java-debug-adapter - local bundles = { - vim.fn.glob(mason_path'java-debug-adapter' .. '/extension/server/com.microsoft.java.debug.plugin-*.jar', true) - } - -- add java-test - vim.list_extend(bundles, vim.split( - vim.fn.glob(vim.fn.expand('~/.local/share/vscode-java-test/server') .. '/*.jar', true), - '\n' - )) - - return bundles - end)(), - }, - - on_attach = function(client, bufnr) - jdtls.setup_dap() - vim.keymap.set('n', 'lo', jdtls.organize_imports, { desc = 'Organize imports', buffer = bufnr }) - vim.keymap.set('n', 'Xm', jdtls.test_nearest_method, { desc = 'Test nearest method', buffer = bufnr }) - vim.keymap.set('n', 'Xc', jdtls.test_class, { desc = 'Test class', buffer = bufnr }) - vim.keymap.set('n', 'Xg', jdtls.tests.goto_subjects, { desc = 'Go to test', buffer = bufnr }) - vim.keymap.set('n', 'Xb', 'JdtCompile full', { desc = 'Build', buffer = bufnr }) - end, - } - - jdtls.start_or_attach(config) - end - }) - end}, {'mrcjkb/rustaceanvim', config = function () vim.g.rustaceanvim = { server = { @@ -1102,6 +1038,9 @@ require('lazy').setup({ } } end}, + {'michaelb/sniprun', lazy = false, build = 'sh install.sh', keys = { + {'p', 'SnipRun', mode = {'v', 'n'}, desc = 'Run snippet'}, + }}, {'mhinz/vim-startify', init = function() -- Don't change working directory when opening files g.startify_change_to_dir = 0 From 86f37208ba4769a265e079388aa0189369502baa Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 9 Mar 2026 10:54:39 +0100 Subject: [PATCH 03/10] Add octo.nvim --- init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init.lua b/init.lua index 5e7efdc..5f6413b 100644 --- a/init.lua +++ b/init.lua @@ -1013,6 +1013,11 @@ require('lazy').setup({ vim.notify = require'notify' require'telescope'.load_extension('notify') end}, + {'pwntester/octo.nvim', dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons'}, opts = { + picker = 'telescope', + -- Allow using :Octo without arguments + enable_builtin = true, + }} {'stevearc/overseer.nvim', dependencies = {'folke/which-key.nvim'}, opts = { task_list = { bindings = { From 4e817e795533bb6187a841ba2f488449cf26fb50 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 9 Mar 2026 10:57:58 +0100 Subject: [PATCH 04/10] Add nixd to the language server list --- init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/init.lua b/init.lua index 5f6413b..f295818 100644 --- a/init.lua +++ b/init.lua @@ -453,6 +453,7 @@ require('lazy').setup({ 'jsonls', 'lemminx', 'lua_ls', + 'nixd', 'ruff', 'ty', 'vimls', From d7c43ebf4c75c75c6de5bd9eb711133e6d81e588 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 9 Mar 2026 10:58:32 +0100 Subject: [PATCH 05/10] Fix nvim-treesitter setup --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index f295818..8735dda 100644 --- a/init.lua +++ b/init.lua @@ -399,7 +399,7 @@ require('lazy').setup({ highlight = { enable = true, disable = {'rust', 'bash'} }, incremental_selection = { enable = true }, }, config = function(_, opts) - require'nvim-treesitter.configs'.setup(opts) + require'nvim-treesitter'.setup(opts) end}, 'windwp/nvim-ts-autotag', {'kevinhwang91/nvim-ufo', dependencies = 'kevinhwang91/promise-async', config = function() From e8b2978247a21c653dca880b944a46fa77875765 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 16 Mar 2026 10:07:22 +0100 Subject: [PATCH 06/10] Remove redundant fallback fonts --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 8735dda..4c070e7 100644 --- a/init.lua +++ b/init.lua @@ -12,7 +12,7 @@ local opt = vim.opt local workman = false -- Set font -o.guifont = 'IosevkaTermSlab Nerd Font,IosevkaTerm Nerd Font,Iosevka Term Slab,Iosevka:h10:#e-subpixelantialias' +o.guifont = 'IosevkaTermSlab Nerd Font:h11:#e-subpixelantialias' g.neovide_floating_z_height = 1 g.neovide_confirm_quit = true -- Confirm closing neovide window when changes are unsaved g.neovide_cursor_smooth_blink = true From f5389e636720be7fe33eb31bcd70bedec1250c75 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 16 Mar 2026 10:07:44 +0100 Subject: [PATCH 07/10] Fix missing comma --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 4c070e7..5127670 100644 --- a/init.lua +++ b/init.lua @@ -1018,7 +1018,7 @@ require('lazy').setup({ picker = 'telescope', -- Allow using :Octo without arguments enable_builtin = true, - }} + }}, {'stevearc/overseer.nvim', dependencies = {'folke/which-key.nvim'}, opts = { task_list = { bindings = { From 84ce078aec34f63b5248fb2914a685bcd13dcb5d Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 16 Mar 2026 10:07:52 +0100 Subject: [PATCH 08/10] Remove iswap.nvim as it no longer works --- init.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/init.lua b/init.lua index 5127670..8fb900a 100644 --- a/init.lua +++ b/init.lua @@ -370,10 +370,6 @@ require('lazy').setup({ end}, 'direnv/direnv.vim', 'jbyuki/instant.nvim', - {'mizlan/iswap.nvim', config = function() - require'iswap'.setup {} - vim.keymap.set('', 's', 'ISwapWith', { desc = 'Swap' }) - end}, {'windwp/nvim-projectconfig', opts = { -- Load project configuration when changing directory autocmd = true, From 29f702a0f3ac2a6cedc326b9563093b3f67cc5b5 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 16 Mar 2026 10:08:14 +0100 Subject: [PATCH 09/10] Switch to rustaceanvim's neotest adapter --- init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 8fb900a..b4b5eec 100644 --- a/init.lua +++ b/init.lua @@ -1162,13 +1162,12 @@ require('lazy').setup({ require'telescope'.load_extension('undo') end}, {'nvim-neotest/neotest', dependencies = { - 'nvim-neotest/neotest-vim-test', - 'rouge8/neotest-rust', + --'nvim-neotest/neotest-vim-test', }, config = function() require'neotest'.setup { adapters = { - require'neotest-vim-test' { allow_file_types = {'java'} }, - require'neotest-rust' {}, + --require'neotest-vim-test' { allow_file_types = {'java'} }, + require'rustaceanvim.neotest' } } require'which-key'.register { From bab0d5a5b253bb679c602a7d926a292ae8fffe91 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Mon, 16 Mar 2026 10:28:13 +0100 Subject: [PATCH 10/10] Switch to maintained fork of diffview.nvim --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index b4b5eec..656f471 100644 --- a/init.lua +++ b/init.lua @@ -845,7 +845,7 @@ require('lazy').setup({ {'lucaSartore/nvim-dap-exception-breakpoints', dependencies = {'mfussenegger/nvim-dap'}, config = function() vim.keymap.set('n', 'de', require'nvim-dap-exception-breakpoints', { desc = 'Exception breakpoints'}) end}, - {'sindrets/diffview.nvim', opts = { + {'dlyongemallo/diffview.nvim', opts = { -- Use nicer highlighting for diffs enhanced_diff_hl = true, win_config = {