diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix
index f0119bf..41c58e0 100644
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@@ -254,5 +254,12 @@ with builtins;
         }
       ];
     }
+    {
+      plugin = nvim-surround;
+      event = [ "BufReadPost" "BufNewFile" ];
+      conf = ''
+        require("nvim-surround").setup({})
+      '';
+    }
   ];
 }
diff --git a/modules/programs/nvim/plugins/mini-nvim.lua b/modules/programs/nvim/plugins/mini-nvim.lua
index 28cabcd..aec8faa 100644
--- a/modules/programs/nvim/plugins/mini-nvim.lua
+++ b/modules/programs/nvim/plugins/mini-nvim.lua
@@ -3,46 +3,6 @@ require("mini.move").setup()
 require("mini.pairs").setup()
 require("mini.starter").setup()
 
-require("mini.surround").setup({
-  -- Add custom surroundings to be used on top of builtin ones. For more
-  -- information with examples, see `:h MiniSurround.config`.
-  custom_surroundings = nil,
-
-  -- Duration (in ms) of highlight when calling `MiniSurround.highlight()`
-  highlight_duration = 500,
-
-  -- Module mappings. Use `''` (empty string) to disable one.
-  mappings = {
-    add = "gSa", -- Add surrounding in Normal and Visual modes
-    delete = "gSd", -- Delete surrounding
-    find = "gSf", -- Find surrounding (to the right)
-    find_left = "gSF", -- Find surrounding (to the left)
-    highlight = "gSh", -- Highlight surrounding
-    replace = "gSr", -- Replace surrounding
-    update_n_lines = "gSn", -- Update `n_lines`
-
-    suffix_last = "l", -- Suffix to search with "prev" method
-    suffix_next = "n", -- Suffix to search with "next" method
-  },
-
-  -- Number of lines within which surrounding is searched
-  n_lines = 20,
-
-  -- Whether to respect selection type:
-  -- - Place surroundings on separate lines in linewise mode.
-  -- - Place surroundings on each line in blockwise mode.
-  respect_selection_type = false,
-
-  -- How to search for surrounding (first inside current line, then inside
-  -- neighborhood). One of 'cover', 'cover_or_next', 'cover_or_prev',
-  -- 'cover_or_nearest', 'next', 'prev', 'nearest'. For more details,
-  -- see `:h MiniSurround.config`.
-  search_method = "cover",
-
-  -- Whether to disable showing non-error feedback
-  silent = false,
-})
-
 require("mini.tabline").setup()
 local tabline_current = vim.api.nvim_get_hl(0, { name = "MiniTablineCurrent" })
 vim.api.nvim_set_hl(0, "MiniTablineCurrent", {