diff --git a/flake.lock b/flake.lock index 370c388..e8d1106 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ "doom-snippets": { "flake": false, "locked": { - "lastModified": 1676839496, - "narHash": "sha256-1Ay9zi0u1lycmEeFqIxr0RWH+JvH9BnzgRzkPeWEAYY=", + "lastModified": 1694887483, + "narHash": "sha256-KlKhruPSLPSKqUnr5/U65arm16VrY9ORzm+XKNZhpTQ=", "owner": "doomemacs", "repo": "snippets", - "rev": "fe4003014ae00b866f117cb193f711fd9d72fd11", + "rev": "f022984ee1318a4015d5d081b3c3dab5a60dc6ff", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690020840, - "narHash": "sha256-JSzBByEy0vzB5qGog+pPxZWg5/hG7Uhr74eMeML6MkM=", + "lastModified": 1705481628, + "narHash": "sha256-9u+bD9lEzZoNxdQhTapaumcIUzA9Ej4aBk1KdZ1jevk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3862b237a56b02ddd88c9dcfc74c9ee3d3f936a5", + "rev": "7e2ecc3654c3daa74a1f72826cac9b8fd13a7f06", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -591,11 +591,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -846,11 +846,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1689075996, - "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=", + "lastModified": 1701264882, + "narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "9a5b34d9ba30842eb8f0d7deb08bf03a75930471", + "rev": "f7413022370f24bb53cb450bfb2803233510113e", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "nix-straight": { "flake": false, "locked": { - "lastModified": 1666982610, - "narHash": "sha256-xjgIrmUsekVTE+MpZb5DMU8DQf9DJ/ZiR0o30L9/XCc=", + "lastModified": 1694361489, + "narHash": "sha256-kjDp+j6OtrmqbtjQB5uuOtjS08+kgJQuxFqhWE1Y9Rw=", "owner": "nix-community", "repo": "nix-straight.el", - "rev": "ad10364d64f472c904115fd38d194efe1c3f1226", + "rev": "748be99b84be0b130e946288099806a0f16d6e57", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689940971, - "narHash": "sha256-397xShPnFqPC59Bmpo3lS+/Aw0yoDRMACGo1+h2VJMo=", + "lastModified": 1705316053, + "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ca785644d067445a4aa749902b29ccef61f7476", + "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", "type": "github" }, "original": { @@ -1152,16 +1152,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1689885880, - "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=", + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -1384,11 +1384,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1682566018, - "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=", + "lastModified": 1695806987, + "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2", + "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", "type": "github" }, "original": { @@ -1518,11 +1518,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1683136293, - "narHash": "sha256-PMHNr3Qo62uqO5IUDAfxUoqa4Zvb9y2J76pRYDB/6Y4=", + "lastModified": 1695726851, + "narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "080710797ad25e76c4556d2b03cc0aa5313cd187", + "rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9", "type": "github" }, "original": { @@ -1534,11 +1534,11 @@ "org-contrib": { "flake": false, "locked": { - "lastModified": 1675694242, - "narHash": "sha256-4Fn33CTVTCqh5TyVAggSr8Fm8/hB8Xgl+hkxh3WCrI8=", + "lastModified": 1694946041, + "narHash": "sha256-X/HFG6NZe5BY00KvGbcsIuf9R6Lg8x7Uhd0Y5+Q3qZU=", "owner": "emacsmirror", "repo": "org-contrib", - "rev": "fff6c888065588527b1c1d7dd7e41c29ef767e17", + "rev": "5eabbf22bdd4523c922a30787e98ee66c24221aa", "type": "github" }, "original": { @@ -1597,11 +1597,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1681386605, - "narHash": "sha256-9Q7aWgjAV37iJp6oYDz45e8J+RKwKY1Uvgg/BXwf5nQ=", + "lastModified": 1695738029, + "narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=", "owner": "hakimel", "repo": "reveal.js", - "rev": "0301ce58ab185f7191696e16b1b6389f58df2892", + "rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757", "type": "github" }, "original": { @@ -1924,11 +1924,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1681029086, - "narHash": "sha256-z3eVkAPFI6JYZZ+2XM496zBxwnujTp4Y4KNNfqgUC/E=", + "lastModified": 1695278494, + "narHash": "sha256-O4NcUC1u08W8ZslqoA/i+iTaLotKwheURXQWBxLLMFc=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "5fd2a5afe2112ac23b58ee1b12730fcf16068df3", + "rev": "70b2c79ff4daa7351d4e2917b0343b9a18d4d4f2", "type": "github" }, "original": { diff --git a/home/emacs.nix b/home/emacs.nix index e5233ae..bd4d06d 100644 --- a/home/emacs.nix +++ b/home/emacs.nix @@ -2,32 +2,13 @@ # Or: # # open -a ~/Applications/Home\ Manager\ Apps/Emacs.app -{ pkgs, lib, flake, ... }: +{ pkgs, flake, ... }: -let - package = - let - # Pgtk won't be available until emacs 29; so we must use the nightly overlay - # cf. https://github.com/NixOS/nixpkgs/issues/192692#issuecomment-1256872679 - emacsPgtkWithXwidgets = flake.inputs.emacs-overlay.packages.${pkgs.system}.emacsPgtk.override { - withXwidgets = true; - }; - myEmacs = emacsPgtkWithXwidgets.overrideAttrs (oa: { - buildInputs = oa.buildInputs ++ lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.WebKit ]; - }); - in - (pkgs.emacsPackagesFor myEmacs).emacsWithPackages (epkgs: [ - epkgs.vterm - ]); -in { imports = [ flake.inputs.nix-doom-emacs.hmModule ]; programs.doom-emacs = { enable = true; - # Disabling until https://github.com/nix-community/nix-doom-emacs/issues/409 - # emacsPackage = package; emacsPackage = pkgs.emacs29-pgtk; doomPrivateDir = ./emacs/doom; };