diff --git a/dot_config/nvim/lua/plugins/astrocore.lua b/dot_config/nvim/lua/plugins/astrocore.lua
deleted file mode 100644
index 17c187b..0000000
--- a/dot_config/nvim/lua/plugins/astrocore.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- AstroNvim removed; core settings live in lua/options.lua and lua/autocmds.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/astrolsp.lua b/dot_config/nvim/lua/plugins/astrolsp.lua
deleted file mode 100644
index fdc587c..0000000
--- a/dot_config/nvim/lua/plugins/astrolsp.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- AstroNvim removed; LSP config uses native vim.lsp.config in lua/lsp/
-return {}
diff --git a/dot_config/nvim/lua/plugins/astroui.lua b/dot_config/nvim/lua/plugins/astroui.lua
deleted file mode 100644
index e419856..0000000
--- a/dot_config/nvim/lua/plugins/astroui.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- AstroNvim removed; colorscheme is set via vim.cmd.colorscheme("apex-neon") in init.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/autopairs.lua b/dot_config/nvim/lua/plugins/autopairs.lua
deleted file mode 100644
index 186e2f6..0000000
--- a/dot_config/nvim/lua/plugins/autopairs.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- nvim-autopairs is configured in editing.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/blink-latex.lua b/dot_config/nvim/lua/plugins/blink-latex.lua
deleted file mode 100644
index 47c79a3..0000000
--- a/dot_config/nvim/lua/plugins/blink-latex.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- blink.cmp LaTeX sources are configured in completion.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/dap/init.lua b/dot_config/nvim/lua/plugins/dap/init.lua
index 8925db8..08bdc5a 100644
--- a/dot_config/nvim/lua/plugins/dap/init.lua
+++ b/dot_config/nvim/lua/plugins/dap/init.lua
@@ -30,6 +30,7 @@ return {
       -- Load language-specific configs
       require("plugins.dap.rust")
       require("plugins.dap.js")
+      require("plugins.dap.java")
     end,
   },
 
diff --git a/dot_config/nvim/lua/plugins/dap/java.lua b/dot_config/nvim/lua/plugins/dap/java.lua
new file mode 100644
index 0000000..394709a
--- /dev/null
+++ b/dot_config/nvim/lua/plugins/dap/java.lua
@@ -0,0 +1,5 @@
+-- Java DAP is managed by nvim-jdtls, not a standalone adapter.
+-- jdtls registers the adapter and calls setup_dap_main_class_configs()
+-- in its on_attach (see plugins/java.lua). Nothing extra needed here.
+local M = {}
+return M
diff --git a/dot_config/nvim/lua/plugins/git.lua b/dot_config/nvim/lua/plugins/git.lua
index 4eeee4c..6da2570 100644
--- a/dot_config/nvim/lua/plugins/git.lua
+++ b/dot_config/nvim/lua/plugins/git.lua
@@ -41,6 +41,16 @@ return {
     },
   },
 
