diff --git a/Droidnix/README.org b/Droidnix/README.org
index 8fdb49255..26c6c5ef9 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -516,79 +516,34 @@ This sets up the zsh in the terminal
 ** =generated/modules/traveldroid/apps/emacs/emacs.nix=
 This installs emacs
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
-{ pkgs, flakeRoot, ... }:
+{ config, pkgs, flakeRoot, ... }:
 
-let
-  emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
-in
 {
-  #################################
+  ############################
   # System-wide Emacs
-  #################################
+  ############################
   environment.systemPackages = [
-    emacsPkg
+    pkgs.emacs-pgtk.override { withTreeSitter = true; }
   ];
 
-  #################################
+  ############################
   # Home Manager configuration
-  #################################
+  ############################
+  # Only include these if this module is evaluated in the Home Manager context
+  # (i.e., via home-manager.nixosModules.home-manager)
   home.sessionVariables = {
     EDITOR = "emacs";
     XDG_SCREENSHOTS_DIR = "~/screenshots";
   };
 
   home.file = {
-    "emacs/early-init.el" = {
+    ".emacs.d/early-init.el" = {
       source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
-      target = ".emacs.d/early-init.el";
     };
-    "emacs/init.el" = {
+    ".emacs.d/init.el" = {
       source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
-      target = ".emacs.d/init.el";
     };
   };
-
-  home.packages = epkgs: [
-    epkgs.manualPackages.treesit-grammars.with-all-grammars
-    epkgs.nerd-icons
-    epkgs.doom-modeline
-    epkgs.diminish
-    epkgs.eldoc
-    epkgs.pulsar
-    epkgs.which-key
-    epkgs.expreg
-    epkgs.vundo
-    epkgs.puni
-    epkgs.avy
-    epkgs.consult
-    epkgs.vertico
-    epkgs.marginalia
-    epkgs.crux
-    epkgs.magit
-    epkgs.nerd-icons-corfu
-    epkgs.corfu
-    epkgs.cape
-    epkgs.orderless
-    epkgs.yasnippet
-    epkgs.yasnippet-snippets
-    epkgs.rg
-    epkgs.exec-path-from-shell
-    epkgs.eat
-    epkgs.rust-mode
-    epkgs.rustic
-    epkgs.nix-mode
-    epkgs.hcl-mode
-    epkgs.shell-pop
-    epkgs.envrc
-    epkgs.nixpkgs-fmt
-    epkgs.f
-    epkgs.gptel
-    epkgs.catppuccin-theme
-    epkgs.eldoc-box
-    epkgs.sideline
-    epkgs.sideline-flymake
-    epkgs.sideline-eglot
-  ];
 }
 #+END_SRC
 
diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
index 67064a464..053b14e3a 100644
--- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
@@ -1,74 +1,29 @@
-{ pkgs, flakeRoot, ... }:
+{ config, pkgs, flakeRoot, ... }:
 
-let
-  emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
-in
 {
-  #################################
+  ############################
   # System-wide Emacs
-  #################################
+  ############################
   environment.systemPackages = [
-    emacsPkg
+    pkgs.emacs-pgtk.override { withTreeSitter = true; }
   ];
 
-  #################################
+  ############################
   # Home Manager configuration
-  #################################
+  ############################
+  # Only include these if this module is evaluated in the Home Manager context
+  # (i.e., via home-manager.nixosModules.home-manager)
   home.sessionVariables = {
     EDITOR = "emacs";
     XDG_SCREENSHOTS_DIR = "~/screenshots";
   };
 
   home.file = {
-    "emacs/early-init.el" = {
+    ".emacs.d/early-init.el" = {
       source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
-      target = ".emacs.d/early-init.el";
     };
-    "emacs/init.el" = {
+    ".emacs.d/init.el" = {
       source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
-      target = ".emacs.d/init.el";
     };
   };
-
-  home.packages = epkgs: [
-    epkgs.manualPackages.treesit-grammars.with-all-grammars
-    epkgs.nerd-icons
-    epkgs.doom-modeline
-    epkgs.diminish
-    epkgs.eldoc
-    epkgs.pulsar
-    epkgs.which-key
-    epkgs.expreg
-    epkgs.vundo
-    epkgs.puni
-    epkgs.avy
-    epkgs.consult
-    epkgs.vertico
-    epkgs.marginalia
-    epkgs.crux
-    epkgs.magit
-    epkgs.nerd-icons-corfu
-    epkgs.corfu
-    epkgs.cape
-    epkgs.orderless
-    epkgs.yasnippet
-    epkgs.yasnippet-snippets
-    epkgs.rg
-    epkgs.exec-path-from-shell
-    epkgs.eat
-    epkgs.rust-mode
-    epkgs.rustic
-    epkgs.nix-mode
-    epkgs.hcl-mode
-    epkgs.shell-pop
-    epkgs.envrc
-    epkgs.nixpkgs-fmt
-    epkgs.f
-    epkgs.gptel
-    epkgs.catppuccin-theme
-    epkgs.eldoc-box
-    epkgs.sideline
-    epkgs.sideline-flymake
-    epkgs.sideline-eglot
-  ];
 }