diff options
| -rw-r--r-- | macos.local/.flake/home/programs/emacs/core.nix.org | 33 | ||||
| -rw-r--r-- | macos.local/.flake/system/homebrew.nix.org | 12 |
2 files changed, 13 insertions, 32 deletions
diff --git a/macos.local/.flake/home/programs/emacs/core.nix.org b/macos.local/.flake/home/programs/emacs/core.nix.org index d891ccb..1645f53 100644 --- a/macos.local/.flake/home/programs/emacs/core.nix.org +++ b/macos.local/.flake/home/programs/emacs/core.nix.org @@ -1,10 +1,6 @@ #+title: Emacs Configuration -Here is my Emacs configuration. Define configuration files that should exist, define a macOS application wrapper for =emacsclient= that runs =emacsclient= and disowns the process before closing. Apply patches from =d12frosted/emacs-plus= Homebrew package for Emacs: -- Fix OS window role (=yabai= needs this to tile Emacs) -- Enable rounded window with no decoration (I don't really use this) -- Make Emacs aware of OS-level light/dark mode - +Here is my Emacs configuration. This file just defines configurations that should exist. Emacs is installed with Homebrew. #+begin_src nix { config, pkgs, ... }: @@ -13,32 +9,5 @@ Here is my Emacs configuration. Define configuration files that should exist, de "./.config/emacs/feed.org".source = ./feed.org; "./.config/emacs/init.el".source = ./init.el; }; - nixpkgs.overlays = [ - (final: prev: - { - emacs = prev.emacs.overrideAttrs (old: { - patches = (old.patches or []) - ++ [ - (prev.fetchpatch { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"; - sha256 = "sha256-+z/KfsBm1lvZTZNiMbxzXQGRTjkCFO4QPlEK35upjsE="; - }) - (prev.fetchpatch { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-29/round-undecorated-frame.patch"; - sha256 = "sha256-uYIxNTyfbprx5mCqMNFVrBcLeo+8e21qmBE3lpcnd+4="; - }) - (prev.fetchpatch { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/system-appearance.patch"; - sha256 = "sha256-oM6fXdXCWVcBnNrzXmF0ZMdp8j0pzkLE66WteeCutv8="; - }) - ]; - }); - } - ) - ]; - programs.emacs = { - enable = true; - package = pkgs.emacs; - }; } #+end_src diff --git a/macos.local/.flake/system/homebrew.nix.org b/macos.local/.flake/system/homebrew.nix.org index 4ea5bc0..b6ea6a0 100644 --- a/macos.local/.flake/system/homebrew.nix.org +++ b/macos.local/.flake/system/homebrew.nix.org @@ -18,6 +18,7 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat }; taps = [ + "d12frosted/emacs-plus" "homebrew/bundle" "homebrew/cask-fonts" "homebrew/cask-versions" @@ -40,6 +41,17 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat "curl" "dos2unix" "dotnet" + { + name = "emacs-plus"; + args = [ + "with-native-comp" + "with-imagemagick" + "with-xwidgets" + "with-mailutils" + "with-ctags" + "with-retro-sink-bw-icon" + ]; + } "eza" "fd" "gcc" |