Kieran's opinionated (and probably slightly dumb) nix config

chore: bump flake

dunkirk.sh 2f66f68e 8e4bac2e

verified
+58 -52
+40 -40
flake.lock
··· 209 209 ] 210 210 }, 211 211 "locked": { 212 - "lastModified": 1766150702, 213 - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", 212 + "lastModified": 1768923567, 213 + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", 214 214 "owner": "nix-community", 215 215 "repo": "disko", 216 - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", 216 + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", 217 217 "type": "github" 218 218 }, 219 219 "original": { ··· 467 467 ] 468 468 }, 469 469 "locked": { 470 - "lastModified": 1768419665, 471 - "narHash": "sha256-/Yjey1LRRrkufZcmOIbkkEWQStfvcIW4rbq9TF37wMo=", 470 + "lastModified": 1768742354, 471 + "narHash": "sha256-DBBTDPCYH0SzdpZl8lS+DBLn7jXqgs8rCWarhYtENl8=", 472 472 "owner": "frc4451", 473 473 "repo": "frc-nix", 474 - "rev": "76188c0314bdf9d2c24fe863d12b483557aac447", 474 + "rev": "9fce9de8728cbd2619dd670bd6ba20bb2419d7da", 475 475 "type": "github" 476 476 }, 477 477 "original": { ··· 547 547 }, 548 548 "hardware": { 549 549 "locked": { 550 - "lastModified": 1768397375, 551 - "narHash": "sha256-7QqbFi3ERvKjEdAzEYPv7iSGwpUKSrQW5wPLMFq45AQ=", 550 + "lastModified": 1768736227, 551 + "narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=", 552 552 "owner": "NixOS", 553 553 "repo": "nixos-hardware", 554 - "rev": "efe2094529d69a3f54892771b6be8ee4a0ebef0f", 554 + "rev": "d447553bcbc6a178618d37e61648b19e744370df", 555 555 "type": "github" 556 556 }, 557 557 "original": { ··· 610 610 ] 611 611 }, 612 612 "locked": { 613 - "lastModified": 1767910483, 614 - "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", 613 + "lastModified": 1768603898, 614 + "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", 615 615 "owner": "nix-community", 616 616 "repo": "home-manager", 617 - "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", 617 + "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", 618 618 "type": "github" 619 619 }, 620 620 "original": { ··· 655 655 ] 656 656 }, 657 657 "locked": { 658 - "lastModified": 1766066098, 659 - "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=", 658 + "lastModified": 1768426687, 659 + "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=", 660 660 "owner": "hyprwm", 661 661 "repo": "contrib", 662 - "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690", 662 + "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f", 663 663 "type": "github" 664 664 }, 665 665 "original": { ··· 815 815 "nixpkgs": "nixpkgs_3" 816 816 }, 817 817 "locked": { 818 - "lastModified": 1768357185, 819 - "narHash": "sha256-NYd0KUgsPZpnDn6gbnheYRezrW+/37JEDpacLjTy+90=", 818 + "lastModified": 1768875310, 819 + "narHash": "sha256-yUtG7GOvsjmxf3xdHN/e5BZp5/ZoihiZgqxYJNwVD9U=", 820 820 "owner": "nix-community", 821 821 "repo": "nix-vscode-extensions", 822 - "rev": "14c64d4e2e2c79d2cddcaf9d58dd74ae739d1aad", 822 + "rev": "5ec577201443e3fed2229e8a460d02202dc80be1", 823 823 "type": "github" 824 824 }, 825 825 "original": { ··· 876 876 }, 877 877 "nixpkgs-unstable": { 878 878 "locked": { 879 - "lastModified": 1767892417, 880 - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", 879 + "lastModified": 1768564909, 880 + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", 881 881 "owner": "nixos", 882 882 "repo": "nixpkgs", 883 - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", 883 + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", 884 884 "type": "github" 885 885 }, 886 886 "original": { ··· 924 924 }, 925 925 "nixpkgs_4": { 926 926 "locked": { 927 - "lastModified": 1767799921, 928 - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", 927 + "lastModified": 1768773494, 928 + "narHash": "sha256-XsM7GP3jHlephymxhDE+/TKKO1Q16phz/vQiLBGhpF4=", 929 929 "owner": "nixos", 930 930 "repo": "nixpkgs", 931 - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", 931 + "rev": "77ef7a29d276c6d8303aece3444d61118ef71ac2", 932 932 "type": "github" 933 933 }, 934 934 "original": { ··· 1050 1050 ] 1051 1051 }, 1052 1052 "locked": { 1053 - "lastModified": 1768418904, 1054 - "narHash": "sha256-394aNZ2/VEeUMDWOvHR/g3bDGcC4HEo4kx1Xdd2nLf0=", 1053 + "lastModified": 1768935178, 1054 + "narHash": "sha256-dYcec3hVR2mogjT9oACmp5gXkT5QSvFtiwuhl3voZy0=", 1055 1055 "owner": "nix-community", 1056 1056 "repo": "NUR", 1057 - "rev": "941e8bffe444830c4a185106ecaf0ca3dec30e8b", 1057 + "rev": "d8169921c7529f8a08a8321a631812ddfa40c8ae", 1058 1058 "type": "github" 1059 1059 }, 1060 1060 "original": { ··· 1190 1190 "systems": "systems_7" 1191 1191 }, 1192 1192 "locked": { 1193 - "lastModified": 1768107098, 1194 - "narHash": "sha256-mSthw4k7jkB5S8+NYZwrQFItLj+17Se7Wn0pIfdASbc=", 1193 + "lastModified": 1768656845, 1194 + "narHash": "sha256-xNlXMyn7yc3Z/NOsz4NchO7gWFwsoCvtJ26pys4s2/M=", 1195 1195 "owner": "Gerg-L", 1196 1196 "repo": "spicetify-nix", 1197 - "rev": "2e40e07527f9d724b1578f0af590ab345e836ec3", 1197 + "rev": "8bd7e49d5ac62756bee6e4b02221fb96bfc3c99a", 1198 1198 "type": "github" 1199 1199 }, 1200 1200 "original": { ··· 1368 1368 "sqlite-lib-src": "sqlite-lib-src" 1369 1369 }, 1370 1370 "locked": { 1371 - "lastModified": 1768402822, 1372 - "narHash": "sha256-Qx8stx82wxgmGtRIfNepYC8Fa5ImUZsDFZ5uftI4VHA=", 1371 + "lastModified": 1768918408, 1372 + "narHash": "sha256-Dg6ozn6mSuau7qytKTyQBJXVNJcMJzUrvdBRWLp+Yg8=", 1373 1373 "ref": "refs/heads/master", 1374 - "rev": "03f953f848abd500d7c7bf12e6937107fb9a9a52", 1375 - "revCount": 1808, 1374 + "rev": "96413285253c1b042eaaf4526429ae1699874e31", 1375 + "revCount": 1860, 1376 1376 "type": "git", 1377 1377 "url": "https://tangled.org/tangled.org/core" 1378 1378 }, ··· 1408 1408 ] 1409 1409 }, 1410 1410 "locked": { 1411 - "lastModified": 1768200412, 1412 - "narHash": "sha256-QBCqhoRwQD2FLcB2ee5dxEjl53UOCKz5NSV+RReZE08=", 1411 + "lastModified": 1768844664, 1412 + "narHash": "sha256-g9SYsmIQvtbT4+j07PcCeW0ONK1hyGMGeQiDRZ2IE1k=", 1413 1413 "ref": "refs/heads/main", 1414 - "rev": "81d0c52924636ddeb70016cb66ef5270e68fbd14", 1415 - "revCount": 138, 1414 + "rev": "12a189cb2bdf54a22b07f544e158caf747f4b7ea", 1415 + "revCount": 147, 1416 1416 "type": "git", 1417 - "url": "https://tangled.org/lewis.moe/bspds-sandbox" 1417 + "url": "https://tangled.org/tranquil.farm/tranquil-pds" 1418 1418 }, 1419 1419 "original": { 1420 1420 "type": "git", 1421 - "url": "https://tangled.org/lewis.moe/bspds-sandbox" 1421 + "url": "https://tangled.org/tranquil.farm/tranquil-pds" 1422 1422 } 1423 1423 }, 1424 1424 "utils": {
+18 -12
flake.nix
··· 120 120 }; 121 121 122 122 tranquil-pds = { 123 - url = "git+https://tangled.org/lewis.moe/bspds-sandbox"; 123 + url = "git+https://tangled.org/tranquil.farm/tranquil-pds"; 124 124 inputs.nixpkgs.follows = "nixpkgs"; 125 125 }; 126 126 }; ··· 140 140 }@inputs: 141 141 let 142 142 outputs = inputs.self.outputs; 143 - 143 + 144 144 unstable-overlays = { 145 145 nixpkgs.overlays = [ 146 146 (final: prev: { ··· 158 158 hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30="; 159 159 }; 160 160 }); 161 - 161 + 162 162 zmx-binary = prev.callPackage ./packages/zmx.nix { }; 163 163 bore-auth = prev.callPackage ./packages/bore-auth.nix { }; 164 164 herald = inputs.herald.packages.${prev.system}.default; ··· 282 282 formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixfmt-tree; 283 283 284 284 # Patched deploy-rs for Nix 2.33 compatibility 285 - packages.x86_64-linux.deploy-rs = deploy-rs.packages.x86_64-linux.deploy-rs.overrideAttrs (oldAttrs: { 286 - patches = (oldAttrs.patches or []) ++ [ ./patches/deploy-rs-nix-2.33.patch ]; 287 - }); 288 - packages.aarch64-linux.deploy-rs = deploy-rs.packages.aarch64-linux.deploy-rs.overrideAttrs (oldAttrs: { 289 - patches = (oldAttrs.patches or []) ++ [ ./patches/deploy-rs-nix-2.33.patch ]; 290 - }); 291 - packages.aarch64-darwin.deploy-rs = deploy-rs.packages.aarch64-darwin.deploy-rs.overrideAttrs (oldAttrs: { 292 - patches = (oldAttrs.patches or []) ++ [ ./patches/deploy-rs-nix-2.33.patch ]; 293 - }); 285 + packages.x86_64-linux.deploy-rs = 286 + deploy-rs.packages.x86_64-linux.deploy-rs.overrideAttrs 287 + (oldAttrs: { 288 + patches = (oldAttrs.patches or [ ]) ++ [ ./patches/deploy-rs-nix-2.33.patch ]; 289 + }); 290 + packages.aarch64-linux.deploy-rs = 291 + deploy-rs.packages.aarch64-linux.deploy-rs.overrideAttrs 292 + (oldAttrs: { 293 + patches = (oldAttrs.patches or [ ]) ++ [ ./patches/deploy-rs-nix-2.33.patch ]; 294 + }); 295 + packages.aarch64-darwin.deploy-rs = 296 + deploy-rs.packages.aarch64-darwin.deploy-rs.overrideAttrs 297 + (oldAttrs: { 298 + patches = (oldAttrs.patches or [ ]) ++ [ ./patches/deploy-rs-nix-2.33.patch ]; 299 + }); 294 300 295 301 # Dev shells with patched deploy-rs 296 302 devShells.aarch64-darwin.default = nixpkgs.legacyPackages.aarch64-darwin.mkShell {