about summary refs log tree commit diff
path: root/modules/workstation
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-08-13 19:08:01 +0000
committerAlyssa Ross <hi@alyssa.is>2020-08-15 18:21:25 +0000
commit7bdac978d5a63494d0f48b42b37e4f791e0c207d (patch)
treeec9d4c0ef347e16a810ab923a0e12442b3515273 /modules/workstation
parent8914aa6ec251920cc6367938bc02e3e4dfd42aa8 (diff)
downloadnixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.tar
nixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.tar.gz
nixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.tar.bz2
nixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.tar.lz
nixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.tar.xz
nixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.tar.zst
nixlib-7bdac978d5a63494d0f48b42b37e4f791e0c207d.zip
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.
Diffstat (limited to 'modules/workstation')
-rw-r--r--modules/workstation/emacs/default.nix12
-rw-r--r--modules/workstation/emacs/init.el (renamed from modules/workstation/emacs/default.el)0
2 files changed, 3 insertions, 9 deletions
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
diff --git a/modules/workstation/emacs/default.el b/modules/workstation/emacs/init.el
index 187f894764e2..187f894764e2 100644
--- a/modules/workstation/emacs/default.el
+++ b/modules/workstation/emacs/init.el