From dcff0e0ed17dcfcbd97c2658bad64ef5765a3516 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Wed, 17 Mar 2021 10:16:42 +0100
Subject: [PATCH] Use a wayland-native emacs

---
 flake.lock        | 41 +++++++++++++++++++++++++++++------------
 flake.nix         |  7 ++++---
 modules/emacs.nix |  1 +
 modules/nix.nix   |  5 ++++-
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9986a68d..7f91bcdf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "locked": {
+        "lastModified": 1615911877,
+        "narHash": "sha256-r068WLpoigoSIZJ4rRO3LxkjXdvOKZsPF/jEzzu54A4=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "54967f1a51f2742c580c7ab1f3174e2e1afe874f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1614513358,
@@ -23,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1615753545,
-        "narHash": "sha256-FR6vHvQlmQFAA26wNguEGWwav40Xgy9U6vRpT6UneTg=",
+        "lastModified": 1615943941,
+        "narHash": "sha256-ocj+ngGSJ0SRHjp3UDH76TQA8XXUxemAQDDJp32k5Rw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07f6c6481e0cbbcaf3447f43e964baf99465c8e1",
+        "rev": "920ea74afee92d321a4ff7dc714b165daaad78ec",
         "type": "github"
       },
       "original": {
@@ -38,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1615787985,
-        "narHash": "sha256-T19Svy8c82yxj2RZkxZJ95sqYznT01fmWFBB6W+t5Vk=",
+        "lastModified": 1615921413,
+        "narHash": "sha256-pr9UUS52tsKTr5FvOCrY6IErpgWmY7EML/lV6dvKtoU=",
         "owner": "chvp",
         "repo": "nixpkgs",
-        "rev": "7d804ec1692d96c3810710098849531d8ca81d4d",
+        "rev": "e9f42f11e5c43893babbe832a1e835e0eefc5ac8",
         "type": "github"
       },
       "original": {
@@ -54,11 +70,11 @@
     },
     "nixpkgsFor0AD": {
       "locked": {
-        "lastModified": 1615810318,
-        "narHash": "sha256-U/7V1Tw+kolLbCymu3H6UvxiqZwvDjaGkCMmlpyKERw=",
+        "lastModified": 1615972400,
+        "narHash": "sha256-NGTJ23KbaX+2AwP5CeHx+lECib14KxnKkB/DbDBzUT0=",
         "owner": "chvp",
         "repo": "nixpkgs",
-        "rev": "9f14e8b59ceb1280a8b9ac982ed5e413ff6fbcb4",
+        "rev": "ec2181692f9868ca1a7cf39ef443b3ef81b4cbaa",
         "type": "github"
       },
       "original": {
@@ -70,11 +86,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1615795092,
-        "narHash": "sha256-I4GhjzycLkzIPWBx0GD5J2EUDQLijEvIYCZ9HuwfGPo=",
+        "lastModified": 1615967307,
+        "narHash": "sha256-B4IEO1XOY1ZDrB3leXPdjFgIFboaP5p8zPqR+focmNE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b353e4ce5723c24baf13b5c71d4b32901cd9ad7c",
+        "rev": "777e1e28ed519a4b358f9196fc46c08845303763",
         "type": "github"
       },
       "original": {
@@ -85,6 +101,7 @@
     },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 7347c3ff..eaefa71f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,17 +2,18 @@
   description = "Nixos configuration flake";
 
   inputs = {
+    emacs-overlay.url = "github:nix-community/emacs-overlay/master";
     flake-utils.url = "github:numtide/flake-utils/master";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nur.url = "github:nix-community/NUR";
     nixpkgs.url = "github:chvp/nixpkgs/master";
     nixpkgsFor0AD.url = "github:chvp/nixpkgs/0ad0.24";
+    nur.url = "github:nix-community/NUR";
   };
 
-  outputs = { self, nixpkgs, nixpkgsFor0AD, nur, home-manager, flake-utils }:
+  outputs = { self, emacs-overlay, nixpkgs, nixpkgsFor0AD, nur, home-manager, flake-utils }:
     let
       version-suffix = nixpkgs.rev or (builtins.toString nixpkgs.lastModified);
       pkgsFor = system: import nixpkgs {
@@ -33,7 +34,7 @@
             nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
           })
           ({ pkgs, ... }: {
-            nixpkgs.overlays = [ nur.overlay ];
+            nixpkgs.overlays = [ nur.overlay emacs-overlay.overlay ];
             home-manager.sharedModules = [ pkgs.nur.repos.rycee.hmModules.emacs-init ];
           })
           (./. + "/machines/${hostname}")
diff --git a/modules/emacs.nix b/modules/emacs.nix
index f1262c06..439528f3 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -12,6 +12,7 @@
     home-manager.users.charlotte = { ... }: {
       programs.emacs = {
         enable = true;
+        package = pkgs.emacsPgtkGcc;
         init = {
           enable = true;
           prelude = ''
diff --git a/modules/nix.nix b/modules/nix.nix
index 90d0f353..594a1180 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -76,7 +76,10 @@ in
         dates = [ "hourly" ];
       };
       trustedUsers = [ "@wheel" ];
-      extraOptions = (lib.optionalString config.chvp.nix.enableDirenv ''
+      extraOptions = ''
+        substituters = https://cache.nixos.org https://nix-community.cachix.org
+        trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
+      '' + (lib.optionalString config.chvp.nix.enableDirenv ''
         keep-outputs = true
         keep-derivations = true
       '') + (lib.optionalString config.chvp.nix.enableFlakes ''