lib/mkmachine.nix

@@ -45,7 +45,6 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
       networking.hostName = name;
       nixpkgs.overlays = lib.mkAfter [
         (overlay-unstable system)
-        (import "${inputs.emacs-overlay}/overlays/emacs.nix")
         (_final: prev: {
           waybar = prev.waybar.overrideAttrs (oldAttrs: {
             mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];

lon.lock

@@ -51,16 +51,6 @@
       "url": "https://github.com/JulienMalka/dns.nix/archive/922d6a72ae1f4436cc8f8e04080c50aa65e0d749.tar.gz",
       "hash": "sha256-K2X21U4sSYtEZiDM0Eg/IV4wRs80kztLi6qaVDIUCJE="
     },
-    "emacs-overlay": {
-      "type": "GitHub",
-      "fetchType": "tarball",
-      "owner": "nix-community",
-      "repo": "emacs-overlay",
-      "branch": "master",
-      "revision": "920cd4e86af18bd67a60013d80a79ff2cd7a176b",
-      "url": "https://github.com/nix-community/emacs-overlay/archive/920cd4e86af18bd67a60013d80a79ff2cd7a176b.tar.gz",
-      "hash": "sha256-rQY2wY+KTGIH2oZFyqdsODjqmOJqyn+0BNURADQHi/s="
-    },
     "git-hooks": {
       "type": "GitHub",
       "fetchType": "tarball",

machines/fischer/default.nix

@@ -119,6 +119,7 @@
   environment.systemPackages = with pkgs; [
     tailscale
     brightnessctl
+    unstable.diffoscope
     sbctl
     wl-mirror
     texlive.combined.scheme-full

machines/gallifrey/home-julien.nix

@@ -54,7 +54,7 @@
 
     programs.emacs = {
       enable = true;
-      package = pkgs.emacs-igc;
+      package = pkgs.emacs30;
       extraPackages = epkgs: [
         epkgs.mu4e
       ];
@@ -100,7 +100,6 @@
         zotero
         emacsPackages.jinx
         hunspellDicts.en_US
-        hunspellDicts.fr-moderne
         forge-sparks
         citations
         blanket