switches to homebrew emacs

flake.lock

@@ -60,22 +60,6 @@
         "type": "github"
       }
     },
-    "emacs-overlay": {
-      "locked": {
-        "lastModified": 1644575200,
-        "narHash": "sha256-7BaSTzlAI/xndvPIieZSZOB5Nsgtrb7L5HqdGGdVbwg=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "da2f552d133497abd434006e0cae996c0a282394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "da2f552d133497abd434006e0cae996c0a282394",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -221,7 +205,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager_2",
         "ip-whitelist": "ip-whitelist",
         "nix-darwin": "nix-darwin",

flake.nix

@@ -12,7 +12,6 @@
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     ip-whitelist.url = "github:Oak-Digital/nixos-ip-whitelist-firewall";
     nix-homebrew.url = "github:zhaofengli/nix-homebrew";
-    emacs-overlay.url = "github:nix-community/emacs-overlay/da2f552d133497abd434006e0cae996c0a282394";
   };
 
   outputs =

home/darwin.nix

@@ -10,10 +10,6 @@
     GOPATH = "$HOME/go";
   };
 
-  home.packages = with pkgs; [
-    # (aspellWithDicts (dicts: with dicts; [en en-computers en-science]))
-  ];
-
   xdg.enable = true;
 
   imports = [
@@ -24,7 +20,6 @@
     ../modules/wezterm
     ../modules/nvim
     ../modules/lazygit
-    ../modules/emacs
   ];
 
   programs.home-manager.enable = true;

hosts/dnsc-air/default.nix

@@ -25,11 +25,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  # Overlays
-  nixpkgs.overlays = [
-    (import inputs.emacs-overlay)
-  ];
-
   # System Packages
   environment.systemPackages = with pkgs; [
     git
@@ -65,8 +60,6 @@
     fnm
     imagemagick
     restic
-    # emacs-patched
-    emacsPgtk
   ];
 
   # Homebrew
@@ -89,6 +82,7 @@
 
     taps = [
       "homebrew/services"
+      "d12frosted/emacs-plus"
     ];
 
     masApps = {
@@ -100,6 +94,7 @@
     brews = [
       "mas"
       "go"
+      "emacs-plus"
     ];
 
     casks = [

modules/emacs/default.nix

@@ -1,41 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.emacs = {
-    enable = true;
-
-    extraPackages = epkgs: [ epkgs.vterm ];
-
-    package = pkgs.emacs-unstable-pgtk.overrideAttrs (
-      final: prev: {
-        # `emacs-28` patches are compatible with `emacs-29`.
-        #
-        # Where a compatible path exists, there is a symlink upstream to keep
-        # things clean, but GitHub doesn't follow symlinks to generate the
-        # responses we need (instead GitHub returns the target of the symlink).
-        patches = (prev.patches or [ ]) ++ [
-          # Fix OS window role (needed for window managers like yabai)
-          (pkgs.fetchpatch {
-            url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch";
-            sha256 = "0c41rgpi19vr9ai740g09lka3nkjk48ppqyqdnncjrkfgvm2710z";
-          })
-          # Use poll instead of select to get file descriptors
-          (pkgs.fetchpatch {
-            url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-29/poll.patch";
-            sha256 = "0j26n6yma4n5wh4klikza6bjnzrmz6zihgcsdx36pn3vbfnaqbh5";
-          })
-          # Enable rounded window with no decoration
-          (pkgs.fetchpatch {
-            url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-29/round-undecorated-frame.patch";
-            sha256 = "0x187xvjakm2730d1wcqbz2sny07238mabh5d97fah4qal7zhlbl";
-          })
-          # Make Emacs aware of OS-level light/dark mode
-          (pkgs.fetchpatch {
-            url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/system-appearance.patch";
-            sha256 = "14ndp2fqqc95s70fwhpxq58y8qqj4gzvvffp77snm2xk76c1bvnn";
-          })
-        ];
-      }
-    );
-  };
-}