diff --git a/.gitmodules b/.gitmodules
index 46b086e..1672245 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "pack/general/start/vim-wordmotion"]
 	path = pack/general/start/vim-wordmotion
 	url = https://github.com/chaoren/vim-wordmotion
+[submodule "pack/general/start/nerdcommenter"]
+	path = pack/general/start/nerdcommenter
+	url = https://github.com/preservim/nerdcommenter
diff --git a/init.lua b/init.lua
index 123da29..bb778fe 100644
--- a/init.lua
+++ b/init.lua
@@ -66,6 +66,8 @@ ts.setup {ensure_installed = 'maintained', highlight = {enable = true, indent =
 
 ---- LSP ----
 local lsp = require 'lspconfig'
+-- Rust --
+require'lspconfig'.rust_analyzer.setup{on_attach=require'completion'.on_attach}
 
 ---- Plugins ----
 ---- ale
@@ -94,8 +96,7 @@ g.completion_enable_snippet = 'UltiSnips'
 opt.completeopt = {'menuone', 'noinsert', 'noselect'}
 g.completion_chain_complete_list = {
 	default = {
-		{ complete_items = { 'lsp' } },
-		{ complete_items = { 'buffers' } },
+		{ complete_items = { 'lsp', 'snippet', 'buffer' } },
 		{ mode = { '<c-p>' } },
 		{ mode = { '<c-n>' } }
 	},
@@ -110,6 +111,11 @@ g.vim_markdown_no_default_key_mappings = 1
 g.vim_markdown_folding_disabled = 1
 g.vim_markdown_toml_frontmatter = 1
 ---- Telescope
+require('telescope').setup{
+  defaults = {
+	  file_sorter =  require'telescope.sorters'.get_fzy_sorter,
+  }
+}
 map('n', '<Leader>f', ':Telescope fd<CR>')
 map('n', '<Leader>b', ':Telescope buffers<CR>')
 map('n', '<Leader>/', ':Telescope current_buffer_fuzzy_find<CR>')
diff --git a/pack/general/start/ale b/pack/general/start/ale
index 1b08791..d53a085 160000
--- a/pack/general/start/ale
+++ b/pack/general/start/ale
@@ -1 +1 @@
-Subproject commit 1b08791228f5aca4545a3fba6699b29a003028fe
+Subproject commit d53a085096306c890897385692693ee653aaddce
diff --git a/pack/general/start/completion-nvim b/pack/general/start/completion-nvim
index c8db953..139fb6c 160000
--- a/pack/general/start/completion-nvim
+++ b/pack/general/start/completion-nvim
@@ -1 +1 @@
-Subproject commit c8db953a8e9f4bc8183e31831297cf84d6f521b8
+Subproject commit 139fb6cfbd9f7384a5489d3e4afdacb8ed977ab0
diff --git a/pack/general/start/gruvbox.nvim b/pack/general/start/gruvbox.nvim
index 2dc25bb..2449418 160000
--- a/pack/general/start/gruvbox.nvim
+++ b/pack/general/start/gruvbox.nvim
@@ -1 +1 @@
-Subproject commit 2dc25bb14fbd69f888dd0615c5576dd730de869a
+Subproject commit 24494189e723b71c1683c58ecfd0825d202b2bf8
diff --git a/pack/general/start/lush.nvim b/pack/general/start/lush.nvim
index 684c06d..71adf07 160000
--- a/pack/general/start/lush.nvim
+++ b/pack/general/start/lush.nvim
@@ -1 +1 @@
-Subproject commit 684c06d4879a38e50a247ce23b32beaacc75c4d1
+Subproject commit 71adf072e8c55dfbf010045b34ae0b761a2200e7
diff --git a/pack/general/start/nerdcommenter b/pack/general/start/nerdcommenter
new file mode 160000
index 0000000..2c87cae
--- /dev/null
+++ b/pack/general/start/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit 2c87cae76ed88f3b0c957df68c03573ecafa3728
diff --git a/pack/general/start/nvim-lspconfig b/pack/general/start/nvim-lspconfig
index a246d97..7c5ce01 160000
--- a/pack/general/start/nvim-lspconfig
+++ b/pack/general/start/nvim-lspconfig
@@ -1 +1 @@
-Subproject commit a246d97ecfc0fd1f30645ea98577c7af4e1b0229
+Subproject commit 7c5ce01c20adb707ca9f13f3a60d1d3915905bc3
diff --git a/pack/general/start/nvim-treesitter b/pack/general/start/nvim-treesitter
index 5634b17..1e4c846 160000
--- a/pack/general/start/nvim-treesitter
+++ b/pack/general/start/nvim-treesitter
@@ -1 +1 @@
-Subproject commit 5634b175c42a3765405060e7407330d354c69369
+Subproject commit 1e4c846d01561821a737d08a6a5e2ac16d19c332
diff --git a/pack/general/start/plenary.nvim b/pack/general/start/plenary.nvim
index c4dd6e7..15c3cb9 160000
--- a/pack/general/start/plenary.nvim
+++ b/pack/general/start/plenary.nvim
@@ -1 +1 @@
-Subproject commit c4dd6e7b29e77d7d795c0f7c67a8ca9673a7b50f
+Subproject commit 15c3cb9e6311dc1a875eacb9fc8df69ca48d7402
diff --git a/pack/general/start/popup.nvim b/pack/general/start/popup.nvim
index 5e3bece..f91d809 160000
--- a/pack/general/start/popup.nvim
+++ b/pack/general/start/popup.nvim
@@ -1 +1 @@
-Subproject commit 5e3bece7b4b4905f4ec89bee74c09cfd8172a16a
+Subproject commit f91d80973f80025d4ed00380f2e06c669dfda49d
diff --git a/pack/general/start/telescope.nvim b/pack/general/start/telescope.nvim
index 398a0d3..dcee6c8 160000
--- a/pack/general/start/telescope.nvim
+++ b/pack/general/start/telescope.nvim
@@ -1 +1 @@
-Subproject commit 398a0d391aa2afcda1521a8e86b820ffb599b60b
+Subproject commit dcee6c81f4cd5f9bc4a4cea782135a0669aa74bd
diff --git a/pack/general/start/ultisnips b/pack/general/start/ultisnips
index b6c9a81..53e1921 160000
--- a/pack/general/start/ultisnips
+++ b/pack/general/start/ultisnips
@@ -1 +1 @@
-Subproject commit b6c9a814a4fdfcad3ea53d8888746803a7218a9e
+Subproject commit 53e1921e3ef015ef658e540c0aa9c4835f9c18a6
diff --git a/pack/general/start/vim-airline b/pack/general/start/vim-airline
index 49cdcb7..0de4c9d 160000
--- a/pack/general/start/vim-airline
+++ b/pack/general/start/vim-airline
@@ -1 +1 @@
-Subproject commit 49cdcb7b3ea76ee19c737885c0ab19e64e564169
+Subproject commit 0de4c9df21abf9256091d205148601f718d3a12c
diff --git a/pack/general/start/vim-airline-themes b/pack/general/start/vim-airline-themes
index 531bcc9..97cf3e6 160000
--- a/pack/general/start/vim-airline-themes
+++ b/pack/general/start/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7
+Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256
diff --git a/pack/general/start/vim-snippets b/pack/general/start/vim-snippets
index 2a28fc3..9e5219a 160000
--- a/pack/general/start/vim-snippets
+++ b/pack/general/start/vim-snippets
@@ -1 +1 @@
-Subproject commit 2a28fc35f6848ad38681d4b509ae3f5962276b5d
+Subproject commit 9e5219ae92f9b1b2ee23aff067618a6008a74fa5
diff --git a/pack/general/start/vim-wordmotion b/pack/general/start/vim-wordmotion
index dca1a18..0edeebd 160000
--- a/pack/general/start/vim-wordmotion
+++ b/pack/general/start/vim-wordmotion
@@ -1 +1 @@
-Subproject commit dca1a1827513497def6362411d093ae6b3cff7f8
+Subproject commit 0edeebdfa95c0a1fc5fbb83b8faf6b0b2cc3bf7e