diff --git a/flake.lock b/flake.lock index d6d2f77..660f131 100644 --- a/flake.lock +++ b/flake.lock @@ -174,8 +174,8 @@ }, "nixpkgs-emacs": { "locked": { - "lastModified": 1722270729, - "narHash": "sha256-DKurV39efy6huLsfQX3Wc1T81bGJt6oLyKjrYO7pnUE=", + "lastModified": 1722289915, + "narHash": "sha256-oMkmKmtV4oAQ95FLEHkIa9DewxVS8Js4RaI5LsJ5Qt0=", "path": "/Users/m.sawyer/workspaces/nixpkgs", "type": "path" }, diff --git a/home/KD21QWDKW7.nix b/home/KD21QWDKW7.nix index 68cfbb9..ce94568 100644 --- 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 index cde038a..6fd4569 100644 --- 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 _)