From a96d2c69267be1c246f9552c2398bbb8fa5ba67f Mon Sep 17 00:00:00 2001
From: John Grant <john.grant9497@gmail.com>
Date: Wed, 3 Sep 2025 14:12:09 -0400
Subject: [PATCH] See if this works on windows

---
 lazy-lock.json         |  4 ++--
 lazyvim.json           |  1 +
 lua/config/keymaps.lua |  4 ++--
 lua/plugins/folke.lua  | 43 ++++++++++++++++++++++++++++++++----------
 lua/plugins/init.lua   | 12 ------------
 lua/plugins/mini.lua   | 14 ++++++++++++++
 6 files changed, 52 insertions(+), 26 deletions(-)
 create mode 100644 lua/plugins/mini.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 5bb1005..b4059a8 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -22,14 +22,14 @@
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "mini.ai": { "branch": "main", "commit": "45a26d032d8703f280c69c2ed9fb4e1bfc8f24f9" },
   "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
+  "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
   "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" },
   "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a3deebbd110016f50cc66b7b256120072f3804db" },
+  "nvim-lspconfig": { "branch": "master", "commit": "060f6b601b8d60d59fb2f6dfb2528c391bcd60a2" },
   "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
-  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
diff --git a/lazyvim.json b/lazyvim.json
index e98c9e0..af1417d 100644
--- a/lazyvim.json
+++ b/lazyvim.json
@@ -1,6 +1,7 @@
 {
   "extras": [
     "lazyvim.plugins.extras.coding.nvim-cmp",
+    "lazyvim.plugins.extras.formatting.prettier",
     "lazyvim.plugins.extras.lang.json",
     "lazyvim.plugins.extras.lang.markdown",
     "lazyvim.plugins.extras.lang.sql",
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 5af404f..801e1d1 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -6,5 +6,5 @@ local map = vim.keymap.set
 
 map("i", "<S-Tab>", "<c-\\><c-n><<a", { desc = "Unindent Line" })
 
-map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Swap Lines (Below)" })
-map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Swap Lines (Above)" })
+--map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Swap Lines (Below)" })
+--map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Swap Lines (Above)" })
diff --git a/lua/plugins/folke.lua b/lua/plugins/folke.lua
index 17fc057..09460bc 100644
--- a/lua/plugins/folke.lua
+++ b/lua/plugins/folke.lua
@@ -5,8 +5,16 @@ local pickerRootDirDesc = "Find Files (Root Dir)"
 local pickerCwdDesc = "Find Files (cwd)"
 
 local exploreExclude = { "**/node_modules/**" }
-local pickerExclude =
-  { "**/node_modules/**", "**/.next/**", "**/.idea/**", "**/.vscode/**", "**/android/**", "**/ios/**", "**/.expo/**" }
+local pickerExclude = {
+  "**/node_modules/**",
+  "**/.next/**",
+  "**/.idea/**",
+  "**/.vscode/**",
+  "**/android/**",
+  "**/ios/**",
+  "**/.expo/**",
+  "**/.git/**",
+}
 
 return {
   {
@@ -37,42 +45,52 @@ return {
       {
         "<leader>ff",
         function()
-          Snacks.picker.files({ cwd = LazyVim.root(), hidden = true, ignored = true, exclude = pickerExclude })
+          Snacks.picker.files({
+            cwd = LazyVim.root(),
+            hidden = true,
+            ignored = true,
+            exclude = pickerExclude,
+          })
         end,
         desc = pickerRootDirDesc,
       },
       {
         "<leader>fe",
         function()
-          Snacks.explorer({ cwd = LazyVim.root(), exclude = exploreExclude })
+          Snacks.explorer({
+            cwd = LazyVim.root(),
+            hidden = true,
+            ignored = true,
+            exclude = exploreExclude,
+          })
         end,
         desc = snacksRootDirDesc,
       },
       {
         "<leader>fE",
         function()
-          Snacks.explorer({ exclude = exploreExclude })
+          Snacks.explorer({ hidden = true, ignored = true, exclude = exploreExclude })
         end,
         desc = snacksCwdDesc,
       },
       {
         "<leader>f/",
         function()
-          Snacks.explorer({ cwd = "/" })
+          Snacks.explorer({ cwd = "/", hidden = true })
         end,
         desc = "Find Files (/)",
       },
       {
         "<leader>fh",
         function()
-          Snacks.explorer({ cwd = "~" })
+          Snacks.explorer({ cwd = "~", hidden = true })
         end,
         desc = "Explorer (Home)",
       },
       {
         "<leader>fH",
         function()
-          Snacks.picker.files({ cwd = "~" })
+          Snacks.picker.files({ cwd = "~", hidden = true })
         end,
         desc = "Find Files (Home)",
       },
@@ -93,14 +111,19 @@ return {
       {
         "<leader>//",
         function()
-          Snacks.picker.grep({ hidden = true })
+          Snacks.picker.grep({ hidden = true, ignored = true, exclude = pickerExclude })
         end,
         desc = "Grep (cwd)",
       },
       {
         "<leader>/",
         function()
-          Snacks.picker.grep({ cwd = LazyVim.root(), hidden = true })
+          Snacks.picker.grep({
+            cwd = LazyVim.root(),
+            hidden = true,
+            ignored = true,
+            exclude = pickerExclude,
+          })
         end,
         desc = "Grep (Root Dir)",
         remap = true,
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index d2073da..4b928b6 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -27,18 +27,6 @@ return {
     },
   },
 
-  -- Surround
-  {
-    "kylechui/nvim-surround",
-    version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
-    event = "VeryLazy",
-    config = function()
-      require("nvim-surround").setup({
-        -- Configuration here, or leave empty to use defaults
-      })
-    end,
-  },
-
   -- TMUX Navigator
   {
     "christoomey/vim-tmux-navigator",
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
new file mode 100644
index 0000000..cb9882a
--- /dev/null
+++ b/lua/plugins/mini.lua
@@ -0,0 +1,14 @@
+return {
+  {
+    "nvim-mini/mini.nvim",
+    config = function()
+      require("mini.surround").setup()
+
+      require("mini.ai").setup()
+
+      require("mini.move").setup()
+
+      require("mini.operators").setup()
+    end,
+  },
+}