From 7bdac978d5a63494d0f48b42b37e4f791e0c207d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 13 Aug 2020 19:08:01 +0000
Subject: modules/emacs: move init file to XDG_CONFIG_HOME

early-init.el has to be here anyway, so init.el might as well be too,
for symmetry.
---
 modules/workstation/emacs/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'modules/workstation/emacs/default.nix')

diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index aa32464da3da..7ec0a1b27868 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -2,14 +2,7 @@
 
 {
   environment.systemPackages = with pkgs; [
-    ((emacsPackagesFor emacs-pgtk).emacsWithPackages (epkgs: [
-      (epkgs.trivialBuild {
-        pname = "qyliss";
-        unpackPhase = ''
-          cp ${./default.el} default.el
-        '';
-      })
-    ] ++ (with epkgs; [
+    ((emacsPackagesFor emacs-pgtk).emacsWithPackages (epkgs: with epkgs; [
       adoc-mode
       magit
       markdown-mode
@@ -17,7 +10,7 @@
       projectile
       rainbow-delimiters
       rust-mode
-    ])))
+    ]))
   ];
 
   home.qyliss.dirs."state/emacs" = {};
@@ -27,6 +20,7 @@
       nativeBuildInputs = [ emacs-pgtk ];
     } ''
       cp ${./early-init.el} early-init.el
+      cp ${./init.el} init.el
       emacs -L . --batch -f batch-byte-compile *.el
       install -d $out
       install *.el *.elc $out
-- 
cgit 1.4.1