From be802e3bf4dbbad81fa90846cd71f2af746fd5a9 Mon Sep 17 00:00:00 2001
From: Lander Van den Bulcke <landervandenbulcke@gmail.com>
Date: Tue, 26 Aug 2025 01:04:49 +0200
Subject: [PATCH] feat: add emacs-overlay

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
---
 flake.lock              | 70 +++++++++++++++++++++++++++++++++++------
 flake.nix               | 13 +++++++-
 hosts/wodan/default.nix |  5 +++
 3 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 271191c..e7c4d4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,6 +91,25 @@
         "type": "github"
       }
     },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1756141823,
+        "narHash": "sha256-Fakm5F02Z7pO2+RwPG8SXN/WIqUvqZERrwT76ISXfjo=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "6e64ccc5fe49ef8bbda0cecb3e281afdb53b3af7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -414,7 +433,39 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1755922037,
         "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
@@ -430,7 +481,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1741246872,
         "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
@@ -446,7 +497,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1738797219,
         "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
@@ -462,7 +513,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1730768919,
         "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
@@ -478,7 +529,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1722813957,
         "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
@@ -497,7 +548,7 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim_2",
         "pre-commit-hooks": "pre-commit-hooks"
       },
@@ -518,7 +569,7 @@
     "nixvim_2": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
@@ -563,7 +614,7 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "gitignore": "gitignore_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1741350116,
@@ -583,10 +634,11 @@
       "inputs": {
         "catppuccin": "catppuccin",
         "disko": "disko",
+        "emacs-overlay": "emacs-overlay",
         "headplane": "headplane",
         "home-manager": "home-manager",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix",
         "tidalcycles": "tidalcycles"
@@ -678,7 +730,7 @@
     "tidalcycles": {
       "inputs": {
         "dirt-samples-src": "dirt-samples-src",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "superdirt-src": "superdirt-src",
         "tidal-src": "tidal-src",
         "vim-tidal-src": "vim-tidal-src",
diff --git a/flake.nix b/flake.nix
index af8f1a5..3984512 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # emacs overlay
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+    };
+
     # tidalcycles
     tidalcycles = {
       url = "github:mitchmindtree/tidalcycles.nix";
@@ -49,6 +54,7 @@
     {
       self,
       nixpkgs,
+      emacs-overlay,
       tidalcycles,
       ...
     }@inputs:
@@ -61,7 +67,12 @@
         wodan = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs outputs; };
           modules = [
-            { nixpkgs.overlays = [ tidalcycles.overlays.default ]; }
+            {
+              nixpkgs.overlays = [
+                emacs-overlay.overlays.default
+                tidalcycles.overlays.default
+              ];
+            }
             ./hosts/wodan
           ];
         };
diff --git a/hosts/wodan/default.nix b/hosts/wodan/default.nix
index ca5991a..1e15352 100644
--- a/hosts/wodan/default.nix
+++ b/hosts/wodan/default.nix
@@ -78,6 +78,11 @@
 
   nixpkgs.config.allowUnfree = true;
 
+  services.emacs = {
+    enable = true;
+    package = pkgs.emacs-unstable;
+  };
+
   environment.systemPackages = with pkgs; [
     (firefox.override { nativeMessagingHosts = [ passff-host ]; })
     vim