diff --git a/Droidnix/README.org b/Droidnix/README.org index b1ee40bca..026173e4a 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1205,6 +1205,8 @@ This installs emacs let username = config.defaultUser or "henrov"; + assetPath = "${flakeRoot}/generated/.config/emacs"; + # Emacs package with Tree-sitter support emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; }; @@ -1250,11 +1252,6 @@ 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 @@ -1277,12 +1274,19 @@ in }; home.file = { - ".emacs.d/early-init.el" = { source = earlyInitFile; }; - ".emacs.d/init.el" = { source = initFile; }; + ".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 + }; }; }; }; } + #+END_SRC ** =generated/.config/emacs/early-init.el= diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix index 737a81d17..0612095a6 100644 --- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix +++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix @@ -3,6 +3,8 @@ let username = config.defaultUser or "henrov"; + assetPath = "${flakeRoot}/generated/.config/emacs"; + # Emacs package with Tree-sitter support emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; }; @@ -48,11 +50,6 @@ 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 @@ -75,8 +72,14 @@ in }; home.file = { - ".emacs.d/early-init.el" = { source = earlyInitFile; }; - ".emacs.d/init.el" = { source = initFile; }; + ".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 + }; }; }; };