From ccc1eac53ffa7d676ee5883138dfc579263a8283 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 18 Mar 2021 23:17:17 +0100
Subject: Update

---
 gui/emacs.nix    | 16 ++--------------
 nix/sources.json | 18 +++++++++---------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/gui/emacs.nix b/gui/emacs.nix
index 2c253f1..52c6345 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -55,15 +55,7 @@ in {
       alwaysEnsure = false;
       # remove builtin org as in https://github.com/chrisbarrett/.emacs.d/blob/6efd82c8e328e677dbef84331ed54763b89667a3/default.nix
       # this is a workaround until I find a better way to force usage of a non-builtin up-to-date org version
-      package = pkgs-unstable.emacsGcc.overrideAttrs (old: {
-        patches = old.patches ++ [
-          ./patch/optional-org-gnus.patch
-        ];
-        postPatch = ''
-          ${old.postPatch}
-          rm -r test/lisp/org lisp/org etc/org etc/ORG-NEWS doc/misc/org.texi
-        '';
-      });
+      package = pkgs-unstable.emacsGcc;
       extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
         pdf-tools
         mu4e-alert
@@ -100,11 +92,7 @@ in {
     org-protocol-shortcut
   ];
 
-  # see https://github.com/rycee/home-manager/issues/589#issuecomment-466594137
-  home.activation.linkInitEl = config.lib.dag.entryAfter ["writeBoundary"] ''
-    mkdir -p ~/.emacs.d
-    ln -s ${toString ./conf/init.el} ~/.emacs.d/init.el
-  '';
+  home.file.".emacs.d/init.el".source = config.lib.file.mkOutOfStoreSymlink ./conf/init.el;
 
   systemd.user.services.emacs.Service.ExecStart = pkgs.lib.mkForce "${pkgs.runtimeShell} -l -c 'exec emacs --fg-daemon'";
 
diff --git a/nix/sources.json b/nix/sources.json
index 77aed97..21a7942 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "65e4ae8ddec6c94263aefb4ec9d8294b600280ae",
-        "sha256": "1m434qh28ii1pp0xjnp3wqy009z2pn3km36iffr87d1sk4122f2h",
+        "rev": "1b67b256be67f19fbdb1a92eda4794fc078f82b3",
+        "sha256": "0k0h0nz9kvp1dnnab9fsd72cksd8nd2nx7a909kashkl0m8s4i52",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/65e4ae8ddec6c94263aefb4ec9d8294b600280ae.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/1b67b256be67f19fbdb1a92eda4794fc078f82b3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -54,10 +54,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4d0ee90c6e253d40920f8dae5edb717a7d6f151d",
-        "sha256": "0i4w6zfj1pz52lnpdz4qn9m8d96zlmwfgizi5dsdy3vcqxdwkqi3",
+        "rev": "6be212cce73f4ce4f65375fbdebcf0b87b182bc0",
+        "sha256": "1m1171q3dk5d57xi8rnpsg10dpwy5q5lw5xxgplzhzyrcpjn1433",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/4d0ee90c6e253d40920f8dae5edb717a7d6f151d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/6be212cce73f4ce4f65375fbdebcf0b87b182bc0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
@@ -66,10 +66,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5df05c902cde398e056eb6271d5fe13e418db4c6",
-        "sha256": "12plc7k251z1dmmrd29lyrpw0xmjvmf79yj568aapzrcki5mrw74",
+        "rev": "c5147860e23ed75ce9d40298c66b416c00be1167",
+        "sha256": "104mw4rfbzyrfkxq468dlk38drrjx92dgyvkazgci67a6cx3n6nx",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5df05c902cde398e056eb6271d5fe13e418db4c6.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/c5147860e23ed75ce9d40298c66b416c00be1167.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
-- 
cgit v1.2.3