+  -- Split diff view and file history
+  {
+    "sindrets/diffview.nvim",
+    cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewFileHistory" },
+    keys = {
+      { "<leader>gD", "<cmd>DiffviewOpen<cr>",          desc = "Diff working tree" },
+      { "<leader>gH", "<cmd>DiffviewFileHistory %<cr>", desc = "File history"      },
+    },
+  },
+
   -- Magit-style full git interface
   {
     "NeogitOrg/neogit",
diff --git a/dot_config/nvim/lua/plugins/java.lua b/dot_config/nvim/lua/plugins/java.lua
index 7b8ec0c..6460a8a 100644
--- a/dot_config/nvim/lua/plugins/java.lua
+++ b/dot_config/nvim/lua/plugins/java.lua
@@ -70,7 +70,18 @@ return {
           },
         },
         init_options = {
-          bundles = {},
+          bundles = (function()
+            local b = {}
+            vim.list_extend(b, vim.split(
+              vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar"),
+              "\n", { trimempty = true }
+            ))
+            vim.list_extend(b, vim.split(
+              vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/java-test/extension/server/*.jar"),
+              "\n", { trimempty = true }
+            ))
+            return b
+          end)(),
         },
         on_attach = function(client, bufnr)
           -- Enable navic for breadcrumbs
diff --git a/dot_config/nvim/lua/plugins/latex-snippets.lua b/dot_config/nvim/lua/plugins/latex-snippets.lua
deleted file mode 100644
index 742ea64..0000000
--- a/dot_config/nvim/lua/plugins/latex-snippets.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- luasnip-latex-snippets is configured in completion.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua
index 6ac3663..24b1638 100644
--- a/dot_config/nvim/lua/plugins/lsp.lua
+++ b/dot_config/nvim/lua/plugins/lsp.lua
@@ -49,6 +49,8 @@ return {
         -- DAP
         "codelldb",
         "js-debug-adapter",
+        "java-debug-adapter",
+        "java-test",
       },
       auto_update = false,
       run_on_start = true,
diff --git a/dot_config/nvim/lua/plugins/lsp_signature.lua b/dot_config/nvim/lua/plugins/lsp_signature.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/lsp_signature.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/luasnip.lua b/dot_config/nvim/lua/plugins/luasnip.lua
deleted file mode 100644
index 4ea4132..0000000
--- a/dot_config/nvim/lua/plugins/luasnip.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- LuaSnip is configured in completion.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/mason.lua b/dot_config/nvim/lua/plugins/mason.lua
deleted file mode 100644
index 5b498c9..0000000
--- a/dot_config/nvim/lua/plugins/mason.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Mason is configured in lsp.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/md-kiss.lua b/dot_config/nvim/lua/plugins/md-kiss.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/md-kiss.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/nabla.lua b/dot_config/nvim/lua/plugins/nabla.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/nabla.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/nerdy.lua b/dot_config/nvim/lua/plugins/nerdy.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/nerdy.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/none-ls.lua b/dot_config/nvim/lua/plugins/none-ls.lua
deleted file mode 100644
index d192006..0000000
--- a/dot_config/nvim/lua/plugins/none-ls.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- none-ls replaced by conform.nvim in editing.lua
-return {}
diff --git a/dot_config/nvim/lua/plugins/obsidian.lua b/dot_config/nvim/lua/plugins/obsidian.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/obsidian.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/pandoc.lua b/dot_config/nvim/lua/plugins/pandoc.lua
index 80c3daa..f9d320e 100644
--- a/dot_config/nvim/lua/plugins/pandoc.lua
+++ b/dot_config/nvim/lua/plugins/pandoc.lua
@@ -1,2 +1,19 @@
--- Removed: not part of the from-scratch config
-return {}
+return {
+  {
+    "frabjous/knap",
+    ft = { "markdown" },
+    keys = {
+      { "<leader>mp", function() require("knap").toggle_autopreviewing() end, ft = "markdown", desc = "Toggle live preview" },
+      { "<leader>mj", function() require("knap").forward_jump() end,          ft = "markdown", desc = "SyncTeX forward jump"  },
+    },
+    config = function()
+      vim.g.knap_settings = {
+        -- markdown → PDF via pandoc
+        mdoutputext          = "pdf",
+        mdtopdf              = "pandoc %docroot% -o %outputfile% --pdf-engine=lualatex",
+        mdtopdfviewerlaunch  = "zathura %outputfile%",
+        mdtopdfviewerrefresh = "none", -- zathura watches the file itself
+      }
+    end,
+  },
+}
diff --git a/dot_config/nvim/lua/plugins/presence.lua b/dot_config/nvim/lua/plugins/presence.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/presence.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/snacks.lua b/dot_config/nvim/lua/plugins/snacks.lua
deleted file mode 100644
index 80c3daa..0000000
--- a/dot_config/nvim/lua/plugins/snacks.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- Removed: not part of the from-scratch config
-return {}
diff --git a/dot_config/nvim/lua/plugins/testing.lua b/dot_config/nvim/lua/plugins/testing.lua
index 63469e8..6b7a9b8 100644
--- a/dot_config/nvim/lua/plugins/testing.lua
+++ b/dot_config/nvim/lua/plugins/testing.lua
@@ -6,6 +6,7 @@ return {
       "nvim-neotest/nvim-nio",
       "rouge8/neotest-rust",
       "rcasia/neotest-java",
+      "marilari88/neotest-vitest",
     },
     keys = {
       { "<leader>tr", function() require("neotest").run.run() end,                           desc = "Run nearest test"  },
@@ -19,9 +20,8 @@ return {
       return {
         adapters = {
           require("neotest-rust")({ args = { "--no-capture" } }),
-          require("neotest-java")({
-            ignore_wrapper = false,
-          }),
+          require("neotest-java")({ ignore_wrapper = false }),
+          require("neotest-vitest"),
         },
         output = { open_on_run = false },
         quickfix = { open = false },
diff --git a/dot_config/nvim/lua/plugins/treesitter-latex.lua b/dot_config/nvim/lua/plugins/treesitter-latex.lua
deleted file mode 100644
index 9760d91..0000000
--- a/dot_config/nvim/lua/plugins/treesitter-latex.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- nvim-treesitter dropped; latex parser available via system package or tree-sitter-cli
-return {}