From 6b5d16cd6dd26d28ea2be58501c9400dd1b58ede Mon Sep 17 00:00:00 2001 From: larstvei Date: Tue, 27 Jun 2023 17:17:24 +0200 Subject: [PATCH] Update Xwidgets support seems to have been broken. Also, I now needed to add treesitter support explicitly. I also added some fonts. I am not happy with loosing Xwidgets, although I didn't really use it. --- flake.lock | 81 ++++++++++++++++++++++++++++++++++-------------- flake.nix | 3 +- modules/home.nix | 1 + modules/mac.nix | 3 ++ 4 files changed, 64 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 7fa1893..f402bfb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1684774948, - "narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=", + "lastModified": 1687691275, + "narHash": "sha256-VVywT8ubStvDPF5TscDBokT3T0l3zsOzCW056noh5zc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "b8c286c82c6b47826a6c0377e7017052ad91353c", + "rev": "25ae710ba3cd448c5d5678788d37f3d149378bc0", "type": "github" }, "original": { @@ -23,14 +23,15 @@ "emacs": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1685384353, - "narHash": "sha256-AIJW/Mu0s2gf1M1Hn5U5tuFMnJRpZ4dVai42x6CpimU=", + "lastModified": 1687803450, + "narHash": "sha256-vDf+0cn+u10oA2ducrFvJR+eK8djoZPwlCb9J1rK1pQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3ed7dbbbfaf8014175bc25d3f88702e4e522d9d6", + "rev": "d61bf076fb5894c8184be50c72eb1def13e2d232", "type": "github" }, "original": { @@ -40,12 +41,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -61,11 +65,11 @@ ] }, "locked": { - "lastModified": 1685395684, - "narHash": "sha256-XUUWE5XJiGZ2Wi+Mxv/mIwKYDPEC8gYHkHyT3+/sciY=", + "lastModified": 1687647343, + "narHash": "sha256-1/o/i9KEFOBdlF9Cs04kBcqDFbYMt6W4SMqGa+QnnaI=", "owner": "nix-community", "repo": "home-manager", - "rev": "43ed7048f670661d1ae2ea0d2f7655e87e7b0461", + "rev": "0ee5ab611dc1fbb5180bd7d88d2aeb7841a4d179", "type": "github" }, "original": { @@ -76,11 +80,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1687681650, + "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", "type": "github" }, "original": { @@ -90,13 +94,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-stable": { "locked": { - "lastModified": 1685347552, - "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", + "lastModified": 1687729501, + "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", + "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1687701825, + "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", "type": "github" }, "original": { @@ -108,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { @@ -130,6 +150,21 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a28cc39..41289b8 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,8 @@ emacs.overlays.package (final: prev: { emacs-git = (prev.emacs-git.override { - withXwidgets = true; + # withXwidgets = true; + withTreeSitter = true; withGTK3 = true; }).overrideAttrs (o: rec { buildInputs = o.buildInputs ++ [ prev.darwin.apple_sdk.frameworks.WebKit ]; diff --git a/modules/home.nix b/modules/home.nix index 80987c6..c6b0c0d 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -6,6 +6,7 @@ (epkgs: with epkgs; [ vterm pdf-tools + treesit-grammars.with-all-grammars pkgs.mu ])) (aspellWithDicts diff --git a/modules/mac.nix b/modules/mac.nix index 93d061d..3726926 100644 --- a/modules/mac.nix +++ b/modules/mac.nix @@ -17,6 +17,9 @@ fira-code roboto roboto-mono + source-sans + source-code-pro + source-serif ]; };