diff --git a/flake.lock b/flake.lock index 9c62534..0236fde 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1714136352, + "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "conduit-src": { "flake": false, "locked": { - "lastModified": 1713473703, - "narHash": "sha256-fTBk7Gmz/uvvfg9P9Gd5TcdrG3FHdsudzXth/ufm8RA=", + "lastModified": 1715020633, + "narHash": "sha256-7ul3GFrXxx4y9PK7wUCO0xS/J0KJAFUDNx0Ow7MMfDo=", "owner": "famedly", "repo": "conduit", - "rev": "95f5c61843488d2c85a92c51c522b4953ff221d9", + "rev": "20d9f3fd5df8e0f11f5fb6e990cc5300474f4c19", "type": "gitlab" }, "original": { @@ -93,16 +93,15 @@ ] }, "locked": { - "lastModified": 1709835800, - "narHash": "sha256-kIB8m4Osi0Eoxf2tjBSpIW+gtYTJqNe6RrlE4P2xJkQ=", - "owner": "nrabulinski", + "lastModified": 1714864355, + "narHash": "sha256-uXNW6bapWFfkYIkK1EagydSrFMqycOYEDSq75GmUpjk=", + "owner": "ipetkov", "repo": "crane", - "rev": "9cf9fd7bc6e7b65dbcadd0f11871a7a64532ffb8", + "rev": "442a7a6152f49b907e73206dc8e1f46a61e8e873", "type": "github" }, "original": { - "owner": "nrabulinski", - "ref": "no-toml-edit", + "owner": "ipetkov", "repo": "crane", "type": "github" } @@ -114,11 +113,11 @@ ] }, "locked": { - "lastModified": 1713543876, - "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -134,11 +133,11 @@ ] }, "locked": { - "lastModified": 1713406758, - "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", + "lastModified": 1714959124, + "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=", "owner": "nix-community", "repo": "disko", - "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", + "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d", "type": "github" }, "original": { @@ -155,11 +154,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713421495, - "narHash": "sha256-5vVF9W1tJT+WdfpWAEG76KywktKDAW/71mVmNHEHjac=", + "lastModified": 1714976745, + "narHash": "sha256-SAYU6uaVcUmckp/RFxkndz7u7eX1D69piTIMmAAop6Y=", "owner": "nix-community", "repo": "fenix", - "rev": "fd47b1f9404fae02a4f38bd9f4b12bad7833c96b", + "rev": "a291b6ad30f4ec949e6c98dde43d73d2946515c3", "type": "github" }, "original": { @@ -175,11 +174,11 @@ ] }, "locked": { - "lastModified": 1713487332, - "narHash": "sha256-BT1p3qNibYIoLsZwZQeLu3smz+0sru0ea/+JJOCZevQ=", + "lastModified": 1714956243, + "narHash": "sha256-ShNqZ1L73vnEAbmffCq/rbK2QZ180k8pw/ScGDblIAc=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "fad4ebc435bcc53866f0a9ccf121949552535d2c", + "rev": "8865626353ac6729c0b27213862d68cf3229a572", "type": "github" }, "original": { @@ -243,11 +242,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -264,11 +263,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -376,11 +375,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713536575, - "narHash": "sha256-5MwPERE0kLytHzuWdYIIFDK0csPYECLsHzpyxqSdyZU=", + "lastModified": 1715014280, + "narHash": "sha256-70dgc0r7vCVkp93yTwzaQ7Xfh9cE63t+0mCVbreK8SQ=", "owner": "helix-editor", "repo": "helix", - "rev": "94405f3d077a2d92940c3d923ff19edf2a9349fa", + "rev": "beb5afcbef9f102c209de7aa32f126ded9dda515", "type": "github" }, "original": { @@ -395,11 +394,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -415,11 +414,11 @@ ] }, "locked": { - "lastModified": 1713547570, - "narHash": "sha256-i8tNz47Lfsq5QWFLyE3rIm0gs2UUvXXAxfWTC24e370=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c61e400a99f33cdff3118c1e4032bcb049e1a30", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -438,11 +437,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1713012165, - "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", + "lastModified": 1714720456, + "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9f6635a0351c190179dc6904545f950108a23dd8", + "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", "type": "gitlab" }, "original": { @@ -487,11 +486,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -553,11 +552,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713442664, - "narHash": "sha256-LoExypse3c/uun/39u4bPTN4wejIF7hNsdITZO41qTw=", + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d764f230634fa4f86dc8d01c6af9619c7cc5d225", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "type": "github" }, "original": { @@ -576,11 +575,11 @@ "nvidia-patch-src": "nvidia-patch-src" }, "locked": { - "lastModified": 1713430020, - "narHash": "sha256-WvDPrAQEkApLduTpCiMlQBZSfXJ+dHHIs4/9dS5+KEc=", + "lastModified": 1714553275, + "narHash": "sha256-Xde2yx3DNLmpCvC4mKrX4uK3hz/qkiXFhtt4AoiZ/UM=", "owner": "arcnmx", "repo": "nvidia-patch.nix", - "rev": "8f6986466b61facb2e45bb19b8f44ba0ddea51ac", + "rev": "c426f3fc2c2f2949ce58080179725e29c8268b6e", "type": "github" }, "original": { @@ -592,11 +591,11 @@ "nvidia-patch-src": { "flake": false, "locked": { - "lastModified": 1713421661, - "narHash": "sha256-3M492Tj/H+yIjWC4IIzeiIak8OMwdgCNzolB5w+SMaM=", + "lastModified": 1714472446, + "narHash": "sha256-36re3x7lbCR7o5jX8+ScykC+4KxE7ip8o2ogV2JFAxw=", "owner": "keylase", "repo": "nvidia-patch", - "rev": "3193b4b1cea91527bf09ea9b8db5aade6a3f3c0a", + "rev": "7217e4c50dbeceb2a07f63168733b232a53e824e", "type": "github" }, "original": { @@ -652,11 +651,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713373173, - "narHash": "sha256-octd9BFY9G/Gbr4KfwK4itZp4Lx+qvJeRRcYnN+dEH8=", + "lastModified": 1714936835, + "narHash": "sha256-M+PpgfRMBfHo8Jb2ou/s3maAZbps0XnuHXQU9Hv9vL0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "46702ffc1a02a2ac153f1d1ce619ec917af8f3a6", + "rev": "c4618fe14d39992fbbb85c2d6cad028a232c13d2", "type": "github" }, "original": { @@ -703,11 +702,11 @@ ] }, "locked": { - "lastModified": 1713233539, - "narHash": "sha256-dPGrCy5ttx6E3bUOmDynY/cAotRqvoIAimZlbv+Zr1w=", + "lastModified": 1714097613, + "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "847bc25ebab8dc72a86d2b1f0c088740eebbb1b8", + "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd", "type": "github" }, "original": { @@ -871,11 +870,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1713354600, - "narHash": "sha256-/REaJdsq5b/VqLQhwrZ/talfLNqFP+kpgEnlLkic7TE=", + "lastModified": 1714117167, + "narHash": "sha256-Dw+x2AWL5BKmkZL1Aewlh8Elp+4bhsR0ukaukqnm2Uo=", "owner": "dj95", "repo": "zjstatus", - "rev": "620786260b79c086ac06a0a17086499ace9d94f5", + "rev": "cda2388764cc96832d7260e4114fc5c5c8699de3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2f3a32b..2973edc 100644 --- a/flake.nix +++ b/flake.nix @@ -114,11 +114,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; crane = { - # TODO: Move back once either is resolved - # https://github.com/ipetkov/crane/pull/533 - # https://github.com/toml-rs/toml/issues/691 - # url = "github:ipetkov/crane"; - url = "github:nrabulinski/crane/no-toml-edit"; + url = "github:ipetkov/crane"; inputs.nixpkgs.follows = "nixpkgs"; }; firefox-darwin = { diff --git a/hosts/legion/desktop.nix b/hosts/legion/desktop.nix index b9bd21a..caa3687 100644 --- a/hosts/legion/desktop.nix +++ b/hosts/legion/desktop.nix @@ -99,7 +99,8 @@ }; hardware.nvidia = { - patch.enable = true; + # TODO: Reenable + # patch.enable = true; modesetting.enable = true; };