diff --git a/flake.nix b/flake.nix
index 0f853a1..79d0315 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,99 +117,77 @@
           # LazyVim
           lazy-nvim
           LazyVim
-          bufferline-nvim
-          lazydev-nvim
-          cmp-buffer
-          cmp-nvim-lsp
-          cmp-path
-          cmp_luasnip
-          conform-nvim
-          dashboard-nvim
-          dressing-nvim
-          flash-nvim
-          friendly-snippets
-          gitsigns-nvim
-          indent-blankline-nvim
-          lualine-nvim
-          neo-tree-nvim
-          neoconf-nvim
-          neodev-nvim
-          noice-nvim
-          nui-nvim
-          nvim-cmp
-          nvim-lint
-          nvim-lspconfig
-          nvim-notify
-          nvim-spectre
-          nvim-treesitter-context
-          nvim-treesitter-textobjects
-          nvim-ts-autotag
-          nvim-ts-context-commentstring
-          nvim-web-devicons
-          persistence-nvim
-          plenary-nvim
-          telescope-fzf-native-nvim
-          telescope-nvim
-          todo-comments-nvim
-          tokyonight-nvim
-          trouble-nvim
-          vim-illuminate
-          vim-startuptime
-          which-key-nvim
-          snacks-nvim
-          blink-cmp
-          ts-comments-nvim
-          grug-far-nvim
-          rose-pine
-          nvim-treesitter-textobjects
-          nvim-treesitter.withAllGrammars
-          # This is for if you only want some of the grammars
-          # (nvim-treesitter.withPlugins (
-          #   plugins: with plugins; [
-          #     nix
-          #     lua
-          #   ]
-          # ))
 
-          # sometimes you have to fix some names
-          {
-            plugin = luasnip;
-            name = "LuaSnip";
-          }
-          {
-            plugin = catppuccin-nvim;
-            name = "catppuccin";
-          }
-          {
-            plugin = mini-ai;
-            name = "mini.ai";
-          }
-          {
-            plugin = mini-icons;
-            name = "mini.icons";
-          }
-          {
-            plugin = mini-bufremove;
-            name = "mini.bufremove";
-          }
-          {
-            plugin = mini-comment;
-            name = "mini.comment";
-          }
-          {
-            plugin = mini-indentscope;
-            name = "mini.indentscope";
-          }
+          # Coding
           {
             plugin = mini-pairs;
             name = "mini.pairs";
           }
+          ts-comments-nvim
           {
-            plugin = mini-surround;
-            name = "mini.surround";
+            plugin = mini-ai;
+            name = "mini.ai";
           }
-          # you could do this within the lazy spec instead if you wanted
-          # and get the new names from `:NixCats pawsible` debug command
+          lazydev-nvim
+
+          # Colorscheme
+          tokyonight-nvim
+          {
+            plugin = catppuccin-nvim;
+            name = "catppuccin";
+          }
+
+          # Editor
+          grug-far-nvim
+          flash-nvim
+          which-key-nvim
+          gitsigns-nvim
+          trouble-nvim
+          todo-comments-nvim
+
+          # Formatting
+          conform-nvim
+
+          # Linting
+          nvim-lint
+
+          # LSP
+          nvim-lspconfig
+
+          # Treesitter
+          nvim-treesitter.withAllGrammars
+          nvim-treesitter-textobjects
+          nvim-ts-autotag
+
+          # UI
+          bufferline-nvim
+          lualine-nvim
+          noice-nvim
+          {
+            plugin = mini-icons;
+            name = "mini.icons";
+          }
+          nui-nvim
+
+          # Util
+          snacks-nvim
+          persistence-nvim
+          plenary-nvim
+
+          # Extras
+          # Coding
+          # Blink
+          blink-cmp
+          friendly-snippets
+
+          # Luasnip
+          {
+            plugin = luasnip;
+            name = "LuaSnip";
+          }
+
+          # Custom
+          rose-pine
         ];
       };