From 752f4ea4546d35ee1ff1765d17b519464f8b9bb7 Mon Sep 17 00:00:00 2001 From: reo101 Date: Sat, 4 May 2024 22:39:09 +0300 Subject: [PATCH] feat(flake)!: update Fix `nixUnstable` -> `nixVersions.latest` (including `*-limited` overlay) Remove `repl-flake` nix experimental feature (removed as of `2.22.0`) Remove references to `rnix-lsp` (deprecated) --- flake.lock | 276 ++++++++++-------- flake.nix | 6 +- .../aarch64-darwin/limonka/configuration.nix | 4 +- .../limonka/home/pavelatanasov.nix | 1 - .../x86_64-darwin/apavel-a01/home/apavel.nix | 1 - .../x86_64-darwin/limontozu/configuration.nix | 9 +- .../limontozu/home/pavelatanasov.nix | 1 - .../aarch64-linux/cheetah/configuration.nix | 4 +- .../x86_64-linux/homix/configuration.nix | 4 +- .../nixos/x86_64-linux/homix/home/reo101.nix | 1 - overlays/default.nix | 10 +- pkgs/advcpmv/default.nix | 4 +- shells/default/default.nix | 2 +- 13 files changed, 183 insertions(+), 140 deletions(-) diff --git a/flake.lock b/flake.lock index b32b676..465c19d 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": { @@ -37,11 +37,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712180480, - "narHash": "sha256-fmjbIcYT4Hj/Tow004I9FKz/DbIYRjTDOPDRXaddt08=", + "lastModified": 1713903302, + "narHash": "sha256-qPy0BYFTenmyG4EU+oXej0V/i4jSsVvWbGGrv9Sb0kQ=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "85df729446fca1b9f22097b03e0ae2427c3246e2", + "rev": "8da0392e75373711604a07907de25ec9d5277384", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "cl-nix-lite": { "locked": { - "lastModified": 1698901928, - "narHash": "sha256-gMHZybEVA3uMOBu1483gXfvUqpv4Qn7GJs3ZfCQYxpc=", + "lastModified": 1709357207, + "narHash": "sha256-YZgXj6oL2Y/zDkSkGcoacpQPRLiYM8KeEB68CUs2irc=", "owner": "hraban", "repo": "cl-nix-lite", - "rev": "9ad861b45bda7f59eba5ad1b43565a03c7c58553", + "rev": "f55d263b30a601b1b4dd61b7c8787e97510f4018", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1712947906, - "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=", + "lastModified": 1714612856, + "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", "owner": "nix-community", "repo": "disko", - "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5", + "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", "type": "github" }, "original": { @@ -270,11 +270,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": { @@ -291,11 +291,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": { @@ -313,11 +313,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": { @@ -330,11 +330,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "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": { @@ -366,11 +366,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1714746424, + "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "3f017311191fe6d501ca2496a835d012f656ee9c", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "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": { @@ -570,16 +570,15 @@ ] }, "locked": { - "lastModified": 1712989663, - "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "home-manager", "type": "github" } @@ -607,11 +606,11 @@ ] }, "locked": { - "lastModified": 1712909442, - "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", + "lastModified": 1714803703, + "narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", + "rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb", "type": "github" }, "original": { @@ -623,13 +622,13 @@ "langref": { "flake": false, "locked": { - "narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=", + "narHash": "sha256-Kz+m9yeJgAsUfNwGG6ZDqZ3ElLZMeQmVYzgg0EEUzV4=", "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + "url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" }, "original": { "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + "url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" } }, "lib-net": { @@ -653,11 +652,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707183497, - "narHash": "sha256-K6LVwmM32uUEYXpDFCnwNqOyi863FRXR6KFq87X3iHg=", + "lastModified": 1710104942, + "narHash": "sha256-YrzF8P9Hi4CHky2z3hTKdPn/Zks+n4O4RkbSg75QhVc=", "owner": "hraban", "repo": "mac-app-util", - "rev": "95d9c38d6dec0296d73929f63a7de130f435437b", + "rev": "b2d3667f3b8d650310e55b38d3c4a5f35949e1f6", "type": "github" }, "original": { @@ -676,11 +675,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1712963920, - "narHash": "sha256-5Rh+bUrpeQLYtvnFlMFmUFkV/H6b+I22Bei8oNa+dBw=", + "lastModified": 1714754042, + "narHash": "sha256-UcnoAT91ewoikYFeJb1S3p4rVS0tfV7/juhrDkS6kvU=", "owner": "neovim", "repo": "neovim", - "rev": "66220d164a40791a5131d4660e6ffbee431070d5", + "rev": "3a8265266e0c0fe31f34b7c0192e8ae7d83ae950", "type": "github" }, "original": { @@ -701,11 +700,11 @@ ] }, "locked": { - "lastModified": 1712966609, - "narHash": "sha256-XkNBbh8x1niHtVILUiNlGJHN9N2JkY+a8MR8w0/mhrI=", + "lastModified": 1714780994, + "narHash": "sha256-Qfc+wUSIx2IGTjFiYYk3kq58Cxr88WcBWtly8qN7BGA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c83e531b908c1fe71a95830bbad6db8a1e5b5b6b", + "rev": "25d2ee5f16920301f53e22f606b34d4a90e10d65", "type": "github" }, "original": { @@ -735,16 +734,14 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -779,11 +776,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1666720474, - "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=", + "lastModified": 1705252799, + "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5", + "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", "type": "github" }, "original": { @@ -817,7 +814,7 @@ "nix-monitored": { "inputs": { "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1708169437, @@ -842,31 +839,31 @@ "nixpkgs": [ "nixpkgs" ], + "nixpkgs-docs": "nixpkgs-docs", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nmd": "nmd_2" }, "locked": { - "lastModified": 1688144254, - "narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=", + "lastModified": 1710434231, + "narHash": "sha256-yrWnsG28518tbIapJWiluweHORuuIwAQrA8lga0Sqlw=", "owner": "t184256", "repo": "nix-on-droid", - "rev": "2301e01d48c90b60751005317de7a84a51a87eb6", + "rev": "2d93311c4f3f300154d2085e4b4b1d550237da92", "type": "github" }, "original": { "owner": "t184256", - "ref": "release-23.05", "repo": "nix-on-droid", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1698553279, - "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", + "lastModified": 1710066242, + "narHash": "sha256-bO7kahLdawW7rBqUTfWgf9mdPYrnOo5DGvWRJa9N8Do=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", + "rev": "db339f1706f555794b71aa4eb26a5a240fb6a599", "type": "github" }, "original": { @@ -874,19 +871,35 @@ "type": "indirect" } }, - "nixpkgs-for-bootstrap": { + "nixpkgs-docs": { "locked": { - "lastModified": 1686921029, - "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-for-bootstrap": { + "locked": { + "lastModified": 1708105575, + "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", "type": "github" } }, @@ -908,11 +921,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -940,6 +953,19 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1687274257, + "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", + "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1707956935, "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", @@ -955,13 +981,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -971,7 +997,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1708655239, "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", @@ -987,7 +1013,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -1003,7 +1029,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1036,19 +1062,25 @@ } }, "nmd_2": { - "flake": false, + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs-docs" + ], + "scss-reset": "scss-reset" + }, "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", + "lastModified": 1705050560, + "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", + "owner": "~rycee", "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" + "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", + "type": "sourcehut" }, "original": { - "owner": "rycee", + "owner": "~rycee", "repo": "nmd", - "type": "gitlab" + "type": "sourcehut" } }, "nmt": { @@ -1069,11 +1101,11 @@ }, "nur": { "locked": { - "lastModified": 1713001499, - "narHash": "sha256-K+vpy3KL79P2iegNoUc65o0FWIahXh5aDoPgJLmQGtc=", + "lastModified": 1714841099, + "narHash": "sha256-G45aWsyMZSvIB2HhuecIVgs+zpqRMDWoHkUPZPItlbw=", "owner": "nix-community", "repo": "NUR", - "rev": "f2d42483bf8cf8c3ccd6e5a039d23104540db22d", + "rev": "5235f5f0626a9fd28c0949c0c1e6acfff59a5bb3", "type": "github" }, "original": { @@ -1117,7 +1149,7 @@ ], "crane": "crane", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { @@ -1153,7 +1185,7 @@ "nix-darwin": "nix-darwin", "nix-monitored": "nix-monitored", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "ragenix": "ragenix", "spicetify-nix": "spicetify-nix", @@ -1190,14 +1222,14 @@ "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1711764554, - "narHash": "sha256-I2/x/jFd7MAuIi3+kncIF0zJwhkFzxpi5XFdT2RLOF8=", + "lastModified": 1713579131, + "narHash": "sha256-j/lrqFNzm7SdlBlKX43kA2Wp0OaGVOUjQGnER9//4Ao=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7cf3d11d06dcd12fb62ca2c039f3c5e25b53c5a7", + "rev": "67e961704b80454f1ba6595b02e26afc9af4cdce", "type": "github" }, "original": { @@ -1206,10 +1238,26 @@ "type": "github" } }, + "scss-reset": { + "flake": false, + "locked": { + "lastModified": 1631450058, + "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", + "owner": "andreymatin", + "repo": "scss-reset", + "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", + "type": "github" + }, + "original": { + "owner": "andreymatin", + "repo": "scss-reset", + "type": "github" + } + }, "spicetify-nix": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1704167711, @@ -1402,11 +1450,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1711861273, - "narHash": "sha256-VuPSgDhK2zNtOZlpEXKBnMqSd9SkeC4ZQDDuX/swiDg=", + "lastModified": 1714016730, + "narHash": "sha256-w+fg8TVc2yceyzEKPn1iTBpsDyiEqVG6HekFnoDeD28=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "54bae8ac6154e52215c4c0f7d25fb5e735b9179e", + "rev": "19b8896f6d89321531c78ef5c2575963501e1a65", "type": "github" }, "original": { @@ -1424,11 +1472,11 @@ ] }, "locked": { - "lastModified": 1712967597, - "narHash": "sha256-W1XetQXv+CgkjehhVtTCR2ZpUOfmBT7pb9goMhjQl8o=", + "lastModified": 1714133353, + "narHash": "sha256-oDA4fGiFPxwiLHTJjY2hWn06Dg4yFW+EH/U9FTL8oRY=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "6ea5ee985a4378488d18bbde8ed3c0cec842d4c0", + "rev": "751dd89e227c60e89c6362fc5cdd5cb814e3f1ba", "type": "github" }, "original": { @@ -1450,11 +1498,11 @@ ] }, "locked": { - "lastModified": 1712963542, - "narHash": "sha256-hiRGZQ+T1KdoopZp2cjiwYcaie8fJbGfeMKNvXAOmYE=", + "lastModified": 1714726694, + "narHash": "sha256-EZpShJM2csFe+EBFJyjVWs6/nPvQwiMuuWsmeltEMXg=", "owner": "zigtools", "repo": "zls", - "rev": "8e264df7b1195b16356cced048dec3714ec37ad0", + "rev": "f6817ed3ca4d70c2181f96fbbf84cb533cd7205e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 43ed595..b729ada 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ # Nix on Droid nix-on-droid = { - url = "github:t184256/nix-on-droid/release-23.05"; + url = "github:t184256/nix-on-droid"; # url = "github:t184256/nix-on-droid/master"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; @@ -23,7 +23,7 @@ # Nix Darwin nix-darwin = { url = "github:lnl7/nix-darwin/master"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; mac-app-util = { @@ -32,7 +32,7 @@ # Home Manager home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix index 168fd91..bd6ec93 100644 --- a/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix +++ b/machines/nix-darwin/aarch64-darwin/limonka/configuration.nix @@ -10,14 +10,13 @@ nix = { # Ensure we can work with flakes - package = pkgs.nixUnstable; + package = pkgs.nixVersions.latest-monitored; settings = { # Enable flakes and new 'nix' command experimental-features = [ # "nix-command" # "flakes" - # "repl-flake" # "no-url-literals" # Disabling URL literals "ca-derivations" # Content-Addressable Derivations @@ -31,7 +30,6 @@ # "discard-references" # Discarding build output references "fetch-closure" # builtins.fetchClosure "impure-derivations" # Impure derivations - "repl-flake" # Passing installables to nix repl ]; # Allow building multiple derivations in parallel diff --git a/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix b/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix index 944835a..d3057fd 100644 --- a/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix +++ b/machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix @@ -104,7 +104,6 @@ circom-lsp # Nix - rnix-lsp nil nixd diff --git a/machines/nix-darwin/x86_64-darwin/apavel-a01/home/apavel.nix b/machines/nix-darwin/x86_64-darwin/apavel-a01/home/apavel.nix index e2507b4..0152ae8 100644 --- a/machines/nix-darwin/x86_64-darwin/apavel-a01/home/apavel.nix +++ b/machines/nix-darwin/x86_64-darwin/apavel-a01/home/apavel.nix @@ -16,7 +16,6 @@ # dhall-lsp-server # Nix - rnix-lsp nil # Zig diff --git a/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix b/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix index c51590a..2f402b1 100644 --- a/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix +++ b/machines/nix-darwin/x86_64-darwin/limontozu/configuration.nix @@ -22,7 +22,7 @@ # # settings = { # # Enable flakes and new 'nix' command - # experimental-features = "nix-command flakes repl-flake"; + # experimental-features = "nix-command flakes"; # # Deduplicate and optimize nix store # auto-optimise-store = true; # # Keep outputs and derivations @@ -33,11 +33,11 @@ nix = { # Ensure we can work with flakes - package = pkgs.nixUnstable; + package = pkgs.nixVersions.latest; # extraOptions = '' # # Enable flakes and new 'nix' command - # experimental-features = nix-command flakes repl-flake + # experimental-features = nix-command flakes # # Allow building multiple derivations in parallel # max-jobs = auto # # Deduplicate and optimize nix store @@ -62,7 +62,6 @@ experimental-features = [ # "nix-command" # "flakes" - # "repl-flake" # "no-url-literals" # Disabling URL literals "ca-derivations" # Content-Addressable Derivations @@ -76,7 +75,7 @@ # "discard-references" # Discarding build output references "fetch-closure" # builtins.fetchClosure "impure-derivations" # Impure derivations - "repl-flake" # Passing installables to nix repl + "configurable-impure-env" ]; # Allow building multiple derivations in parallel diff --git a/machines/nix-darwin/x86_64-darwin/limontozu/home/pavelatanasov.nix b/machines/nix-darwin/x86_64-darwin/limontozu/home/pavelatanasov.nix index bb927f7..60ede7b 100644 --- a/machines/nix-darwin/x86_64-darwin/limontozu/home/pavelatanasov.nix +++ b/machines/nix-darwin/x86_64-darwin/limontozu/home/pavelatanasov.nix @@ -49,7 +49,6 @@ circom-lsp # Nix - rnix-lsp nil # SSH and GPG diff --git a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix index d94f951..c908f48 100644 --- a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix +++ b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix @@ -18,12 +18,12 @@ system.stateVersion = "22.11"; nix.extraOptions = '' - experimental-features = nix-command flakes repl-flake recursive-nix + experimental-features = nix-command flakes recursive-nix keep-outputs = true keep-derivations = true ''; - nix.package = pkgs.nixUnstable; + nix.package = pkgs.nixVersions.latest; time.timeZone = "Europe/Sofia"; diff --git a/machines/nixos/x86_64-linux/homix/configuration.nix b/machines/nixos/x86_64-linux/homix/configuration.nix index b5793f2..609cd59 100644 --- a/machines/nixos/x86_64-linux/homix/configuration.nix +++ b/machines/nixos/x86_64-linux/homix/configuration.nix @@ -61,11 +61,11 @@ # }; nix = { - package = pkgs.nixUnstable; + package = pkgs.nixVersions.latest; # Enable flakes, the new `nix` commands and better support for flakes in it extraOptions = '' - experimental-features = nix-command flakes repl-flake + experimental-features = nix-command flakes ''; # This will add each flake input as a registry diff --git a/machines/nixos/x86_64-linux/homix/home/reo101.nix b/machines/nixos/x86_64-linux/homix/home/reo101.nix index 1c0adfb..55fead9 100644 --- a/machines/nixos/x86_64-linux/homix/home/reo101.nix +++ b/machines/nixos/x86_64-linux/homix/home/reo101.nix @@ -64,7 +64,6 @@ # dhall-lsp-server ## Nix - rnix-lsp nil direnv diff --git a/overlays/default.nix b/overlays/default.nix index d9981d4..fe22bd8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -30,14 +30,16 @@ }; }; - nix = inputs.nix-monitored.packages.${final.system}.default.override { + nix-monitored = inputs.nix-monitored.packages.${final.system}.default.override { nix = prev.nix; nix-output-monitor = prev.nix-output-monitor; }; - nixUnstable = inputs.nix-monitored.packages.${final.system}.default.override { - nix = prev.nixUnstable; - nix-output-monitor = prev.nix-output-monitor; + nixVersions = prev.nixVersions // { + latest-monitored = inputs.nix-monitored.packages.${final.system}.default.override { + nix = prev.nixVersions.latest; + nix-output-monitor = prev.nix-output-monitor; + }; }; himalaya = prev.himalaya.overrideAttrs (oldAttrs: rec { diff --git a/pkgs/advcpmv/default.nix b/pkgs/advcpmv/default.nix index c07c3f3..0689ee7 100644 --- a/pkgs/advcpmv/default.nix +++ b/pkgs/advcpmv/default.nix @@ -5,7 +5,7 @@ let advcpmv_version = "0.9"; coreutils_version = "9.1"; coreutils_upstream = "coreutils"; - patch_rev = "69d2f9d3c72ec149fc7e06f5154af27db857ebb5"; + patch_rev = "1e2b1c6b74fa0974896bf94604279a3f74b37a63"; in stdenv.mkDerivation rec { name = "advcpmv"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/${advcpmv_owner}/${name}/${patch_rev}/${name}-${advcpmv_version}-${coreutils_version}.patch"; - hash = "sha256-l7kf2vz/heW3lgT89yDs5Wdfzw3Xbb3QhPGct7SCruQ="; + hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg="; }) ]; diff --git a/shells/default/default.nix b/shells/default/default.nix index c2bf579..f4ce7c8 100644 --- a/shells/default/default.nix +++ b/shells/default/default.nix @@ -5,7 +5,7 @@ , ... }: pkgs.mkShell { NIX_CONFIG = '' - extra-experimental-features = nix-command flakes repl-flake + extra-experimental-features = nix-command flakes ''; nativeBuildInputs = with pkgs; [ nix