diff --git a/flake.lock b/flake.lock
index 50392d8..96d94f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -83,7 +83,28 @@
         "claude-code": "claude-code",
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "rycee": "rycee"
+      }
+    },
+    "rycee": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788678358,
+        "narHash": "sha256-xFu9deElkBd81tRYo2yRSZQ40LDXMnVd/gO1/uELxhI=",
+        "owner": "~rycee",
+        "repo": "nur-expressions",
+        "rev": "2554c0e25259c6ab3e71dac5177f8d38f76a6e1c",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nur-expressions",
+        "type": "sourcehut"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 4f3d0af..59c5382 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,11 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    rycee = {
+      url = "sourcehut:~rycee/nur-expressions";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -30,6 +35,7 @@
       home-manager,
       claude-code,
       nix-index-database,
+      rycee,
       ...
     }:
     let
@@ -75,6 +81,7 @@
 
           modules = [
             nix-index-database.homeModules.default
+            rycee.hmModules.emacs-init
             "${modules}"
           ]
           ++ [
diff --git a/home.org b/home.org
index b856b25..2318398 100644
--- a/home.org
+++ b/home.org
@@ -885,6 +885,7 @@ helps with a few places where nix's string interpolation was causing problems.
   (mkIf cfg.desktop.enable {
     programs.emacs = {
       enable = true;
+      init.enable = true;
       extraConfig = builtins.readFile ./emacs.el;
     };
   })
@@ -2281,20 +2282,16 @@ And finally, we want to hide the cursor when presenting.
 ** Terminal
 #+BEGIN_SRC nix
   {
-    programs.emacs = {
-      extraPackages = epkgs: with epkgs; [
-        eat
-      ];
+    programs.emacs.init.usePackage = {
+      eat = {
+        enable = true;
+        command = ["eat"];
+        hook = ["(eshell-load . eat-eshell-mode)"];
+      };
     };
   }
 #+END_SRC
 
-#+BEGIN_SRC elisp
-  (use-package eat
-    :commands (eat)
-    :hook (eshell-load . eat-eshell-mode))
-#+END_SRC
-
 ** Ledger
 #+BEGIN_SRC nix
   {