use custom nixpkgs for emacs, resulting in upgrade to 29.4

mattsawyer77 · Jul 29, 2024 · 6d1d8f2 · 6d1d8f2
1 parent d48759b
commit 6d1d8f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/KD21QWDKW7.nix b/home/KD21QWDKW7.nix
@@ -1,4 +1,14 @@
-{ config, lib, pkgs, username, fontConfig, mkalias, ... }:
+{ config
+, lib
+, pkgs
+, username
+# , darwin-emacs
+# , emacs-overlay
+, mkalias
+#, poetry2nix
+, nixpkgs-emacs
+, ...
+}:
 
 let
   homeDirectory = "/Users/" + username;
@@ -107,7 +117,9 @@ in
     (import ./doom {
       inherit pkgs username envVars;
       doomDir = doomDirectory;
-      emacsPackage = pkgs.emacs29-macport;
+      # use default emacs package for now
+      # emacsPackage = pkgs.emacs29-macport;
+      emacsPackage = nixpkgs-emacs.outputs.legacyPackages.aarch64-darwin.emacs29-macport;
     })
     (import ./git {
       inherit config pkgs lib;

diff --git a/home/doom/emacs/+ui.el b/home/doom/emacs/+ui.el
@@ -14,9 +14,9 @@
                '(menu-bar-lines . 0)
                )))
 
-;; (when (featurep :system 'macos)
-;;   (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
-;;   (add-to-list 'default-frame-alist '(ns-appearance . dark)))
+(when (featurep :system 'macos)
+  (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
+  (add-to-list 'default-frame-alist '(ns-appearance . dark)))
 
 ;;; XXX: titlebar shenanigans
 ;; (defun ns-auto-titlebar-set-frame (frame &rest _)