From f54d1ce5b27b304e61226227f3c8adc65ee3dcc6 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 15 May 2022 20:05:07 +0200
Subject: [PATCH] emacs: use standard nixpkgs build

Now that native comp is stable I don't need the overlay, which triggered
a full emacs build almost everytime I bumped it.
---
 .github/workflows/cachix.yaml |  1 -
 flake.lock                    | 54 ++---------------------------------
 flake.nix                     | 33 +++------------------
 home/emacs.nix                |  2 +-
 4 files changed, 7 insertions(+), 83 deletions(-)

diff --git a/.github/workflows/cachix.yaml b/.github/workflows/cachix.yaml
index f0eb080..ccde1ae 100644
--- a/.github/workflows/cachix.yaml
+++ b/.github/workflows/cachix.yaml
@@ -46,7 +46,6 @@ jobs:
       fail-fast: false
       matrix:
         name:
-        - emacsPgtkNativeComp
         - grafanaDashboards/nginx
         - grafanaDashboards/node-exporter
         - kaleidoscope-udev-rules
diff --git a/flake.lock b/flake.lock
index dd111b4..6767feb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,42 +18,7 @@
         "type": "github"
       }
     },
-    "emacs-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1652613188,
-        "narHash": "sha256-vHp4U0y0w0ntf4LF8zk0FTbTkwiiJtbs78eSYQVSABw=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "972925e3f1b6724eaf6a896f1ae9390d205fcaae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1652557277,
-        "narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "locked": {
         "lastModified": 1648297722,
         "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
@@ -139,20 +104,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1652574577,
-        "narHash": "sha256-MoSWPtue4Wi9+kRDxUbLWEBCL8Bswaa8kVMh2JYpSJg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "118ec238bfb788a34f1d53c4d95931fadfa70367",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1652467128,
         "narHash": "sha256-1wuQ7QgPQ3tugYcoVMJ3pUzl4wVdBzKZr9qtJAgA4VI=",
@@ -171,11 +122,10 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "emacs-overlay": "emacs-overlay",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable-small": "nixpkgs-unstable-small"
       }
     }
diff --git a/flake.nix b/flake.nix
index 6d516eb..bf6fc2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,13 +21,6 @@
       repo = "agenix";
     };
 
-    emacs-overlay = {
-      type = "github";
-      owner = "nix-community";
-      repo = "emacs-overlay";
-      ref = "master";
-    };
-
     home-manager = {
       type = "github";
       owner = "nix-community";
@@ -117,8 +110,6 @@
 
               {
                 nixpkgs.overlays = [
-                  inputs.emacs-overlay.overlay
-
                   # uncomment this to build everything from scratch, fun but takes a
                   # while
                   #
@@ -140,12 +131,6 @@
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-pc-laptop
               inputs.nixos-hardware.nixosModules.common-pc-ssd
-
-              {
-                nixpkgs.overlays = [
-                  inputs.emacs-overlay.overlay
-                ];
-              }
             ]
             ++ sharedModules;
         };
@@ -153,19 +138,9 @@
     }
     // inputs.flake-utils.lib.eachDefaultSystem (system: {
       packages =
-        (
-          inputs.flake-utils.lib.flattenTree
-          (import ./pkgs {pkgs = import nixpkgs {inherit system;};})
-        )
-        // {
-          emacsPgtkNativeComp =
-            (
-              import nixpkgs {
-                inherit system;
-                overlays = [inputs.emacs-overlay.overlay];
-              }
-            )
-            .emacsPgtkNativeComp;
-        };
+        inputs.flake-utils.lib.flattenTree
+        (import ./pkgs {
+          pkgs = import nixpkgs {inherit system;};
+        });
     });
 }
diff --git a/home/emacs.nix b/home/emacs.nix
index 627f91c..6e642fc 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -42,7 +42,7 @@ in {
 
     programs.emacs = {
       enable = true;
-      package = pkgs.emacsPgtkNativeComp;
+      package = pkgs.emacsNativeComp;
       extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools];
     };
   };