diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index 1d14883..dc1911a 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -43,39 +43,65 @@ in
 {
   imports = [ ];
 
-  environment.systemPackages = with pkgs; [
-    plainmacs
-    e_shorthand
-    emacs29-pgtk
-    clang # To compile tree-sitter grammars
-    nixd # nix language server
-    nixfmt-rfc-style # auto-formatting nix files through nixd
-  ];
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
+  config = lib.mkMerge [
     {
-      home.file.".config/emacs" = {
-        source = ./files/emacs;
-        recursive = true;
+      environment.systemPackages = with pkgs; [
+        plainmacs
+        e_shorthand
+        emacs_full
+      ];
+
+      nixpkgs.overlays = [
+        (final: prev: {
+          emacs_full = pkgs.symlinkJoin {
+            name = "emacs_full";
+            paths = [ pkgs.emacs29-pgtk ];
+            buildInputs = [ pkgs.makeWrapper ];
+            postBuild = ''
+              wrapProgram $out/bin/emacs --prefix PATH : ${
+                lib.makeBinPath [
+                  (pkgs.aspellWithDicts (
+                    dicts: with dicts; [
+                      en
+                      en-computers
+                    ]
+                  ))
+                  pkgs.nixd # nix language server
+                  pkgs.nixfmt-rfc-style # auto-formatting nix files through nixd
+                  pkgs.clang # To compile tree-sitter grammars
+                ]
+              }
+            '';
+          };
+        })
+      ];
+
+      home-manager.users.talexander =
+        { pkgs, ... }:
+        {
+          home.file.".config/emacs" = {
+            source = ./files/emacs;
+            recursive = true;
+          };
+        };
+
+      environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+        hideMounts = true;
+        users.talexander = {
+          directories = [
+            ".config/emacs/eln-cache" # Installed packages
+            ".config/emacs/elpa" # Installed packages
+            ".config/emacs/private" # For recentf
+            ".config/emacs/tree-sitter" # Compiled tree-sitter grammars
+          ];
+          files = [
+            ".config/emacs/history" # For savehist
+            ".config/emacs/.last-package-update-day" # For use-package
+          ];
+        };
       };
-    };
 
-  environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        ".config/emacs/eln-cache" # Installed packages
-        ".config/emacs/elpa" # Installed packages
-        ".config/emacs/private" # For recentf
-        ".config/emacs/tree-sitter" # Compiled tree-sitter grammars
-      ];
-      files = [
-        ".config/emacs/history" # For savehist
-        ".config/emacs/.last-package-update-day" # For use-package
-      ];
-    };
-  };
-
-  environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
+      environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
+    }
+  ];
 }