diff --git a/system/home/emacs/default.nix b/system/home/emacs/default.nix
index 07c3c71d..06af7823 100644
--- a/system/home/emacs/default.nix
+++ b/system/home/emacs/default.nix
@@ -23,9 +23,48 @@
     extraConfig = builtins.readFile ./extraConfig.el;
     extraPackages =
       epkgs: with epkgs; [
-        treesit-grammars.with-all-grammars
-        emacsql-sqlite
+        # UI and Appearance
+        delight
+        nerd-icons
+        nerd-icons-dired
+        nerd-icons-ibuffer
+        nerd-icons-corfu
+        visual-fill-column
+        # Email and Calendar
+        khalel
         mu4e
+        # Other (TODO sort)
+        which-key
+        diff-hl
+        org-roam
+        org-noter
+        citar
+        vertico
+        marginalia
+        orderless
+        corfu
+        corfu-terminal
+        cape
+        consult
+        consult-eglot
+        tempel
+        rainbow-delimiters
+        envrc
+        treesit-grammars.with-all-grammars
+        treesit-auto
+        apheleia
+        flymake-shellcheck
+        flymake-yamllint
+        flymake-clippy
+        flymake-eslint
+        magit
+        forge
+        nix-mode
+        lua-mode
+        auctex
+        markdown-mode
+        pandoc-mode
+        scad-mode
       ];
   };
   home.packages = with pkgs; [