From 35d7771ce76486f3ddc4d1b854a41bd5c5d373b1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 17 Apr 2024 13:34:58 +0100
Subject: [PATCH] Re-order Emacs packages

---
 home/emacs/default.nix | 132 +++++++++++++++++++++--------------------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 6bfaa4ec..5ac4903f 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -32,67 +32,10 @@
     '';
     extraPackages = epkgs:
       with epkgs; [
-        # theme
+        # Theme
         catppuccin-theme
 
-        # spell-checking
-        flyspell-correct
-        consult-flyspell
-
-        # password-store
-        password-store
-        password-store-otp
-        pass # password-store major mode
-
-        # completion-packages
-        cape
-        consult
-        consult-eglot
-        corfu
-        corfu-terminal
-        embark
-        embark-consult
-        marginalia
-        orderless
-        vertico
-        tempel
-        tempel-collection
-
-        # ide-packages
-        treesit-grammars.with-all-grammars
-        treesit-auto
-        flymake-popon
-        flymake-collection
-        flymake-lua
-        flymake-ruff
-        flymake-clippy
-        flymake-eslint
-        flymake-shellcheck
-        apheleia
-        direnv
-        rainbow-delimiters
-        aggressive-indent
-        nix-mode
-        lua-mode
-        cargo
-
-        # media-packages
-        emms
-
-        # org-packages
-        org-roam
-        org-noter
-        org-journal
-        citar
-        citar-embark
-        gnuplot
-
-        # project-packages
-        ibuffer-project
-        magit
-        forge
-
-        # ui-packages
+        # UI
         all-the-icons
         nerd-icons
         nerd-icons-completion
@@ -108,20 +51,81 @@
         link-hint
         diff-hl
 
-        # Tree-Sitter packages
-        nushell-ts-mode
+        # Completion
+        cape
+        consult
+        consult-eglot
+        consult-flyspell
+        corfu
+        corfu-terminal
+        embark
+        embark-consult
+        marginalia
+        orderless
+        vertico
 
-        # writing-packages
+        # Snippets
+        tempel
+        tempel-collection
+
+        # spell-checking
+        flyspell-correct
+
+        # password-store
+        pass
+        password-store
+        password-store-otp
+
+        # IDE
+        treesit-grammars.with-all-grammars
+        treesit-auto
+        nushell-ts-mode
+        flymake-popon
+        flymake-collection
+        flymake-lua
+        flymake-ruff
+        flymake-clippy
+        flymake-eslint
+        flymake-shellcheck
+        apheleia
+        direnv
+        rainbow-delimiters
+        aggressive-indent
+        nix-mode
+        lua-mode
+        cargo
+
+        # Media
+        emms
+
+        # org-mode
+        org-roam
+        org-noter
+        org-journal
+
+        # org-cite
+        citar
+        citar-embark
+
+        # org-plot
+        gnuplot
+
+        # Projects
+        ibuffer-project
+        magit
+        forge
+
+        # Writing
         markdown-mode
         pandoc-mode
         auctex
         auctex-latexmk
         latex-preview-pane
 
-        # email-packages
+        # Email
         mu4e
 
-        # feed-packages
+        # RSS/YouTube feeds
         elfeed
         elfeed-org
         elfeed-tube