From 6e94311435c3a5b4e136b51beb6b8ea33dac8d55 Mon Sep 17 00:00:00 2001
From: Philipp Hochkamp <git@phochkamp.de>
Date: Sun, 29 May 2022 04:03:32 +0200
Subject: [PATCH] daedalus emacs overlay

---
 flake.lock                 | 67 +++++++++++++++++++++++++++++++++-----
 flake.nix                  |  6 +++-
 hosts/daedalus/default.nix |  2 ++
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 906c1698..adec01c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,6 +92,25 @@
         "type": "github"
       }
     },
+    "emacs-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1653765690,
+        "narHash": "sha256-W34uZuE/QgVPvuO3xlg4BH/O50DIQUPz6NfFlU3sKcM=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "e3994fc8b0cf4a1dc1080e697a09d33d9faa5e39",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -109,6 +128,21 @@
       }
     },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1652776076,
+        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -181,7 +215,7 @@
     },
     "neovim-flake": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "neovim-nightly-overlay",
           "nixpkgs"
@@ -243,18 +277,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653495658,
-        "narHash": "sha256-66YwJ6nuDHRxpYRiKtNC3qA9QkrHHJn6c+cJriiOGZI=",
+        "lastModified": 1653738054,
+        "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7fa8d8b2e206be87de8e4128441384f171c8a33b",
+        "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs-master": {
@@ -273,6 +305,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1653495658,
+        "narHash": "sha256-66YwJ6nuDHRxpYRiKtNC3qA9QkrHHJn6c+cJriiOGZI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7fa8d8b2e206be87de8e4128441384f171c8a33b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nnn-vim": {
       "flake": false,
       "locked": {
@@ -334,11 +382,12 @@
         "coc-nvim": "coc-nvim",
         "dart-vim": "dart-vim",
         "darwin": "darwin",
+        "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-master": "nixpkgs-master",
         "nnn-vim": "nnn-vim",
         "pandoc-latex-template": "pandoc-latex-template",
diff --git a/flake.nix b/flake.nix
index 9061283d..5bd71f1e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,9 @@
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     utils.url = "github:numtide/flake-utils";
+    ## emacs
+    emacs-overlay.url = "github:nix-community/emacs-overlay";
+
     ## vim
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
@@ -37,7 +40,7 @@
     agkozak-zsh-prompt.flake = false;
   };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-master, agenix, home-manager, impermanence, darwin, utils, neovim-nightly-overlay, ... }:
+  outputs = inputs @ { self, nixpkgs, nixpkgs-master, agenix, home-manager, impermanence, darwin, utils, emacs-overlay, neovim-nightly-overlay, ... }:
     let
       extraSystems = [ ];
       lib = nixpkgs.lib.extend (self: super: {
@@ -50,6 +53,7 @@
         overlays = [
           self.overlay
           neovim-nightly-overlay.overlay
+          emacs-overlay.overlay
           (final: prev: {
             my = self.packages.${prev.system};
           })
diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix
index cffd6cd1..6b45b815 100644
--- a/hosts/daedalus/default.nix
+++ b/hosts/daedalus/default.nix
@@ -59,6 +59,8 @@ with lib.my;
       terraform-ls
       terraform
 
+      emacsNativeComp
+
       pandoc
       texlive.combined.scheme-full