diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 8f3c5ab..0e6cce5 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -36,11 +36,12 @@ vim.wo.cc            = "80"
 --------------------
 
 require"pack-black"
+require"pack-dirdiff"
+require"pack-easy-align"
 require"pack-indent-blankline"
 require"pack-lspconfig"
-require"pack-nvim-treesitter"
-require"pack-vim-dirdiff"
-require"pack-vim-easy-align"
+require"pack-treesitter"
+require"pack-which-key"
 
 -----------------------
 ----- keybindings -----
diff --git a/.config/nvim/lua/pack-lspconfig.lua b/.config/nvim/lua/pack-lspconfig.lua
index 6fc4b61..88e59c2 100644
--- a/.config/nvim/lua/pack-lspconfig.lua
+++ b/.config/nvim/lua/pack-lspconfig.lua
@@ -1,4 +1,4 @@
-vim.cmd("packadd nvim-lspconfig")
+vim.cmd("packadd lspconfig")
 
 lspconfig = require"lspconfig"
 
diff --git a/.config/nvim/lua/pack-nvim-treesitter.lua b/.config/nvim/lua/pack-nvim-treesitter.lua
deleted file mode 100644
index b590b91..0000000
--- a/.config/nvim/lua/pack-nvim-treesitter.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.cmd("packadd nvim-treesitter")
-require"nvim-treesitter.configs".setup {
-    auto_install = true,
-    highlight = {enable = true},
-}
diff --git a/.config/nvim/lua/pack-vim-dirdiff.lua b/.config/nvim/lua/pack-vim-dirdiff.lua
deleted file mode 100644
index c6843bc..0000000
--- a/.config/nvim/lua/pack-vim-dirdiff.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd("packadd vim-dirdiff")
diff --git a/.config/nvim/lua/pack-vim-easy-align.lua b/.config/nvim/lua/pack-vim-easy-align.lua
deleted file mode 100644
index d8f4db3..0000000
--- a/.config/nvim/lua/pack-vim-easy-align.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.cmd("packadd vim-easy-align")
-vim.keymap.set("n", "ga", "<Plug>(EasyAlign)")
-vim.keymap.set("x", "ga", "<Plug>(EasyAlign)")
diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black
index 6ae8457..bfc013a 160000
--- a/.config/nvim/pack/plugins/opt/black
+++ b/.config/nvim/pack/plugins/opt/black
@@ -1 +1 @@
-Subproject commit 6ae8457a8628345c59fed22c58728ffa258a3e76
+Subproject commit bfc013ab93d0993a6e24235291dddd4c4ecd64ee
diff --git a/.config/nvim/pack/plugins/opt/vim-dirdiff b/.config/nvim/pack/plugins/opt/dirdiff
similarity index 100%
rename from .config/nvim/pack/plugins/opt/vim-dirdiff
rename to .config/nvim/pack/plugins/opt/dirdiff
diff --git a/.config/nvim/pack/plugins/opt/vim-easy-align b/.config/nvim/pack/plugins/opt/easy-align
similarity index 100%
rename from .config/nvim/pack/plugins/opt/vim-easy-align
rename to .config/nvim/pack/plugins/opt/easy-align
diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig
new file mode 160000
index 0000000..d4eb971
--- /dev/null
+++ b/.config/nvim/pack/plugins/opt/lspconfig
@@ -0,0 +1 @@
+Subproject commit d4eb971db353ccf78cefb3be1b05483b69ec1e69
diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig
deleted file mode 160000
index 51775b1..0000000
--- a/.config/nvim/pack/plugins/opt/nvim-lspconfig
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51775b12cfbf1b6462c7b13cd020cc09e6767aea
diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter
deleted file mode 160000
index 8ec59ae..0000000
--- a/.config/nvim/pack/plugins/opt/nvim-treesitter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ec59aee8097c64fcf27d1dbd77ea181c50846c5
diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
new file mode 160000
index 0000000..ebea894
--- /dev/null
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -0,0 +1 @@
+Subproject commit ebea89483d6c4a6e2d563c8b884a66d546676350
diff --git a/.config/nvim/pack/plugins/opt/which-key b/.config/nvim/pack/plugins/opt/which-key
new file mode 160000
index 0000000..6885b66
--- /dev/null
+++ b/.config/nvim/pack/plugins/opt/which-key
@@ -0,0 +1 @@
+Subproject commit 6885b669523ff4238de99a7c653d47b081b5506d
diff --git a/.gitmodules b/.gitmodules
index 214ae82..8470a0e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,24 @@
 [submodule ".config/nvim/pack/plugins/opt/black"]
 	path = .config/nvim/pack/plugins/opt/black
 	url = https://github.com/psf/black.git
+[submodule ".config/nvim/pack/plugins/opt/dirdiff"]
+	path = .config/nvim/pack/plugins/opt/dirdiff
+	url = https://github.com/will133/vim-dirdiff.git
+[submodule ".config/nvim/pack/plugins/opt/easy-align"]
+	path = .config/nvim/pack/plugins/opt/easy-align
+	url = https://github.com/junegunn/vim-easy-align.git
 [submodule ".config/nvim/pack/plugins/opt/indent-blankline"]
 	path = .config/nvim/pack/plugins/opt/indent-blankline
 	url = https://github.com/lukas-reineke/indent-blankline.nvim.git
-[submodule ".config/nvim/pack/plugins/opt/nvim-lspconfig"]
-	path = .config/nvim/pack/plugins/opt/nvim-lspconfig
+[submodule ".config/nvim/pack/plugins/opt/lspconfig"]
+	path = .config/nvim/pack/plugins/opt/lspconfig
 	url = https://github.com/neovim/nvim-lspconfig.git
-[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"]
-	path = .config/nvim/pack/plugins/opt/nvim-treesitter
+[submodule ".config/nvim/pack/plugins/opt/treesitter"]
+	path = .config/nvim/pack/plugins/opt/treesitter
 	url = https://github.com/nvim-treesitter/nvim-treesitter.git
-[submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"]
-	path = .config/nvim/pack/plugins/opt/vim-dirdiff
-	url = https://github.com/will133/vim-dirdiff.git
-[submodule ".config/nvim/pack/plugins/opt/vim-easy-align"]
-	path = .config/nvim/pack/plugins/opt/vim-easy-align
-	url = https://github.com/junegunn/vim-easy-align.git
+[submodule ".config/nvim/pack/plugins/opt/which-key"]
+	path = .config/nvim/pack/plugins/opt/which-key
+	url = https://github.com/folke/which-key.nvim.git
 [submodule ".config/zsh/ohmyzsh"]
 	path = .config/zsh/ohmyzsh
 	url = https://github.com/ohmyzsh/ohmyzsh.git
diff --git a/.pyenv b/.pyenv
index 093d0b3..5b08a64 160000
--- a/.pyenv
+++ b/.pyenv
@@ -1 +1 @@
-Subproject commit 093d0b3a49446005f8c87e702815744915721a6f
+Subproject commit 5b08a6492b22a22b291be483321009fd85be63fa