modules/emacs: set user-emacs-directory early

This will prevent a warning on startup that $XDG_CONFIG_HOME/.emacs.d
isn't writable.

3 files changed, 14 insertions, 4 deletions

diff --git a/modules/workstation/emacs/default.el b/modules/workstation/emacs/default.el
index 95bfc762a975..187f894764e2 100644
--- a/modules/workstation/emacs/default.el
+++ b/modules/workstation/emacs/default.el
@@ -11,10 +11,6 @@
 ;;; Major modes ;;;
 (add-to-list 'auto-mode-alist (cons "\\.adoc\\'" 'adoc-mode))
 
-;;; Filesystem locations ;;;
-(setq user-emacs-directory
-      (concat (file-name-as-directory (getenv "XDG_DATA_HOME")) "emacs"))
-
 ;;; ispell ;;;
 ;; System locale is Esperanto, but I write in English much more, and
 ;; spelling in Esperanto is easy anyway. ;)
diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index b1c99b9b9baf..aa32464da3da 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -21,4 +21,14 @@
   ];
 
   home.qyliss.dirs."state/emacs" = {};
+
+  users.users.qyliss.xdg.config.paths."emacs" = with pkgs;
+    runCommandNoCC ".emacs.d" {
+      nativeBuildInputs = [ emacs-pgtk ];
+    } ''
+      cp ${./early-init.el} early-init.el
+      emacs -L . --batch -f batch-byte-compile *.el
+      install -d $out
+      install *.el *.elc $out
+    '';
 }
diff --git a/modules/workstation/emacs/early-init.el b/modules/workstation/emacs/early-init.el
new file mode 100644
index 000000000000..8cac0647dd4e
--- /dev/null
+++ b/modules/workstation/emacs/early-init.el
@@ -0,0 +1,4 @@
+;; This defaults to XDG_CONFIG_HOME, which is bad because lots of
+;; state gets written to it.
+(setq user-emacs-directory
+      (concat (file-name-as-directory (getenv "XDG_DATA_HOME")) "emacs"))