From 00c4cf745238717bbff1c46fef253a797d0bc083 Mon Sep 17 00:00:00 2001 From: moni Date: Sat, 9 Nov 2024 03:36:52 +0800 Subject: [PATCH] flake: bump inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/a60ac02f9466f85f092e576fd8364dfc4406b5a6?narHash=sha256-I9Qd0LnAsEGHtKE9%2BuVR0iDFmsijWSy7GT0g3jihG4Q%3D' (2024-10-14) → 'github:lnl7/nix-darwin/2fbf4a8417c28cf45bae6e6e97248cbbd9b78632?narHash=sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4%3D' (2024-11-08) • Updated input 'determinate': 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.145%2Brev-5babe9d6a9eb52ee001bf70ad607fd66522f781b/0192b11b-c96e-7199-ba89-8c923541fcce/source.tar.gz?narHash=sha256-%2BjP%2BZlg0prpcmBy5s7cPUa7nJr90Zm2m933aibrHBYw%3D&rev=5babe9d6a9eb52ee001bf70ad607fd66522f781b&revCount=145' (2024-10-21) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.150%2Brev-61819e490d85ff68680def6f2b0d7ee602857078/0192f90a-ec21-7c78-a3a3-7ddf7abdc50e/source.tar.gz?narHash=sha256-09/CM5Bwx06/emGO6qFvhTsQB2lQNzURk/SjQ8nbQIo%3D' (2024-11-04) • Updated input 'determinate/nix': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.9/0192358e-86eb-7a95-8161-99d09d9a6a06/source.tar.gz?narHash=sha256-1mUkLxoyG/rgceHeJTXcKcySvw5dSzIvAtqd1vaoa1g%3D' (2024-09-27) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.10/0192e251-cc5a-7b3c-8339-faf088a24136/source.tar.gz?narHash=sha256-y1z53C9%2ByH1LUCWuouuA0i4vzXEAm8bmK0gyNAY/fyc%3D' (2024-10-31) • Updated input 'determinate/nix/nix': 'https://api.flakehub.com/f/pinned/NixOS/nix/2.24.9/01923584-fceb-7a8c-bef7-f6d1eb9a0916/source.tar.gz?narHash=sha256-OwJByTdCz1t91ysBqynK%2BifszkoIGEXUn6HE2t82%2Bc8%3D' (2024-09-27) → 'https://api.flakehub.com/f/pinned/NixOS/nix/2.24.10/0192e247-90bb-7e27-ba8d-f7ee8344a03e/source.tar.gz?narHash=sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi%2Bko%3D' (2024-10-30) • Updated input 'determinate/nix/nixpkgs': 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.635457%2Brev-759537f06e6999e141588ff1c9be7f3a5c060106/01922cec-c9c8-788e-8861-26f19bd8d7aa/source.tar.gz?narHash=sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao%3D' (2024-09-25) → 'https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.636213%2Brev-64b80bfb316b57cdb8919a9110ef63393d74382a/0192d84c-b6fc-7e39-a326-c46cc00f5b6a/source.tar.gz?narHash=sha256-9z8oOgFZiaguj%2Bbbi3k4QhAD6JabWrnv7fscC/mt0KE%3D' (2024-10-28) • Updated input 'determinate/nixpkgs': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.683804%2Brev-a1d92660c6b3b7c26fb883500a80ea9d33321be2/01922288-464f-75e2-abd5-54e5b92789a1/source.tar.gz?narHash=sha256-V5LpfdHyQkUF7RfOaDPrZDP%2Boqz88lTJrMT1%2BstXNwo%3D' (2024-09-20) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.697431%2Brev-86e78d3d2084ff87688da662cf78c2af085d8e73/0192d6c6-ebf3-7285-bc0c-0fb71cc054e0/source.tar.gz?narHash=sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY%3D' (2024-10-26) • Updated input 'emacs': 'github:nix-community/emacs-overlay/3adba4b7d1db1d4eba3f682a956fcbb5de1bd7a1?narHash=sha256-Jt86dscJ4nsoHFnGRAm4iSgbpD/pifd7Cs4m52CEzwY%3D' (2024-10-19) → 'github:nix-community/emacs-overlay/d066ff0e61cfb9819514d124a7d256d6d05e33ac?narHash=sha256-Pd3FGq1gqMKmzC2vTpnLKfbgZjgfJkjUj3CZYjBMJIw%3D' (2024-11-08) • Removed input 'emacs/flake-utils' • Removed input 'emacs/flake-utils/systems' • Updated input 'emacs/nixpkgs-stable': 'github:NixOS/nixpkgs/4eb33fe664af7b41a4c446f87d20c9a0a6321fa3?narHash=sha256-LDiPhQ3l%2BfBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I%3D' (2024-10-17) → 'github:NixOS/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede?narHash=sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE%3D' (2024-11-06) • Updated input 'home': 'github:nix-community/home-manager/122f70545b29ccb922e655b08acfe05bfb44ec68?narHash=sha256-KVyQq%2Bez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74%3D' (2024-10-19) → 'github:nix-community/home-manager/2f607e07f3ac7e53541120536708e824acccfaa8?narHash=sha256-0kZL4m%2BbKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc%3D' (2024-11-05) • Updated input 'lix': 'git+https://git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=b0e619b8bd68944de9a721b0b1bfd045dcb77146' (2024-10-19) → 'git+https://git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=116895acb1fb5b09e8c1b867f345f6c8ca09647a' (2024-11-08) • Updated input 'master': 'github:nixos/nixpkgs/0065f778752685fca1be1df542ff13ddc42bd32e?narHash=sha256-NRH3LmbimFmcb9BBuVLF3GYnYcEX2lDXcTZ3vagaIUs%3D' (2024-10-19) → 'github:nixos/nixpkgs/407ff1729f1cbe897b4a2eb9df15aff18d37f768?narHash=sha256-wLlmIYuDxiI0Rxf/XQB8zuuKe1L/8Lh2h1%2B4WMZnn9E%3D' (2024-11-08) • Updated input 'nix': 'github:nixos/nix/694c378d14f7cd1c5d882277b9747c5c1ac30023?narHash=sha256-OPH39%2BmaAtcsxt23lacJJICLdccYaHbn%2BWmHSeav1dw%3D' (2024-10-17) → 'github:nixos/nix/492c678162f1b4cf1b23f909ceccf3003ad31387?narHash=sha256-I1ZqJpzejfqoacTJu/zckfMkzX/yqM8alIlosbL%2BqmM%3D' (2024-11-08) • Updated input 'nix-index-database': 'github:Mic92/nix-index-database/5c54c33aa04df5dd4b0984b7eb861d1981009b22?narHash=sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y%3D' (2024-10-13) → 'github:Mic92/nix-index-database/cc2ddbf2df8ef7cc933543b1b42b845ee4772318?narHash=sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4%3D' (2024-11-03) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/9851dafe68124c1d3511b30c1b712226fd78b396?narHash=sha256-TggrgKn%2BmZWv%2B5rAM0r%2B9gLE6g3NHwl/LlSJZsv0blU%3D' (2024-10-18) → 'github:Infinidoge/nix-minecraft/11ca743d2e4602d5b8bfc8d65303f969d58ec338?narHash=sha256-PwtzMWPJhz9Rn/0rzQfMb6icSA6DtJZKCuK88IwFSos%3D' (2024-11-08) • Updated input 'nixfmt': 'github:NixOS/nixfmt/d0c0cda4fe6b7ae2b9aa37f3ee15e6412573eb01?narHash=sha256-T3p9hI907HCFcI6kAvp1u8kPNxytLoSzpoDDqG%2BflHA%3D' (2024-09-07) → 'github:NixOS/nixfmt/92c9d8cafa12f653f92bf550e59448f59925d9fb?narHash=sha256-alN3E5UkbFeuXILm%2BQVG10SCZhJF6BFYqtZnhh/8tAE%3D' (2024-11-07) • Updated input 'nixos-wsl': 'github:nix-community/nixos-wsl/42c23a6d5a2a1cbfd3fd137a7ff3d47c6d718033?narHash=sha256-mkAPu2o5u7F/glAAfBzDji726iL1u2pm2fyN1SPWRQk%3D' (2024-10-19) → 'github:nix-community/nixos-wsl/adb6bc4b661a43328752b4575be4968a4990c033?narHash=sha256-d%2BkIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o%3D' (2024-11-01) • Updated input 'nixpkgs-f2k': 'github:fortuneteller2k/nixpkgs-f2k/77a57bc5f0d40e71941d0ac2061d752c64c7c279?narHash=sha256-36Xwd1kcwHnvsAjBAQGaQuqxFATucPIwoqyEZiqd1bg%3D' (2024-10-19) → 'github:fortuneteller2k/nixpkgs-f2k/c2d1eba1b183c1a0f9ff5ed3683cd2733c4366aa?narHash=sha256-5O0k0ujXLV245ljeCmjbu3rqZS5cFv3UizGTQGCaVLU%3D' (2024-11-08) • Updated input 'nixpkgs-f2k/emacs': 'github:nix-community/emacs-overlay/59b865f2b0a7036fc7a03de1bfe81e0a810a81ca?narHash=sha256-wJaeXpsazBTcIZ3V1AR4eiM/10zBkLpqDN7qu7GkWuM%3D' (2024-10-19) → 'github:nix-community/emacs-overlay/9596809f1b6bd55dcf3d7c4e3f7c26ebfe88ef22?narHash=sha256-rOKN/meO9rMl6wXFG/B6q3wOCgexlunHAnCp8d925KM%3D' (2024-11-08) • Removed input 'nixpkgs-f2k/emacs/flake-utils' • Removed input 'nixpkgs-f2k/emacs/flake-utils/systems' • Updated input 'nixpkgs-f2k/emacs/nixpkgs': 'github:NixOS/nixpkgs/5785b6bb5eaae44e627d541023034e1601455827?narHash=sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED%2BKc%3D' (2024-10-16) → 'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7?narHash=sha256-Zwl8YgTVJTEum%2BL%2B0zVAWvXAGbWAuXHax3KzuejaDyo%3D' (2024-11-05) • Updated input 'nixpkgs-f2k/emacs/nixpkgs-stable': 'github:NixOS/nixpkgs/4eb33fe664af7b41a4c446f87d20c9a0a6321fa3?narHash=sha256-LDiPhQ3l%2BfBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I%3D' (2024-10-17) → 'github:NixOS/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede?narHash=sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE%3D' (2024-11-06) • Updated input 'nixpkgs-f2k/parts': 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) • Updated input 'nixpkgs-f2k/parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz?narHash=sha256-0xHYkMkeLVQAMa7gvkddbPqpxph%2BhDzdu1XdGPJR%2BOs%3D' (2024-10-01) → 'https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz?narHash=sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s%3D' (2024-11-01) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/349ce1dcf7ce051dccb7432f950203117f5995f4?narHash=sha256-3lGZyrHLmCSXcFEv1th04j/%2B2CUMzNDvQdbqXHMBqfM%3D' (2024-10-19) → 'github:nix-community/nixpkgs-wayland/d875afdfdd1836b9ecaa58eab60cab6b0c1d89fa?narHash=sha256-/L9ifMfIrkRtn7/2kDL/XJY%2BzDfJnkj7wh4Bs4axsms%3D' (2024-11-08) • Updated input 'nixpkgs-wayland/lib-aggregate': 'github:nix-community/lib-aggregate/8921856c37862428741a29cfd4c98c4893ca407d?narHash=sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y%2BR4Gi4RA%3D' (2024-10-13) → 'github:nix-community/lib-aggregate/d0ecc1890f77e9e170f2de279d6902d84a0cbc51?narHash=sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc%3D' (2024-11-03) • Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/16340f605f4e8e5cf07fd74dcbe692eee2d4f51b?narHash=sha256-hUP9oxmnOmNnKcDOf5Y55HQ%2BNnoT0%2BbLWHLQWLLw9Ks%3D' (2024-10-13) → 'github:nix-community/nixpkgs.lib/2376a861a1a15f05339245fbaa4422f2d1bdf485?narHash=sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY%3D' (2024-11-03) • Updated input 'nixpkgs-wayland/nix-eval-jobs': 'github:nix-community/nix-eval-jobs/a3307ac4b38b6dae769f771c877a6f2c236ee238?narHash=sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q%3D' (2024-10-10) → 'github:nix-community/nix-eval-jobs/7f9159a16584ee86eed077c8a73e845690b7d513?narHash=sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c%3D' (2024-10-31) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18) → 'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7?narHash=sha256-Zwl8YgTVJTEum%2BL%2B0zVAWvXAGbWAuXHax3KzuejaDyo%3D' (2024-11-05) • Updated input 'nvim': 'github:nix-community/neovim-nightly-overlay/e2047498667aeb24e8493ff430a20cff713915f4?narHash=sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s%3D' (2024-10-17) → 'github:nix-community/neovim-nightly-overlay/4edacffe41dcb1e23e56731fa97c1acce3768146?narHash=sha256-UjH4ED1gEpHW6jsanwBWPevKq/hgA0UXMXpTYOolh5U%3D' (2024-11-08) • Updated input 'nvim/flake-parts': 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) • Updated input 'nvim/git-hooks': 'github:cachix/git-hooks.nix/3c3e88f0f544d6bb54329832616af7eb971b6be6?narHash=sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ%2B/nVtALHIciX/BI%3D' (2024-10-16) → 'github:cachix/git-hooks.nix/d70155fdc00df4628446352fc58adc640cd705c2?narHash=sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF%2B06nOg%3D' (2024-11-05) • Updated input 'nvim/hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/dba4367b9a9d9615456c430a6d6af716f6e84cef?narHash=sha256-MHHrHasTngp7EYQOObHJ1a/IsRF%2BwodHqOckhH6uZbk%3D' (2024-08-29) → 'github:hercules-ci/hercules-ci-effects/b89ac4d66d618b915b1f0a408e2775fe3821d141?narHash=sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E%3D' (2024-11-06) • Updated input 'nvim/neovim-src': 'github:neovim/neovim/852954ff6d96adce0158f74ca494fdcef3aa1921?narHash=sha256-c94xkA/RuszC4PfmB%2BMWqOo2vbO66GTO6XKer0mbltA%3D' (2024-10-16) → 'github:neovim/neovim/5a86360400691e55fae66d60485b61360a1d3d6c?narHash=sha256-7IdIvOaDeiTJMNPcX94ts8U5V44nu2YtQh8VT8ua4XY%3D' (2024-11-07) • Updated input 'nvim/nixpkgs': 'github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732?narHash=sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A%3D' (2024-10-13) → 'github:NixOS/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933?narHash=sha256-JwQZIGSYnRNOgDDoIgqKITrPVil%2BRMWHsZH1eE1VGN0%3D' (2024-11-07) • Updated input 'parts': 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) • Updated input 'parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz?narHash=sha256-0xHYkMkeLVQAMa7gvkddbPqpxph%2BhDzdu1XdGPJR%2BOs%3D' (2024-10-01) → 'https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz?narHash=sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s%3D' (2024-11-01) • Updated input 'unstable': 'github:nixos/nixpkgs/ccc0c2126893dd20963580b6478d1a10a4512185?narHash=sha256-4HQI%2B6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo%3D' (2024-10-18) → 'github:nixos/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933?narHash=sha256-JwQZIGSYnRNOgDDoIgqKITrPVil%2BRMWHsZH1eE1VGN0%3D' (2024-11-07) --- flake.lock | 590 ++++++++++---------- flake.nix | 7 +- hosts/riscake/configuration.nix | 2 +- modules/parts/nix-darwin.nix | 1 + modules/parts/nix-settings.nix | 22 +- modules/parts/nixos.nix | 1 + overlays/default.nix | 5 + overlays/patches/iosevka-ft-build-plan.toml | 96 ++++ secrets/tokens.age | Bin 848 -> 713 bytes 9 files changed, 427 insertions(+), 297 deletions(-) create mode 100644 overlays/patches/iosevka-ft-build-plan.toml diff --git a/flake.lock b/flake.lock index 1a7ff48..5baf30b 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1731032247, + "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632", "type": "github" }, "original": { @@ -61,20 +61,80 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1730754837, + "narHash": "sha256-09/CM5Bwx06/emGO6qFvhTsQB2lQNzURk/SjQ8nbQIo=", + "rev": "61819e490d85ff68680def6f2b0d7ee602857078", + "revCount": 150, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.150%2Brev-61819e490d85ff68680def6f2b0d7ee602857078/0192f90a-ec21-7c78-a3a3-7ddf7abdc50e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/0.1" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-OhG8joS/uN3Kdw4h9w8F/6ZIVTFZ8J9Fb4NGn/KK5/s=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-AGcHQSIdb+KEJlhJzMB4YyFxbjdLZEDDf6bv6Zi3wqM=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-kU4dqHoYe3sFf4LDAUj4fyl9uGV8IHtE22+DdMeRN0s=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" + } + }, "emacs": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729357830, - "narHash": "sha256-Jt86dscJ4nsoHFnGRAm4iSgbpD/pifd7Cs4m52CEzwY=", + "lastModified": 1731085910, + "narHash": "sha256-Pd3FGq1gqMKmzC2vTpnLKfbgZjgfJkjUj3CZYjBMJIw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3adba4b7d1db1d4eba3f682a956fcbb5de1bd7a1", + "rev": "d066ff0e61cfb9819514d124a7d256d6d05e33ac", "type": "github" }, "original": { @@ -85,16 +145,15 @@ }, "emacs_2": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1729303438, - "narHash": "sha256-wJaeXpsazBTcIZ3V1AR4eiM/10zBkLpqDN7qu7GkWuM=", + "lastModified": 1731031517, + "narHash": "sha256-rOKN/meO9rMl6wXFG/B6q3wOCgexlunHAnCp8d925KM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "59b865f2b0a7036fc7a03de1bfe81e0a810a81ca", + "rev": "9596809f1b6bd55dcf3d7c4e3f7c26ebfe88ef22", "type": "github" }, "original": { @@ -183,11 +242,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -199,11 +258,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -278,6 +337,8 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "determinate", + "nix", "nix", "nixpkgs" ] @@ -299,7 +360,7 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "nix-parallel", + "nix", "nixpkgs" ] }, @@ -347,11 +408,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -385,24 +446,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -417,9 +460,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -435,9 +478,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -453,27 +496,9 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { + "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -489,7 +514,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -504,9 +529,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1726560853, @@ -536,11 +561,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -552,16 +577,24 @@ "git-hooks-nix": { "inputs": { "flake-compat": [ + "determinate", + "nix", "nix" ], "gitignore": [ + "determinate", + "nix", "nix" ], "nixpkgs": [ + "determinate", + "nix", "nix", "nixpkgs" ], "nixpkgs-stable": [ + "determinate", + "nix", "nix", "nixpkgs" ] @@ -583,17 +616,17 @@ "git-hooks-nix_2": { "inputs": { "flake-compat": [ - "nix-parallel" + "nix" ], "gitignore": [ - "nix-parallel" + "nix" ], "nixpkgs": [ - "nix-parallel", + "nix", "nixpkgs" ], "nixpkgs-stable": [ - "nix-parallel", + "nix", "nixpkgs" ] }, @@ -642,11 +675,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -662,11 +695,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -698,15 +731,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_6", "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1728821524, - "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=", + "lastModified": 1730635946, + "narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "8921856c37862428741a29cfd4c98c4893ca407d", + "rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51", "type": "github" }, "original": { @@ -751,18 +784,18 @@ }, "lix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nix2container": "nix2container", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression", + "nixpkgs": "nixpkgs_4", + "nixpkgs-regression": "nixpkgs-regression_2", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1729362750, - "narHash": "sha256-VgAnzHjmXmj8Xle8AdFAVRUiwKYryWQjPOQvOrrxWN0=", + "lastModified": 1731087338, + "narHash": "sha256-9J8+Pyb/WtzZ+AU5XJLvpVSILN742z37C4CrbnYXkuo=", "ref": "refs/heads/main", - "rev": "b0e619b8bd68944de9a721b0b1bfd045dcb77146", - "revCount": 16364, + "rev": "116895acb1fb5b09e8c1b867f345f6c8ca09647a", + "revCount": 16456, "type": "git", "url": "https://git.lix.systems/lix-project/lix.git" }, @@ -773,11 +806,11 @@ }, "master": { "locked": { - "lastModified": 1729362132, - "narHash": "sha256-NRH3LmbimFmcb9BBuVLF3GYnYcEX2lDXcTZ3vagaIUs=", + "lastModified": 1731094367, + "narHash": "sha256-wLlmIYuDxiI0Rxf/XQB8zuuKe1L/8Lh2h1+4WMZnn9E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0065f778752685fca1be1df542ff13ddc42bd32e", + "rev": "407ff1729f1cbe897b4a2eb9df15aff18d37f768", "type": "github" }, "original": { @@ -790,11 +823,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1730973210, + "narHash": "sha256-7IdIvOaDeiTJMNPcX94ts8U5V44nu2YtQh8VT8ua4XY=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "5a86360400691e55fae66d60485b61360a1d3d6c", "type": "github" }, "original": { @@ -805,8 +838,8 @@ }, "nil": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { @@ -825,28 +858,20 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "git-hooks-nix": "git-hooks-nix", - "libgit2": "libgit2", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_2" + "nix": "nix_2", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729196134, - "narHash": "sha256-OPH39+maAtcsxt23lacJJICLdccYaHbn+WmHSeav1dw=", - "owner": "nixos", - "repo": "nix", - "rev": "694c378d14f7cd1c5d882277b9747c5c1ac30023", - "type": "github" + "lastModified": 1730373645, + "narHash": "sha256-y1z53C9+yH1LUCWuouuA0i4vzXEAm8bmK0gyNAY/fyc=", + "rev": "34ca8a4d254e15adfdaaee98aea882511bba01b4", + "revCount": 104, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.10/0192e251-cc5a-7b3c-8339-faf088a24136/source.tar.gz" }, "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix/2.0" } }, "nix-colors": { @@ -872,15 +897,15 @@ "inputs": { "flake-parts": "flake-parts_3", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728593025, - "narHash": "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=", + "lastModified": 1730389079, + "narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "a3307ac4b38b6dae769f771c877a6f2c236ee238", + "rev": "7f9159a16584ee86eed077c8a73e845690b7d513", "type": "github" }, "original": { @@ -918,11 +943,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -933,18 +958,18 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1729216005, - "narHash": "sha256-TggrgKn+mZWv+5rAM0r+9gLE6g3NHwl/LlSJZsv0blU=", + "lastModified": 1731030299, + "narHash": "sha256-PwtzMWPJhz9Rn/0rzQfMb6icSA6DtJZKCuK88IwFSos=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "9851dafe68124c1d3511b30c1b712226fd78b396", + "rev": "11ca743d2e4602d5b8bfc8d65303f969d58ec338", "type": "github" }, "original": { @@ -953,31 +978,6 @@ "type": "github" } }, - "nix-parallel": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_2", - "git-hooks-nix": "git-hooks-nix_2", - "libgit2": "libgit2_2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-23-11": "nixpkgs-23-11_2", - "nixpkgs-regression": "nixpkgs-regression_3" - }, - "locked": { - "lastModified": 1724342684, - "narHash": "sha256-aDeypDc+uIUg84GU+mNgZ1PIUQRcN0MKcSg2IbBNomU=", - "owner": "DeterminateSystems", - "repo": "nix-src", - "rev": "8020c0cfe6bb47ab25c6279eae7e6612807e0843", - "type": "github" - }, - "original": { - "owner": "DeterminateSystems", - "ref": "multithreaded-eval", - "repo": "nix-src", - "type": "github" - } - }, "nix2container": { "flake": false, "locked": { @@ -994,16 +994,65 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1730321079, + "narHash": "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=", + "rev": "597fcc98e18e3178734d06a9e7306250e8cb8d74", + "revCount": 18185, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.24.10/0192e247-90bb-7e27-ba8d-f7ee8344a03e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nix/%3D2.24.10" + } + }, + "nix_3": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", + "git-hooks-nix": "git-hooks-nix_2", + "libgit2": "libgit2_2", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-23-11": "nixpkgs-23-11_2", + "nixpkgs-regression": "nixpkgs-regression_3" + }, + "locked": { + "lastModified": 1731074210, + "narHash": "sha256-I1ZqJpzejfqoacTJu/zckfMkzX/yqM8alIlosbL+qmM=", + "owner": "nixos", + "repo": "nix", + "rev": "492c678162f1b4cf1b23f909ceccf3003ad31387", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nix", + "type": "github" + } + }, "nixfmt": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_3" }, "locked": { - "lastModified": 1725711008, - "narHash": "sha256-T3p9hI907HCFcI6kAvp1u8kPNxytLoSzpoDDqG+flHA=", + "lastModified": 1730998274, + "narHash": "sha256-alN3E5UkbFeuXILm+QVG10SCZhJF6BFYqtZnhh/8tAE=", "owner": "NixOS", "repo": "nixfmt", - "rev": "d0c0cda4fe6b7ae2b9aa37f3ee15e6412573eb01", + "rev": "92c9d8cafa12f653f92bf550e59448f59925d9fb", "type": "github" }, "original": { @@ -1015,17 +1064,17 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1729300178, - "narHash": "sha256-mkAPu2o5u7F/glAAfBzDji726iL1u2pm2fyN1SPWRQk=", + "lastModified": 1730453870, + "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "42c23a6d5a2a1cbfd3fd137a7ff3d47c6d718033", + "rev": "adb6bc4b661a43328752b4575be4968a4990c033", "type": "github" }, "original": { @@ -1036,16 +1085,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727184566, - "narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48c3030083c46042584531bc9d931020f1975677", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05-small", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1092,11 +1141,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1729306191, - "narHash": "sha256-36Xwd1kcwHnvsAjBAQGaQuqxFATucPIwoqyEZiqd1bg=", + "lastModified": 1731034212, + "narHash": "sha256-5O0k0ujXLV245ljeCmjbu3rqZS5cFv3UizGTQGCaVLU=", "owner": "fortuneteller2k", "repo": "nixpkgs-f2k", - "rev": "77a57bc5f0d40e71941d0ac2061d752c64c7c279", + "rev": "c2d1eba1b183c1a0f9ff5ed3683cd2733c4366aa", "type": "github" }, "original": { @@ -1108,7 +1157,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs-f2k", "nixpkgs" @@ -1145,23 +1194,23 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1728781282, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1730595754, + "narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485", "type": "github" }, "original": { @@ -1172,14 +1221,14 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-regression": { @@ -1232,11 +1281,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { @@ -1248,11 +1297,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { @@ -1267,14 +1316,14 @@ "flake-compat": "flake-compat_6", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1729330084, - "narHash": "sha256-3lGZyrHLmCSXcFEv1th04j/+2CUMzNDvQdbqXHMBqfM=", + "lastModified": 1731075481, + "narHash": "sha256-/L9ifMfIrkRtn7/2kDL/XJY+zDfJnkj7wh4Bs4axsms=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "349ce1dcf7ce051dccb7432f950203117f5995f4", + "rev": "d875afdfdd1836b9ecaa58eab60cab6b0c1d89fa", "type": "github" }, "original": { @@ -1285,43 +1334,71 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", - "owner": "nixos", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "revCount": 636213, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.636213%2Brev-64b80bfb316b57cdb8919a9110ef63393d74382a/0192d84c-b6fc-7e39-a326-c46cc00f5b6a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1729980323, + "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", + "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", + "revCount": 697431, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.697431%2Brev-86e78d3d2084ff87688da662cf78c2af085d8e73/0192d6c6-ebf3-7285-bc0c-0fb71cc054e0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1.tar.gz" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1727184566, + "narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "rev": "48c3030083c46042584531bc9d931020f1975677", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-24.05-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", - "owner": "NixOS", + "lastModified": 1726481836, + "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1331,7 +1408,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1723221148, "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", @@ -1347,13 +1424,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1363,13 +1440,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1730958623, + "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "85f7e662eda4fa3a995556527c87b2524b691933", "type": "github" }, "original": { @@ -1386,14 +1463,14 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1729147490, - "narHash": "sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s=", + "lastModified": 1731052353, + "narHash": "sha256-UjH4ED1gEpHW6jsanwBWPevKq/hgA0UXMXpTYOolh5U=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e2047498667aeb24e8493ff430a20cff713915f4", + "rev": "4edacffe41dcb1e23e56731fa97c1acce3768146", "type": "github" }, "original": { @@ -1407,11 +1484,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -1425,11 +1502,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -1458,16 +1535,16 @@ "inputs": { "agenix": "agenix", "darwin": "darwin", + "determinate": "determinate", "emacs": "emacs", "home": "home", "lix": "lix", "master": "master", "nil": "nil", - "nix": "nix", + "nix": "nix_3", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", - "nix-parallel": "nix-parallel", "nixfmt": "nixfmt", "nixos-wsl": "nixos-wsl", "nixpkgs": [ @@ -1479,8 +1556,7 @@ "parts": "parts_2", "stable": "stable", "statix": "statix", - "unstable": "unstable", - "yabai": "yabai" + "unstable": "unstable" } }, "rust-analyzer-src": { @@ -1665,36 +1741,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1719,11 +1765,11 @@ }, "unstable": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1730958623, + "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "85f7e662eda4fa3a995556527c87b2524b691933", "type": "github" }, "original": { @@ -1732,22 +1778,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "yabai": { - "flake": false, - "locked": { - "lastModified": 1728740429, - "narHash": "sha256-YkQ2e9U3Rlb3o8nEX3lpVB0eJdk6At7q17Nv7MoaxiE=", - "owner": "koekeishiya", - "repo": "yabai", - "rev": "5909b09f0cc9886b9ec82b324367eb8e81aa3a05", - "type": "github" - }, - "original": { - "owner": "koekeishiya", - "repo": "yabai", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5594fa9..11962cb 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ agenix.url = "github:ryantm/agenix"; emacs.url = "github:nix-community/emacs-overlay"; darwin.url = "github:lnl7/nix-darwin"; + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; home.url = "github:nix-community/home-manager"; nil.url = "github:oxalica/nil"; nix.url = "github:nixos/nix"; @@ -36,13 +37,9 @@ parts.url = "github:hercules-ci/flake-parts"; statix.url = "github:nerdypepper/statix"; lix.url = "git+https://git.lix.systems/lix-project/lix.git"; - nix-parallel.url = "github:DeterminateSystems/nix-src/multithreaded-eval"; + # nix-parallel.url = "github:DeterminateSystems/nix-src/multithreaded-eval"; # Non-flake inputs - yabai = { - url = "github:koekeishiya/yabai"; - flake = false; - }; # Nixpkgs branches master.url = "github:nixos/nixpkgs/master"; diff --git a/hosts/riscake/configuration.nix b/hosts/riscake/configuration.nix index 477ed09..bc32c82 100644 --- a/hosts/riscake/configuration.nix +++ b/hosts/riscake/configuration.nix @@ -23,6 +23,6 @@ security.pam.enableSudoTouchIdAuth = true; fonts.packages = __attrValues { - inherit (pkgs) comic-neue; + inherit (pkgs) comic-neue iosevka-ft; }; } diff --git a/modules/parts/nix-darwin.nix b/modules/parts/nix-darwin.nix index 8f80d26..a234cc1 100644 --- a/modules/parts/nix-darwin.nix +++ b/modules/parts/nix-darwin.nix @@ -46,6 +46,7 @@ let inherit (ctx) system; modules = config.modules ++ [ + inputs.determinate.darwinModules.default ( { pkgs, ... }: { diff --git a/modules/parts/nix-settings.nix b/modules/parts/nix-settings.nix index bb9dfc3..0fc08a2 100644 --- a/modules/parts/nix-settings.nix +++ b/modules/parts/nix-settings.nix @@ -27,15 +27,6 @@ }; distributedBuilds = true; - - extraOptions = '' - keep-outputs = true - keep-derivations = true - auto-allocate-uids = true - builders-use-substitutes = true - http-connections = 0 - ''; - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; /* @@ -47,7 +38,7 @@ }; */ - package = inputs'.lix.packages.default.overrideAttrs { doCheck = false; }; + # package = inputs'.lix.packages.default.overrideAttrs { doCheck = false; }; registry = { system.flake = inputs.self; @@ -57,7 +48,15 @@ settings = lib.mkMerge [ { + auto-allocate-uids = true; + keep-outputs = true; + keep-derivations = true; + keep-going = true; + builders-use-substitutes = true; + allow-unsafe-native-code-during-evaluation = true; accept-flake-config = true; + http-connections = 0; + flake-registry = __toFile "begone-evil.json" (__toJSON { flakes = [ ]; version = 2; @@ -66,10 +65,11 @@ experimental-features = [ "auto-allocate-uids" "ca-derivations" - #"configurable-impure-env" + # "configurable-impure-env" "dynamic-derivations" "flakes" "nix-command" + # "pipe-operator" ]; max-jobs = "auto"; diff --git a/modules/parts/nixos.nix b/modules/parts/nixos.nix index 397ae7c..a5d6bb6 100644 --- a/modules/parts/nixos.nix +++ b/modules/parts/nixos.nix @@ -53,6 +53,7 @@ let ../shared/nixos ] ++ [ + inputs.determinate.nixosModules.default ( { pkgs, ... }: { diff --git a/overlays/default.nix b/overlays/default.nix index 5eabd98..1b1fa55 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,5 +9,10 @@ _: pydashing = pfinal.callPackage ./derivations/dashing.nix { }; }; }; + + iosevka-ft = prev.iosevka.override { + privateBuildPlan = __readFile ./patches/iosevka-ft-build-plan.toml; + set = "Ft"; + }; }; } diff --git a/overlays/patches/iosevka-ft-build-plan.toml b/overlays/patches/iosevka-ft-build-plan.toml new file mode 100644 index 0000000..8dae07a --- /dev/null +++ b/overlays/patches/iosevka-ft-build-plan.toml @@ -0,0 +1,96 @@ +[buildPlans.IosevkaFt] +family = "Iosevka FT" +spacing = "term" +serifs = "sans" +noCvSs = false +exportGlyphNames = true + + [buildPlans.IosevkaFt.variants] + inherits = "ss14" + + [buildPlans.IosevkaFt.variants.design] + two = "curly-neck-serifless" + three = "two-arcs" + four = "closed-serifless" + five = "upright-flat-serifless" + six = "closed-contour" + seven = "straight-serifless" + eight = "crossing-asymmetric" + nine = "closed-contour" + zero = "dotted" + capital-j = "serifless" + capital-k = "curly-serifless" + capital-r = "curly-serifless" + capital-w = "straight-serifless" + a = "double-storey-tailed" + b = "toothed-serifless" + d = "tailed-serifed" + f = "flat-hook-serifless" + g = "single-storey-serifless" + h = "straight-serifless" + i = "serifed" + k = "curly-serifless" + l = "serifed-flat-tailed" + m = "serifless" + p = "eared-serifless" + q = "straight-serifless" + s = "serifless" + t = "flat-hook-short-neck" + u = "tailed-serifless" + w = "straight-flat-top-serifless" + x = "straight-serifless" + y = "cursive-serifless" + z = "straight-serifless" + lower-alpha = "crossing" + lower-delta = "flat-top" + lower-lambda = "tailed-turn" + lower-mu = "tailed-serifless" + lower-nu = "straight" + lower-xi = "rounded" + lower-psi = "serifless" + cyrl-capital-ka = "curly-serifless" + cyrl-ka = "curly-serifless" + cyrl-capital-u = "cursive-serifless" + cyrl-u = "cursive-serifless" + braille-dot = "round" + asterisk = "hex-low" + underscore = "above-baseline" + caret = "high" + ascii-grave = "raised-turn-comma" + ascii-single-quote = "raised-comma" + paren = "normal" + brace = "curly-flat-boundary" + ampersand = "upper-open" + at = "compact" + dollar = "slanted-through" + cent = "slanted-through" + percent = "rings-segmented-slash" + question = "smooth" + micro-sign = "tailed-serifless" + + [buildPlans.IosevkaFt.variants.italic] + a = "double-storey-serifless" + f = "serifless" + z = "straight-serifless" + + [buildPlans.IosevkaFt.variants.oblique] + f = "serifless" + cyrl-ef = "cursive" + + [buildPlans.IosevkaFt.ligations] + inherits = "dlig" + +[buildPlans.IosevkaFt.widths.Normal] +shape = 500 +menu = 5 +css = "normal" + +[buildPlans.IosevkaFt.widths.Extended] +shape = 600 +menu = 7 +css = "expanded" + +[buildPlans.IosevkaFt.widths.UltraExtended] +shape = 720 +menu = 9 +css = "ultra-expanded" \ No newline at end of file diff --git a/secrets/tokens.age b/secrets/tokens.age index f91286c375760cefab0c4157249e29039ac76a12..4302467074891179bbbf389189fdf7cbedb07f18 100644 GIT binary patch literal 713 zcmZY5$%@lp0KoB+9sTn)g~qs2Hk z2SdBJAbgh|K}z7&0Bb_s7m^eijWHNodKbq+%_^ZvGC=L<6xYI2b=`GfM^w6UZcZ_5 zd0hL~Hi+g_2K{>8-8ECTo%Ks$Xs*v-5oji6`f;p#!00xiWw^+YOPVo1F|}0~2)aC4 zg+(qB_=YwaCPdYASc&cym+ROf`Gcx*HpVZ@G@kU`$56H2sfk~Nn|Dh86u)Wue`9AKKF7;V}tS_R=7 zGC8isqAn}BBs#4L)k7MM25J#jklS`)6VX6|Je$FMX9c8Wy<`azs9Qt5!iKXXQCB5$ z-ruuM?DNvcGY<}LUH^XN>79!Q7tWzyuDyEpRg7rs)6MbZ(Yw!8UcUU%YLrLd%l(6s t+fUAVYZdnGv`78^@Q^wc+<1Tc=;w>q_kLYo+kd?GX6^3t?fPwX_y^RO@+JTP delta 759 zcmW;J-HX!(003}B{EBm^Ajc3#^>ioHT-vlr8irz$UYlNWh^L+!9Sa=MX;r_1kN@pgPi6D zdNXCvGksYU3c8gxafK@~Oi}@ANyw(6IunjE7$c;n2~))pn&T|Ul-RJOtPGpt2qJBZJa z7@J6|4w4N6M#@trRuB1M!w#J;P^F zNwqd*=2{KaHk=U~Cxib7_MF(CV-le5X{xWq^ng1a%Z>n_pm+cT!I(Ul>SMFjj1FPA z-p%yfRJEM1k(Q^ovzS#H!QD|du0}=7t`>l_d~Fv4{`TS3x#NGYKXnP5$6lDh^?w(S zZlg|KSl!4^R6hPS+bQmQmrDJyckbbtU&h_l?1c3f!f!dSwDeW#(^C4(kAI%M^BCVv zebRk#bM*GxcMm5w|I-Z)o@m|v=-3zUqi^oJThEEFo}S)xG2H$&d2i+H%BA+GE z-r4$QxpIiQab)``qJ8