diff --git a/home/vim/default.nix b/home/vim/default.nix
index e803d00..2f17890 100644
--- a/home/vim/default.nix
+++ b/home/vim/default.nix
@@ -42,7 +42,6 @@ in
       vim-git # Sane git syntax files
       vim-repeat # Enanche '.' for plugins
       vim-rsi # Readline mappings
-      vim-surround # Deal with pairs
       vim-unimpaired # Some ex command mappings
       vim-vinegar # Better netrw
 
@@ -83,6 +82,7 @@ in
       # UX improvements
       dressing-nvim # Integrate native UI hooks with Telescope etc...
       gitsigns-nvim # Fast git UI integration
+      nvim-surround # Deal with pairs, now in Lua
       telescope-fzf-native-nvim # Use 'fzf' fuzzy matching algorithm
       telescope-lsp-handlers-nvim # Use 'telescope' for various LSP actions
       telescope-nvim # Fuzzy finder interface
diff --git a/home/vim/plugin/settings/surround.vim b/home/vim/plugin/settings/surround.vim
new file mode 100644
index 0000000..e5eb81b
--- /dev/null
+++ b/home/vim/plugin/settings/surround.vim
@@ -0,0 +1,5 @@
+lua << EOF
+require("nvim-surround").setup({
+    -- No configuration at the moment
+})
+EOF