diff --git a/Droidnix/README.org b/Droidnix/README.org
index 036553128..b1ee40bca 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1384,7 +1384,7 @@ package-archive-priorities '(("gnu"  . 99)
 
 ** =generated/.config/emacs/init.el=
 This contaions emacs
-#+BEGIN_SRC el :tangle generated/.config/emacs/init.el :noweb tangle :mkdirp yes
+#+BEGIN_SRC el :tangle generated/.config/emacs/init.el :noweb tangle :mkdirp yes :eval Never
 ;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
 
 ;;; Commentary:
@@ -1785,6 +1785,7 @@ the top of the file."
 (provide 'init)
 
 ;;; init.el ends here
+
 #+END_SRC
 
 * generated/modules/traveldroid/desktop
diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
index 0612095a6..737a81d17 100644
--- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
@@ -3,8 +3,6 @@
 let
   username = config.defaultUser or "henrov";
 
-  assetPath = "${flakeRoot}/generated/.config/emacs";
-
   # Emacs package with Tree-sitter support
   emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
@@ -50,6 +48,11 @@ let
     epkgs.sideline-flymake
     epkgs.sideline-eglot
   ];
+
+  # Emacs config files
+  earlyInitFile = "${flakeRoot}/generated/.config/emacs/early-init.el";
+  initFile      = "${flakeRoot}/generated/.config/emacs/init.el";
+
 in
 {
   # System-wide installation
@@ -72,14 +75,8 @@ in
       };
 
       home.file = {
-        ".emacs.d/early-init.el" = {
-          source = "${assetPath}/early-init.el";
-          force = true;  # <-- allow overwrite
-        };
-        ".emacs.d/init.el" = {
-          source = "${assetPath}/init.el";
-          force = true;  # <-- allow overwrite
-        };
+        ".emacs.d/early-init.el" = { source = earlyInitFile; };
+        ".emacs.d/init.el"       = { source = initFile; };
       };
     };
   };