diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 99e555f3..e7239883 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -48,55 +48,66 @@ in {
     []
     ++ lib.optionals (!cfg.lite) [
       (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
-        p.nix
-        p.markdown
+        p.ini
         p.json
         p.json5
+        p.markdown
+        p.nix
+        p.toml
         p.yaml
 
-        p.html
         p.css
-        p.scss
-        p.typescript
-        p.tsx
-        p.javascript
         p.graphql
+        p.html
+        p.javascript
+        p.scss
+        p.tsx
+        p.typescript
         p.vue
 
-        p.rust
+        p.c
+        p.cpp
         p.go
         p.gomod
         p.gosum
-        p.ruby
-        p.python
         p.haskell
-        p.c
-        p.cpp
+        p.lua
+        p.php
+        p.python
+        p.ruby
+        p.rust
 
         p.vim
         p.vimdoc
 
-        p.sql
         p.passwd
+        p.sql
 
+        p.diff
         p.gitcommit
         p.gitignore
         p.git_config
         p.gitattributes
         p.git_rebase
 
+        p.bash
         p.dockerfile
+        p.make
+        p.ninja
         p.terraform
       ]))
 
+      # Dependencies for nvim-lspconfig
       nvim-cmp
       cmp-nvim-lsp
       cmp_luasnip
       luasnip
 
+      # Quickstart configs for neovim LSP
       lsp_extensions-nvim
       nvim-lspconfig
 
+      # Collaborative editing in Neovim using built-in capabilities
       instant-nvim-nvfetcher
 
       # Search functionality behind :Ack
@@ -123,27 +134,39 @@ in {
       # JSON schemas
       SchemaStore-nvim
 
+      # Neovim colorschemes / themes
       sonokai
       vim-hybrid-material
       vim-airline-themes
       vim-apprentice-nvfetcher
 
+      # Git integrations
+      # A Git wrapper so awesome, it should be illegal
       fugitive
+      # Shows git diff markers in the sign column
       vim-gitgutter
+      # GitHub extension for fugitive
       vim-rhubarb
+      # Ease your git workflow within Vim
       vimagit-nvfetcher
 
+      # FZF fuzzy finder
       fzf-vim
       fzfWrapper
+      # Make the yanked region apparent
       vim-highlightedyank
 
+      # :Beautify Code beautifier
       vim-beautify-nvfetcher
-      vim-surround
 
+      # Unload, delete or wipe a buffer without closing the window
       vim-bufkill
+      # Defaults everyone can agree on
       vim-sensible
 
+      # emmet for vim: http://emmet.io/
       emmet-vim
+      # Caddyfile syntax support for Vim
       vim-caddyfile-nvfetcher
     ];