Add emacs-overlay

flake.lock

@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "locked": {
+        "lastModified": 1635582806,
+        "narHash": "sha256-vsnnFdVWvrXh0bAx9+8N3cE/30EZAB9it4/V0cenl0w=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "016831103869d68a3dea56150f5224fdb32e5f8c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1631561581,
@@ -31,6 +46,7 @@
     },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }

flake.nix

@@ -2,8 +2,9 @@
   description = "dotfiles";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.emacs-overlay.url = "github:nix-community/emacs-overlay";
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, emacs-overlay }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
@@ -23,7 +24,9 @@
       nixosConfigurations = {
         dustbowl = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
-          modules = [ ./nixos/dustbowl.nix ];
+          modules = [ (import ./nixos/dustbowl.nix {
+            emacs-overlay = emacs-overlay;
+          }) ];
         };
       };
     };

nixos/dustbowl.nix

@@ -2,6 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
+{ emacs-overlay }:
 { config, pkgs, ... }:
 
 {
@@ -131,7 +132,7 @@
     mako
 
     # GUI software
-    emacs
+    emacsPgtk
     firefox
     thunderbird
     mpv
@@ -163,18 +164,14 @@
   programs.steam.enable = true;
 
   nixpkgs.config.packageOverrides = pkgs: rec {
-    # Override emacs
-    emacs = pkgs.emacs.override {
-      withGTK3 = true;
-      withGTK2 = false;
-    };
-
     # Override firefox
     firefox = pkgs.firefox.override {
       forceWayland = true;
     };
   };
 
+  nixpkgs.overlays = [ emacs-overlay.overlay ];
+
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 8080 ];
   networking.firewall.allowedUDPPorts = [ 8080 ];