diff --git a/flake.lock b/flake.lock index 7e92adf..e1632e6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1712185015, - "narHash": "sha256-mL3VSJRkyDJbMh/QqUeOhGOsEOTS7Jw9Tqw4fM+VjB4=", + "lastModified": 1716425853, + "narHash": "sha256-PSd1jStP3SfJB3JvHRVjHpGwy3eKjni06VciEly0rHQ=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "1dbb1c233a249e8cbc03907e965bd2a48d880262", + "rev": "fa6201a1cfcaa84d442c9c9b17c2e79df99f444b", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1713285896, - "narHash": "sha256-hUJ+yeAsmieJUZh19d4p/AUDvGEr8iwbr7b1DhEqFcs=", + "lastModified": 1716337435, + "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=", "owner": "catppuccin", "repo": "nix", - "rev": "d2f4a13bd9a4926f90ad80df1c3539e45102f135", + "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1712904719, - "narHash": "sha256-WrXAwOyAQN+Pz7rHUo+6YNa4fp+zSLLt3eI2J0jigBY=", + "lastModified": 1716417809, + "narHash": "sha256-E7C+bpXtJDF0/6U4o4VJlboTHlLuZlYGyzmJKLwbk8A=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6f1068b044655f27f2be6cf62ccab6c65b1a2717", + "rev": "0fa9580097f67dc2a293359e6a4f64861c17caa6", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "citation-style-language": { "flake": false, "locked": { - "lastModified": 1710229389, - "narHash": "sha256-0kkO3hRKLPAaoCmhp/a6X8kCShnNcTY6OcsVYtyqy0g=", + "lastModified": 1714403905, + "narHash": "sha256-wh8yusPzEyvbD+1XJeQas6YcT4BB1pEBt2qDqdkxyeo=", "ref": "refs/heads/main", - "rev": "4febfb5c6c228189619cfbb586ab6943d8a5b383", - "revCount": 645, + "rev": "8f283458fa7b1070660927c4eae8b0e198c5899f", + "revCount": 648, "submodules": true, "type": "git", "url": "https://github.com/zepinglee/citeproc-lua" @@ -164,15 +164,15 @@ "cjktty": { "flake": false, "locked": { - "lastModified": 1704026380, - "narHash": "sha256-2PifENv3HD9a1q+uPsMnFp5RHdGcV4qOyX4e5dmDHK4=", - "owner": "zhmars", + "lastModified": 1716434550, + "narHash": "sha256-jrkx2ipqmZxp6WKemJR2UZjbaJv2xGkHLWbEffRnuw4=", + "owner": "CHN-beta", "repo": "cjktty-patches", - "rev": "0d0015730edd2190dee7233f87dd72c423bb75e9", + "rev": "ab6df4de5666f229a10fff53b348677ba668fa78", "type": "github" }, "original": { - "owner": "zhmars", + "owner": "CHN-beta", "repo": "cjktty-patches", "type": "github" } @@ -191,6 +191,23 @@ "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "owner": "matrix-org", + "repo": "complement", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, "concurrencpp": { "flake": false, "locked": { @@ -213,6 +230,7 @@ "chaotic", "attic" ], + "complement": "complement", "crane": [ "chaotic", "crane" @@ -236,14 +254,15 @@ "nixpkgs": [ "chaotic", "nixpkgs" - ] + ], + "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1712765734, - "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", + "lastModified": 1716337337, + "narHash": "sha256-VxGcoFcdlhwy4AUwrg93GhEF78KsMTc1rO3HVhklThg=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", + "rev": "474d50d10cda2d45561b6d74ba775d839c1a0fa6", "type": "github" }, "original": { @@ -276,12 +295,12 @@ ] }, "locked": { - "lastModified": 1706473297, - "narHash": "sha256-FbxuYIrHaXpsYCLtI1gCNJhd+qvERjPibXL3ctmVaCs=", - "rev": "fe812ef0dad5bb93a56c599d318be176d080281d", - "revCount": 493, + "lastModified": 1716156051, + "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", + "rev": "7443df1c478947bf96a2e699209f53b2db26209d", + "revCount": 571, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.1/018d51be-1c17-765e-babc-c9e3bc8a5a14/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.1/018f92f7-d079-7a6a-8660-4fa94147552e/source.tar.gz" }, "original": { "type": "tarball", @@ -308,11 +327,11 @@ "date": { "flake": false, "locked": { - "lastModified": 1710625255, - "narHash": "sha256-xFZ1AjvnWsa4s+T4uCLvPObjpEsVDm9R4V/u8Cog3QU=", + "lastModified": 1715694668, + "narHash": "sha256-0dlwfPFUpIUp45KxfJIcD7J7ls6csPGx//qSt9Wp2CI=", "owner": "HowardHinnant", "repo": "date", - "rev": "0e65940a7fbc4ed617a1ee111a60311eccbead9a", + "rev": "1ead6715dec030d340a316c927c877a3c4e5a00c", "type": "github" }, "original": { @@ -330,11 +349,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711973905, - "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "lastModified": 1715699772, + "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", "owner": "serokell", "repo": "deploy-rs", - "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", "type": "github" }, "original": { @@ -355,11 +374,11 @@ ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -428,11 +447,11 @@ "eigen": { "flake": false, "locked": { - "lastModified": 1712885537, - "narHash": "sha256-iu13sWXE9qI4VYrR0jBRQrV+1yq7lJ2kDovrd+bLpKs=", + "lastModified": 1716380941, + "narHash": "sha256-S/C/afVSZp4GRqv0TGBWP2y5B3F1BQxHsT6Kqk9K/D4=", "owner": "libeigen", "repo": "eigen", - "rev": "5226566a14ddb4d84214c40809531038f087d187", + "rev": "c4d84dfddc9f9edef0fdbe7cf9966d2f4a303198", "type": "gitlab" }, "original": { @@ -483,11 +502,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1712395886, - "narHash": "sha256-jy9VcKgbysDPZP5NUTVuLB3+jMprKVT7f/+9GUHuCt4=", + "lastModified": 1716247015, + "narHash": "sha256-0m+VR3NKA7OENh0QmWRZcyyaNqU/jXekso8QOxMdRrg=", "owner": "Mic92", "repo": "envfs", - "rev": "7cfbba8819911116adf2aeada81532ad9f5c9b46", + "rev": "48b1187e814416d0c93aa54da47d6c73f1838c2e", "type": "github" }, "original": { @@ -585,12 +604,12 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1711952616, - "narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=", - "rev": "209048d7c545905c470f6f8c05c5061f391031a8", - "revCount": 1822, + "lastModified": 1714544767, + "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "revCount": 1852, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1822%2Brev-209048d7c545905c470f6f8c05c5061f391031a8/018e98ba-d842-7dad-9d6a-0d0ee173b6b1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1852%2Brev-73124e1356bde9411b163d636b39fe4804b7ca45/018f333a-c195-795f-9e07-b43b47d5391f/source.tar.gz" }, "original": { "type": "tarball", @@ -734,11 +753,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -752,11 +771,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1714606777, + "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", "type": "github" }, "original": { @@ -773,11 +792,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -794,11 +813,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -807,6 +826,21 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "owner": "srid", + "repo": "flake-root", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1693491534, @@ -933,11 +967,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -949,11 +983,11 @@ "fluent-kde": { "flake": false, "locked": { - "lastModified": 1685119052, - "narHash": "sha256-jm8ztgoWV8sewCYbFxReiVPjuHY97NslKM1AIoooSiY=", + "lastModified": 1714244040, + "narHash": "sha256-uvBXNBuRDSm8/BFVzNo1Z7w/45ysY4MfjITS7w0cqaU=", "owner": "vinceliuice", "repo": "Fluent-kde", - "rev": "83d5cc2013751aa9eeb944dafa3a3460652690ce", + "rev": "5c8b998c5d9c3bbda90a468dab8f9691b661f24c", "type": "github" }, "original": { @@ -1007,11 +1041,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -1027,11 +1061,11 @@ ] }, "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -1065,11 +1099,11 @@ ] }, "locked": { - "lastModified": 1712521891, - "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", + "lastModified": 1716274466, + "narHash": "sha256-upoklExLKqq6LiZTLkaVK5LcBdl/VIiW7kZ8g2vdqhw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", + "rev": "3516515f04e8ab8339a5d1eefd8f051b00d7c362", "type": "github" }, "original": { @@ -1091,11 +1125,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712768022, - "narHash": "sha256-wpOfdrywFHjXLzUuNuuHixVZytPkxAUEsYY4GzcE09k=", + "lastModified": 1716340685, + "narHash": "sha256-eRVwMSfBh86jrTgu04+vZTQdq4zoOcFUKJUmiBbSRnw=", "owner": "martinvonz", "repo": "jj", - "rev": "a786802b4017f6e20cc3ecde054e249e4f8ec005", + "rev": "2143cc36861971036e372cb936e70433a754dcbc", "type": "github" }, "original": { @@ -1123,11 +1157,11 @@ "lepton": { "flake": false, "locked": { - "lastModified": 1711209012, - "narHash": "sha256-FJbVZ9t/IQBASaX4EfpuUmge9uZ/7rWlcTp6yWxEFRI=", + "lastModified": 1716113343, + "narHash": "sha256-0e4K7mLeBpCGR7Kw4XwmzXNmzLt1KIwbC6nlQljCmaA=", "owner": "black7375", "repo": "Firefox-UI-Fix", - "rev": "ba16a40b1dc36d43b433ae5ebb518bd6281be9ec", + "rev": "1406c3fd7bb4b43bade7962491d3106ae58cf10d", "type": "github" }, "original": { @@ -1139,11 +1173,11 @@ "linux-surface": { "flake": false, "locked": { - "lastModified": 1712763056, - "narHash": "sha256-fB4VWGdSnk4AyueLpnd9gHIJtqrwZXQdLpTcj/45scI=", + "lastModified": 1714463244, + "narHash": "sha256-k6AFdMnBBH6RCx8WCx12S5/vHJboZ4vDPcLAIqfP4c8=", "owner": "linux-surface", "repo": "linux-surface", - "rev": "ff7468d74931455d0163bcf0a9bc908e92a3bc71", + "rev": "e598fa2ca8b691eaf5183f020e188152e7a791ff", "type": "github" }, "original": { @@ -1155,11 +1189,11 @@ "lmod": { "flake": false, "locked": { - "lastModified": 1710702673, - "narHash": "sha256-E13kbKTLn7p4qd327d2ZJK5AC9MWjlDNtadIx41L8fE=", + "lastModified": 1713046088, + "narHash": "sha256-A1mMpYGxAyrplSQo2wfyA6Dy/oTgq5/POfuXmZXs4WE=", "owner": "TACC", "repo": "Lmod", - "rev": "603f7e789cb8dfd02415bd1257a25b2d4dc69c04", + "rev": "7940a1c13383a4527c2e2731eada34b9cfe77157", "type": "github" }, "original": { @@ -1237,11 +1271,11 @@ "nameof": { "flake": false, "locked": { - "lastModified": 1706711212, - "narHash": "sha256-g3VwgCloqFnghG7OB7aK3uB/1RNKe8h6Nu7pbIGqrEQ=", + "lastModified": 1715807436, + "narHash": "sha256-Mzcmin7p5wlNkbqvLE/GCOHnRu1R7/Dv0bsJe96w58U=", "owner": "Neargye", "repo": "nameof", - "rev": "3d4c9820fc88837a8ec3081544d3e52a75813c40", + "rev": "174b23d76e81f97766e8350aeab2a7cd49004bc9", "type": "github" }, "original": { @@ -1322,11 +1356,11 @@ ] }, "locked": { - "lastModified": 1712736594, - "narHash": "sha256-r9i9cZUB02l0qhJ7Q4g3zXM8uClM4zxjEYM1AAFq48I=", + "lastModified": 1716316430, + "narHash": "sha256-/jcKnURpjNHrv30JiliY5+zWaOHUdkdTU5Pls4X8C7E=", "owner": "YaLTeR", "repo": "niri", - "rev": "0cd149c939c1f756a96381a84801073021ac1e63", + "rev": "efb39e466b5248eb894745e899de33661493511d", "type": "github" }, "original": { @@ -1388,11 +1422,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1709911523, - "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=", + "lastModified": 1715803356, + "narHash": "sha256-wvsg/UMM/jekzgbggH56KLZJzRmwrB9ErevaXXyWyqc=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "692fe3e98f36b60c678d637235271b57910a7f80", + "rev": "cfff239d93716e92f6467f8953d8f8c12da1892a", "type": "github" }, "original": { @@ -1461,11 +1495,11 @@ ] }, "locked": { - "lastModified": 1712459390, - "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", + "lastModified": 1716170277, + "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4676d72d872459e1e3a248d049609f110c570e9a", + "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", "type": "github" }, "original": { @@ -1481,11 +1515,11 @@ "parts": "parts_2" }, "locked": { - "lastModified": 1713195291, - "narHash": "sha256-UoenVdkDb4mL+Hf4KNzxLwctJJ78BmPSDdGkv1mRL2g=", + "lastModified": 1713493270, + "narHash": "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=", "owner": "bluskript", "repo": "nix-inspect", - "rev": "e22da2a40e92d8180714ff4027c8768c422d6cd9", + "rev": "86f636b1e01579b3a63b2c778c21a818b00c3d1e", "type": "github" }, "original": { @@ -1519,11 +1553,11 @@ ] }, "locked": { - "lastModified": 1712907804, - "narHash": "sha256-T1wv1UTuwskzQ16rRPscPPRTviIDF1lmOJhqL/CbtQQ=", + "lastModified": 1716427345, + "narHash": "sha256-pCVf6Cro2bl2mM2aPcSwOKcgHEIwv1+NzpRujDG/xyY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "967df647ce97d2d5cf78676e16fe6ceae0247355", + "rev": "8621462b67eb9b5d02c947956e007135c9d0231f", "type": "github" }, "original": { @@ -1535,16 +1569,17 @@ "nixd": { "inputs": { "flake-parts": "flake-parts_3", + "flake-root": "flake-root", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1712829501, - "narHash": "sha256-tbXTbuifD64M8mt8Ve/WIXnFJKVQXMEeo47cXS9jC8c=", + "lastModified": 1716179952, + "narHash": "sha256-YYAkj/wBEMO75nnJbcB4cjSfGzlkmaRao1WeULDIdGc=", "owner": "nix-community", "repo": "nixd", - "rev": "7837528a19884373268a4aac781a228698cfb310", + "rev": "ff3eb7117ea030d8d466d364513394cf47b58715", "type": "github" }, "original": { @@ -1576,11 +1611,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715431025, - "narHash": "sha256-32OZ1wmL1S32P6FAck7S5mE6/rCdX9mphQbb0tca2T8=", + "lastModified": 1716434919, + "narHash": "sha256-e4pct2Dfm8Z01CrAtUjhYy3hQ1QDJ6AG4QrZ0Qb3bI8=", "owner": "CHN-beta", "repo": "nixos-hardware", - "rev": "f4854a1f2257868b44ade3c0a0cdefc40e8cc77d", + "rev": "d68b07afe4d8dbe11edd841dc1116fcd42ba5b01", "type": "github" }, "original": { @@ -1591,11 +1626,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1712741485, - "narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=", + "lastModified": 1716218643, + "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "type": "github" }, "original": { @@ -1614,11 +1649,11 @@ ] }, "locked": { - "lastModified": 1709985524, - "narHash": "sha256-29ZwMJBErP41ZPis1MskhdheDRgt+reDuf53jONSkc8=", + "lastModified": 1716431440, + "narHash": "sha256-331cJMya1uuIKaq6wWfrHmBbg/cE7LW6d7W3CMornzQ=", "owner": "nixpak", "repo": "nixpak", - "rev": "b0862a125da8fe5d179633d6cc7aed57d5316871", + "rev": "809ba0a420bc57c6eca2f5fdfef9919604c8903f", "type": "github" }, "original": { @@ -1629,11 +1664,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -1693,30 +1728,24 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -1745,11 +1774,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -1761,11 +1790,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712908828, - "narHash": "sha256-ihB9lz4wN/BHOUfW5wrQVZxR4KmcDpg35elFVQGRzWM=", + "lastModified": 1716265408, + "narHash": "sha256-i5aFF2iw707QrRvLNiLG936p3GXXulDMTKSknhBGwYI=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "f55ccc3452e34030cd6f555095bcb5f95229e798", + "rev": "c64afe35ab605d20caf19e4bff3ff816b1944c24", "type": "github" }, "original": { @@ -1809,11 +1838,11 @@ }, "nur": { "locked": { - "lastModified": 1712906890, - "narHash": "sha256-MkhmSqGqQ5cDa1VzqkA76h6+9rYCY2IJzSRglNV+Vr4=", + "lastModified": 1716424553, + "narHash": "sha256-gcn3IDjugAsyR1U7k/atVN/F/S4DJphrkpzoyYPIyHg=", "owner": "nix-community", "repo": "NUR", - "rev": "0fb8bccadea16d13d87210c21fbae09b26c28e07", + "rev": "e1b5b402c68cd12c45bfddabe250de1430f02994", "type": "github" }, "original": { @@ -1836,11 +1865,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1712903050, - "narHash": "sha256-/V5ugz8raxWyqdtCSw/clZplQRxyp9WkxBE5jeJBpf8=", + "lastModified": 1716381412, + "narHash": "sha256-f85YYXRvi/Rs9q5a4BF/3paXDO1MRID/G4nNUch3nJA=", "owner": "linyinfeng", "repo": "nur-packages", - "rev": "f1c2d98518d8d223fc700d86c6eb63abd5de40cb", + "rev": "06561f70c8c743a5d5e0eb1fed451eabc6fd77f2", "type": "github" }, "original": { @@ -1888,11 +1917,11 @@ ] }, "locked": { - "lastModified": 1712538578, - "narHash": "sha256-+fFOtg2fQK6kafSucYDpMG8ENXgo52+YSQtCoXv/+Ik=", + "lastModified": 1713333471, + "narHash": "sha256-sIVQKOXzruxtTYiBRHZa8UQH+CSIa9K5MZlY6vavYfA=", "owner": "berberman", "repo": "nvfetcher", - "rev": "1463db224a54cbc9499860ef5a51a9b6bf7c3180", + "rev": "2a824322dc6a755ffda83a13b948d42304521e4d", "type": "github" }, "original": { @@ -1914,11 +1943,11 @@ ] }, "locked": { - "lastModified": 1712538578, - "narHash": "sha256-+fFOtg2fQK6kafSucYDpMG8ENXgo52+YSQtCoXv/+Ik=", + "lastModified": 1708838575, + "narHash": "sha256-brhWjqJG+Yp0KGkF1LE7h0E86Z7OhDQJLo9qhWAmoYw=", "owner": "berberman", "repo": "nvfetcher", - "rev": "1463db224a54cbc9499860ef5a51a9b6bf7c3180", + "rev": "367e2eaa92d8f5133c2c5ac03a80c0cf25f301b8", "type": "github" }, "original": { @@ -1946,11 +1975,11 @@ "openxlsx": { "flake": false, "locked": { - "lastModified": 1656848604, - "narHash": "sha256-Bdik5tY6DsNKMMXvfVOHngLHud3OJ8q9OTwv4eaDMvY=", + "lastModified": 1716219728, + "narHash": "sha256-pl7AKjvdfu0aPPX+X/dFAdPcnicgcnapPqyJl6eJ00w=", "owner": "troldal", "repo": "OpenXLSX", - "rev": "b80da42d1454f361c29117095ebe1989437db390", + "rev": "ededa1e8398305d0983648d3e9f120ff7e228d2b", "type": "github" }, "original": { @@ -2076,11 +2105,11 @@ ] }, "locked": { - "lastModified": 1712907244, - "narHash": "sha256-uLNzw3ZRWob9/FfOXUNhlzKNCPWNtWfF4QYoc3Hs1Fw=", + "lastModified": 1716145823, + "narHash": "sha256-S2cfXdWCRf6Z+Gas6GN1kMSYqG01583uuJKITDVQp0o=", "owner": "pjones", "repo": "plasma-manager", - "rev": "27014d611e79bba47d5ee12f5790baf121045506", + "rev": "5db76cbb4d66231769cd8939472ae00c55c24a44", "type": "github" }, "original": { @@ -2167,6 +2196,23 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1714770052, + "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "db6df0b185774778457dabfcbd822cb81760cade", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.1.1", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "aagl": "aagl", @@ -2248,11 +2294,11 @@ "rsshub": { "flake": false, "locked": { - "lastModified": 1712907942, - "narHash": "sha256-xzJ/NC4eqIqPrL4NsPCBzL7cJicDHAeAT8DHCnwFFdg=", + "lastModified": 1716370120, + "narHash": "sha256-+I0eDHD7gyr+e9eZNrdbZ3hZapn1prxCiy/Me2BT6hs=", "owner": "DIYgod", "repo": "RSSHub", - "rev": "95cd0ea7b41743312e64b1f0b3ad1bfe15dbecd5", + "rev": "32bd527684e18e1947aeef4625668a7062e0d192", "type": "github" }, "original": { @@ -2264,11 +2310,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1711885694, - "narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=", + "lastModified": 1714501997, + "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e4a405f877efd820bef9c0e77a02494e47c17512", + "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", "type": "github" }, "original": { @@ -2292,11 +2338,11 @@ ] }, "locked": { - "lastModified": 1707444620, - "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=", + "lastModified": 1714961776, + "narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071", + "rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf", "type": "github" }, "original": { @@ -2324,11 +2370,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1712894663, - "narHash": "sha256-aNvgxHiDCJ2dnkkpU8W5ufHb5KY2P8wupzovGiOijqY=", + "lastModified": 1716350681, + "narHash": "sha256-TozLmoqB09MegHDEbdIR+FB0VhzOR3En0kOMjDUcxoY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9f5c9aad284a476a7b99e3f91a76e8e137605763", + "rev": "aa8fac6e07a6186d607acf541e845232df23ae47", "type": "gitlab" }, "original": { @@ -2403,11 +2449,11 @@ ] }, "locked": { - "lastModified": 1712617241, - "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", + "lastModified": 1716400300, + "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", + "rev": "b549832718b8946e875c016a4785d204fcfc2e53", "type": "github" }, "original": { @@ -2604,11 +2650,11 @@ ] }, "locked": { - "lastModified": 1698438538, - "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", + "lastModified": 1714058656, + "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", + "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", "type": "github" }, "original": { @@ -2625,11 +2671,11 @@ ] }, "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "type": "github" }, "original": { @@ -2675,11 +2721,11 @@ "v-sim": { "flake": false, "locked": { - "lastModified": 1712840468, - "narHash": "sha256-l8ExpbdRoYuivHAMtl+CDnnTOVFMXhTDEhOFufSfiBs=", + "lastModified": 1715973671, + "narHash": "sha256-+QNK8hXhqHw/WRHBZ2DAuOl2QIAT53YaFUI5qfBHGLg=", "owner": "l_sim", "repo": "v_sim", - "rev": "3a3ca930bf0161e557a308013e1680e2dcf426c9", + "rev": "0816f29dca18c0f500936c6e7f3c5e687617e682", "type": "gitlab" }, "original": { @@ -2747,11 +2793,11 @@ "zpp-bits": { "flake": false, "locked": { - "lastModified": 1711999196, - "narHash": "sha256-TUXzo8vl3noLwVy00ygj3IOVhU/qES6jlAbHVzbPWl0=", + "lastModified": 1715201662, + "narHash": "sha256-/KkMnRN3DBTzwMYH5WUdhziJiSWJAJqIA1uodm2M0PQ=", "owner": "eyalz800", "repo": "zpp_bits", - "rev": "03cc83a5440d5c003cda952df5b9badbf8b0589f", + "rev": "2fa24112425ace55ae27a75f717ae0fd054097a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index acaab15..291f7b1 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ lmod = { url = "github:TACC/Lmod"; flake = false; }; mumax = { url = "github:CHN-beta/mumax"; flake = false; }; kylin-virtual-keyboard = { url = "git+https://gitee.com/openkylin/kylin-virtual-keyboard.git"; flake = false; }; - cjktty = { url = "github:zhmars/cjktty-patches"; flake = false; }; + cjktty = { url = "github:CHN-beta/cjktty-patches"; flake = false; }; zxorm = { url = "github:CHN-beta/zxorm"; flake = false; }; openxlsx = { url = "github:troldal/OpenXLSX"; flake = false; }; sqlite-orm = { url = "github:fnc12/sqlite_orm"; flake = false; }; diff --git a/modules/packages/desktop-extra.nix b/modules/packages/desktop-extra.nix index 758b45f..e63fdc4 100644 --- a/modules/packages/desktop-extra.nix +++ b/modules/packages/desktop-extra.nix @@ -20,7 +20,7 @@ inputs: spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio waifu2x-converter-cpp inkscape blender # editor - unstablePackages.typora + typora # themes orchis-theme plasma-overdose-kde-theme materia-kde-theme graphite-kde-theme arc-kde-theme materia-theme # news diff --git a/modules/packages/desktop/default.nix b/modules/packages/desktop/default.nix index 347271b..fd43f3b 100644 --- a/modules/packages/desktop/default.nix +++ b/modules/packages/desktop/default.nix @@ -29,7 +29,7 @@ inputs: tela-circle-icon-theme localPackages.win11os-kde localPackages.fluent-kde localPackages.blurred-wallpaper localPackages.slate utterly-nord-plasma # terminal - unstablePackages.warp-terminal + warp-terminal # development adb-sync # virtual keyboard diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix index 98c5859..f33cf4c 100644 --- a/modules/services/gitea.nix +++ b/modules/services/gitea.nix @@ -19,7 +19,7 @@ inputs: services.gitea = { enable = true; - package = inputs.pkgs.unstablePackages.gitea.overrideAttrs { src = builtins.fetchurl + package = inputs.pkgs.gitea.overrideAttrs { src = builtins.fetchurl { url = "https://dl.gitea.com/gitea/1.22.0-rc1/gitea-src-1.22.0-rc1.tar.gz"; sha256 = "1h7kjzk7zck7j2advcxc0gsmv3qkwmhcnqi9zl7ypiffy40p6l9y"; diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 09cb6b1..898851b 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -59,8 +59,7 @@ inputs: let version = builtins.concatStringsSep "." (inputs.lib.lists.take 2 (builtins.splitVersion inputs.config.boot.kernelPackages.kernel.version)); - fileVersion = { "6.8" = "6.7"; }.${version} or version; - in "${inputs.topInputs.cjktty}/v6.x/cjktty-${fileVersion}.patch"; + in "${inputs.topInputs.cjktty}/v6.x/cjktty-${version}.patch"; extraStructuredConfig = { FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; }; }]; @@ -134,19 +133,7 @@ inputs: inputs.lib.strings.hasPrefix "cachyos" kernel.variant && builtins.elem "server-extra" inputs.config.nixos.packages._packageSets ) - ( - let scx = - let rustPlatform = inputs.pkgs.unstablePackages.rustPlatform; - in inputs.pkgs.scx.override (prev: - { - scx-layered = prev.scx-layered.override { inherit rustPlatform; }; - scx-rustland = prev.scx-rustland.override { inherit rustPlatform; }; - scx-rusty = prev.scx-rusty.override { inherit rustPlatform; }; - scx-rlfifo = prev.scx-rlfifo.override { inherit rustPlatform; }; - scx-lavd = prev.scx-lavd.override { inherit rustPlatform; }; - }); - in { environment.systemPackages = [ scx ]; } - ) + { environment.systemPackages = [ inputs.pkgs.scx ]; } ) ( inputs.lib.mkIf (kernel.variant == "rpi3")