Merge branch 'AstroNvim:main' into dev-copilot

Author: std-enigma

lua/astrocommunity/pack/diff-keybindings/README.md

@@ -0,0 +1,3 @@
+# `diff` keybindings
+
+Adds keybindings for the `diff` command under `<Leader> D`.

lua/astrocommunity/pack/diff-keybindings/init.lua

@@ -0,0 +1,23 @@
+local menu = "<Leader>D"
+return {
+  {
+    "AstroNvim/astrocore",
+    ---@type AstroCoreOpts
+    opts = {
+      mappings = {
+        n = {
+          [menu] = { desc = "  Diff" },
+          [menu .. "v"] = { "<cmd>vert diffsplit<cr>", desc = "  Vertical split diff" },
+          [menu .. "h"] = { "<cmd>diffsplit<cr>", desc = "  Horizontal split diff" },
+          [menu .. "t"] = { "<cmd>diffthis<cr>", desc = "  Diff this" },
+          [menu .. "p"] = { "<cmd>diffpatch<cr>", desc = "  Patch diff" },
+          [menu .. "u"] = { "<cmd>diffupdate<cr>", desc = "󰚰  Update diff" },
+          [menu .. "g"] = { "<cmd>diffget<cr>", desc = "  Get diff" },
+          [menu .. "P"] = { "<cmd>diffput<cr>", desc = "  Put diff" },
+          [menu .. "q"] = { "<cmd>diffoff<cr>", desc = "󰘪  Stop diff" },
+          [menu .. "?"] = { "<cmd>h diff<cr>", desc = "󰋗  Help" },
+        },
+      },
+    },
+  },
+}

lua/astrocommunity/test/neotest/init.lua

@@ -5,6 +5,7 @@ return {
   dependencies = {
     "nvim-lua/plenary.nvim",
     "nvim-neotest/nvim-nio",
+    "antoinemadec/FixCursorHold.nvim",
     {
       "AstroNvim/astroui",
       opts = {
@@ -104,15 +105,8 @@ return {
       end,
     },
   },
-  specs = {
-    {
-      "catppuccin",
-      optional = true,
-      ---@type CatppuccinOptions
-      opts = { integrations = { neotest = true } },
-    },
-  },
   opts = function(_, opts)
+    opts.floating = { border = "rounded" }
     if vim.g.icons_enabled == false then
       opts.icons = {
         failed = "X",