diff --git a/init.lua b/init.lua
index 099f4a6..99db027 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,7 @@
 vim.g.mapleader = " "
 
 require('packer')
+require('setup')
 
 require("config.lsp")
 require("config.diagnostics")
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
index 9b560af..7801cfe 100644
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -31,21 +31,12 @@ vim.lsp.config('lua_ls', {
   },
 })
 
-vim.lsp.config('rust_analyzer', {
-  settings = {
-    ['rust-analyzer'] = {
-      diagnostics = {
-        enable = true;
-      }
-    }
-  }
-})
-
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
+vim.lsp.enable({'clangd','lua_ls','rust_analyzer','mesonlsp','cmake','omnisharp','pyright','gopls','ols'})
+
 vim.lsp.config('neocmake', {
   capabilities = capabilities,
 })
 
-vim.lsp.enable({'clangd','lua_ls','rust_analyzer','mesonlsp','cmake','omnisharp','pyright','gopls','ols'})
diff --git a/lua/packs/lua.lua b/lua/packs/lua.lua
index e13f576..c18b87b 100644
--- a/lua/packs/lua.lua
+++ b/lua/packs/lua.lua
@@ -11,6 +11,7 @@ return {
     gh('hrsh7th/cmp-nvim-lsp'),
     gh('hrsh7th/cmp-path'),
     gh('hrsh7th/nvim-cmp'),
+	gh('nvim-mini/mini.surround'),
     gh('midoBB/nvim-quicktype'),
     gh('neovim/nvim-lspconfig'),
     gh('nvim-lua/plenary.nvim'),
diff --git a/lua/setup.lua b/lua/setup.lua
new file mode 100644
index 0000000..336619e
--- /dev/null
+++ b/lua/setup.lua
@@ -0,0 +1 @@
+require('mini.surround').setup()
diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json
index 81738cb..10fc5b8 100644
--- a/nvim-pack-lock.json
+++ b/nvim-pack-lock.json
@@ -32,6 +32,10 @@
       "rev": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee",
       "src": "https://github.com/iamcco/markdown-preview.nvim"
     },
+    "mini.surround": {
+      "rev": "59ce0acf79e1d930756ef3a7cb4c2369560cf548",
+      "src": "https://github.com/nvim-mini/mini.surround"
+    },
     "nerdtree": {
       "rev": "690d061b591525890f1471c6675bcb5bdc8cdff9",
       "src": "https://github.com/preservim/nerdtree"
@@ -52,6 +56,10 @@
       "rev": "6d557a32fec1fb8a0b635e98cb856b24c7f0ef00",
       "src": "https://github.com/midoBB/nvim-quicktype"
     },
+    "nvim-surround": {
+      "rev": "8b47db616ef658b8fc27e61db2896aa2f40134de",
+      "src": "https://github.com/kylechui/nvim-surround"
+    },
     "plenary.nvim": {
       "rev": "74b06c6c75e4eeb3108ec01852001636d85a932b",
       "src": "https://github.com/nvim-lua/plenary.nvim"