From 4e99a0e3230321b30a78bfa2183535a7dff8a70d Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 3 Jan 2025 16:14:31 +1100 Subject: [PATCH] whole bunch of stuff --- flake.lock | 937 ++++++------------ flake.nix | 127 ++- .../essentials/default.nix | 0 .../flake.lock | 14 +- .../flake.nix | 0 .../gguf/default.nix | 0 .../openpose/default.nix | 0 .../openpose/openpose_no_update.patch | 0 .../tensorrt/default.nix | 0 flakes/{ComfyUI => comfyui}/default.nix | 0 flakes/{ComfyUI => comfyui}/flake.lock | 14 +- flakes/{ComfyUI => comfyui}/flake.nix | 0 .../{ComfyUI => comfyui}/folder_paths.patch | 0 flakes/{ComfyUI => comfyui}/module.nix | 1 + flakes/{ComfyUI => comfyui}/spandrel.nix | 0 flakes/murex-module-jump/flake.lock | 8 +- flakes/murex-module-starship/flake.lock | 8 +- home/bolt.nix | 17 +- home/home.nix | 8 +- home/modules/chat.nix | 2 - home/modules/cli.nix | 4 +- home/modules/creative.nix | 16 +- home/modules/documents.nix | 2 +- home/modules/niri.nix | 1 + home/programs/helix.nix | 22 +- home/programs/vscode.nix | 3 +- home/programs/xresources.nix | 1 - mullvad/au-syd-wg-001.conf | 10 - mullvad/au-syd-wg-002.conf | 10 - mullvad/au-syd-wg-003.conf | 10 - mullvad/au-syd-wg-101.conf | 10 - mullvad/au-syd-wg-102.conf | 10 - mullvad/au-syd-wg-103.conf | 10 - mullvad/au-syd-wg-104.conf | 10 - system/cachix.nix | 2 + system/configuration.nix | 22 +- system/modules/culr.nix | 4 +- system/modules/network.nix | 10 +- system/modules/nix-meta.nix | 2 +- system/quiver.nix | 36 +- util/create.nix | 40 + util/overlay.nix | 44 +- util/rice.nix | 8 + 43 files changed, 555 insertions(+), 868 deletions(-) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/essentials/default.nix (100%) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/flake.lock (79%) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/flake.nix (100%) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/gguf/default.nix (100%) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/openpose/default.nix (100%) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/openpose/openpose_no_update.patch (100%) rename flakes/{ComfyUI-Plugins => comfyui-plugins}/tensorrt/default.nix (100%) rename flakes/{ComfyUI => comfyui}/default.nix (100%) rename flakes/{ComfyUI => comfyui}/flake.lock (59%) rename flakes/{ComfyUI => comfyui}/flake.nix (100%) rename flakes/{ComfyUI => comfyui}/folder_paths.patch (100%) rename flakes/{ComfyUI => comfyui}/module.nix (98%) rename flakes/{ComfyUI => comfyui}/spandrel.nix (100%) delete mode 100644 mullvad/au-syd-wg-001.conf delete mode 100644 mullvad/au-syd-wg-002.conf delete mode 100644 mullvad/au-syd-wg-003.conf delete mode 100644 mullvad/au-syd-wg-101.conf delete mode 100644 mullvad/au-syd-wg-102.conf delete mode 100644 mullvad/au-syd-wg-103.conf delete mode 100644 mullvad/au-syd-wg-104.conf create mode 100644 util/create.nix diff --git a/flake.lock b/flake.lock index e67b3b1..cdfe240 100644 --- a/flake.lock +++ b/flake.lock @@ -3,45 +3,49 @@ "comfyui": { "inputs": { "comfyui": "comfyui_2", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1, - "narHash": "sha256-rH+15M79lD1lRR2f0xKGXanjJQgSRiCbFzIBRGPgDRY=", - "path": "./flakes/ComfyUI", + "narHash": "sha256-At2fK3rFdU3oRpXHQN1pGxlV7YHDRhhJtLrYcb70s9w=", + "path": "./flakes/comfyui", "type": "path" }, "original": { - "path": "./flakes/ComfyUI", + "path": "./flakes/comfyui", "type": "path" } }, "comfyui-plugins": { "inputs": { "gguf": "gguf", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "openpose": "openpose", "tensorrt": "tensorrt" }, "locked": { "lastModified": 1, - "narHash": "sha256-ycS39Pa74MyURwvyv91l1xCxalyIxZZSIeLO3spuWQY=", - "path": "./flakes/ComfyUI-Plugins", + "narHash": "sha256-onHw7gN3mLi4LTKersFU1aJA+gaUNWlv5WW0hAvAOfg=", + "path": "./flakes/comfyui-plugins", "type": "path" }, "original": { - "path": "./flakes/ComfyUI-Plugins", + "path": "./flakes/comfyui-plugins", "type": "path" } }, "comfyui_2": { "flake": false, "locked": { - "lastModified": 1732969631, - "narHash": "sha256-4TNU6987zvTc9Fo6CptEq7unowEQGleFNdNQPHvOspQ=", + "lastModified": 1735863648, + "narHash": "sha256-hMe8kXco8PTtOeLq0Q2+P3MbcnnShzAlOeCnY1MSuyI=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "3fc6ebcdd72272349c0d1e18ad2f2d02f2d0fe84", + "rev": "0b9839ef433572609b37d880afb427e4c9ddf151", "type": "github" }, "original": { @@ -67,11 +71,11 @@ }, "crane_2": { "locked": { - "lastModified": 1732991615, - "narHash": "sha256-CgEHGXSzUdlRI1MzsZmWUwW8+6MKYqtCBIDrD/5H5/o=", + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "owner": "ipetkov", "repo": "crane", - "rev": "da87d1af7e4e09fd0271432340a5cadf3eb96005", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "type": "github" }, "original": { @@ -80,6 +84,28 @@ "type": "github" } }, + "culr": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "ocaml-overlay": "ocaml-overlay" + }, + "locked": { + "lastModified": 1734161460, + "narHash": "sha256-SvUAmX5y1BchyEVWw8Cb9O/K5dxZzQeUjyGY14RLuwQ=", + "ref": "refs/heads/master", + "rev": "5a164045f541d720984fec81b70488308412a703", + "revCount": 67, + "type": "git", + "url": "https://git.atagen.co/atagen/culr" + }, + "original": { + "type": "git", + "url": "https://git.atagen.co/atagen/culr" + } + }, "flake-compat": { "flake": false, "locked": { @@ -114,49 +140,16 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1714606777, - "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "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-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -170,11 +163,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -220,72 +213,15 @@ } }, "flake-utils_5": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" + "inputs": { + "systems": "systems_5" }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -309,29 +245,14 @@ "type": "github" } }, - "flatpaks": { - "locked": { - "lastModified": 1733345341, - "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b", - "type": "github" - }, - "original": { - "owner": "gmodena", - "repo": "nix-flatpak", - "type": "github" - } - }, "gguf": { "flake": false, "locked": { - "lastModified": 1732341089, - "narHash": "sha256-fOGRAv42TXqM/2exNPYHH8cTy0TX6rfLlIBqBiqdQoo=", + "lastModified": 1735245753, + "narHash": "sha256-2o05HLPoFLPwj5zh/B1hHPsfZ9rbfydo/STKPXW1zkM=", "owner": "city96", "repo": "ComfyUI-GGUF", - "rev": "4a8432884167f2526d60ef36e985bdabebb9e1e0", + "rev": "3dc384b23366983b28222cbf681b808053949a43", "type": "github" }, "original": { @@ -344,7 +265,7 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -386,16 +307,16 @@ "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733358210, - "narHash": "sha256-fomGUxEZKQsF0gUEWSyfe/vocWEScjj3VFzWzzot39I=", + "lastModified": 1735850644, + "narHash": "sha256-9ZvXhg3lG28kgHqd48tW+YJV/6XSLFPCcM7GQnMgj7U=", "owner": "helix-editor", "repo": "helix", - "rev": "4c8175ca04dd18a74e8d1a5973042b89a381e3ce", + "rev": "4817bfa003163150c9a4553757b4e209e470ecbf", "type": "github" }, "original": { @@ -411,11 +332,11 @@ ] }, "locked": { - "lastModified": 1733354384, - "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -428,15 +349,15 @@ "inputs": { "crane": "crane_2", "naersk": "naersk", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1733355936, - "narHash": "sha256-G9LPJf27OTW5lMVntXow9NuVhABsxpG+DVsCBcpGlA8=", + "lastModified": 1735832785, + "narHash": "sha256-j/uzZjdGqxA1PFDuByddXzxTWkCTAZIsUSnfEui9BoI=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "13c2f8fa8b73c22553ee2cf0006958e9b4e00da3", + "rev": "998e5cecc02a66173e72f0c003a690489cc6ac07", "type": "github" }, "original": { @@ -464,11 +385,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1733254721, - "narHash": "sha256-2HjYrmwQtOTJJGzWmDf6isy8aPuHmhlDCbFN4rLkzpY=", - "rev": "473c1bdcabcb5c513ec7ff9aaa7bcd8b1cee68a5", + "lastModified": 1735572323, + "narHash": "sha256-Wjt+PK15IdaOUoI0sgsRzaNMxKQGSROLe9sOd44+fwM=", + "rev": "5c7ea4f446de58aa64f78087bb4ec26b9c4111aa", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/473c1bdcabcb5c513ec7ff9aaa7bcd8b1cee68a5.tar.gz?rev=473c1bdcabcb5c513ec7ff9aaa7bcd8b1cee68a5" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5c7ea4f446de58aa64f78087bb4ec26b9c4111aa.tar.gz?rev=5c7ea4f446de58aa64f78087bb4ec26b9c4111aa" }, "original": { "type": "tarball", @@ -477,7 +398,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -487,11 +408,11 @@ ] }, "locked": { - "lastModified": 1732603698, - "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", - "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", + "lastModified": 1733522213, + "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", + "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c374ebf5548c7b6d4bf884369a5b6879cfc916ea.tar.gz?rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea" }, "original": { "type": "tarball", @@ -515,7 +436,7 @@ }, "meat": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "lix": [ "lix" ], @@ -526,18 +447,16 @@ "nh" ], "nixpkgs": [ - "meat", - "ocaml-overlay", "nixpkgs" ], - "ocaml-overlay": "ocaml-overlay" + "ocaml-overlay": "ocaml-overlay_2" }, "locked": { - "lastModified": 1732408484, - "narHash": "sha256-TrcZ/y47Ozsq4uvqSUVO3reBH6/kzM+fmvGR4Xyje+c=", + "lastModified": 1734161475, + "narHash": "sha256-dlcFOJ6U3fGvPK5YOGtFyhOffuEqdvHU2JSjX3mOUc0=", "ref": "refs/heads/master", - "rev": "f3a64228a40ecd237f345ae1cc15c6c031739a96", - "revCount": 20, + "rev": "405c2209d939faa7bb53b517714841a5ab460c6c", + "revCount": 34, "type": "git", "url": "https://git.atagen.co/atagen/meat" }, @@ -549,11 +468,11 @@ "murex": { "flake": false, "locked": { - "lastModified": 1732661129, - "narHash": "sha256-fAuBKAfJ7X3WVRifEfR3IkslQhw2qm3mghxznzlQvco=", + "lastModified": 1734814907, + "narHash": "sha256-z3aefJXaymvChmAM9M8c41+1vfw8DxAeRqUxTKfnIOc=", "owner": "lmorg", "repo": "murex", - "rev": "8494093fa594ef9fe3e9c800f9f4b49294931cde", + "rev": "73f172495238b8c8791d6b969f8569a35fb1345d", "type": "github" }, "original": { @@ -565,12 +484,14 @@ }, "murex-jump": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "src": "src" }, "locked": { "lastModified": 1, - "narHash": "sha256-0U6FvOXSAeii6bCW9OwONwkFs8m63oK4+SCkmQ7NTgw=", + "narHash": "sha256-W/mQRiWXrSxOXEa8gVZwGTkiXheacEGIkRO0g+KYLHQ=", "path": "./flakes/murex-module-jump", "type": "path" }, @@ -581,12 +502,14 @@ }, "murex-starship": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": [ + "nixpkgs" + ], "src": "src_2" }, "locked": { "lastModified": 1, - "narHash": "sha256-8OUmNGTENHpnrTX5pyfZUtLDLooHsyEGwrI9N5c74zw=", + "narHash": "sha256-MY6rgMNdy2yGrUUPehzjYnLfFtzHJkt+hzk29nGYyiY=", "path": "./flakes/murex-module-starship", "type": "path" }, @@ -597,14 +520,14 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "lastModified": 1733346208, + "narHash": "sha256-a4WZp1xQkrnA4BbnKrzJNr+dYoQr5Xneh2syJoddFyE=", "owner": "nix-community", "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", + "rev": "378614f37a6bee5a3f2ef4f825a73d948d3ae921", "type": "github" }, "original": { @@ -615,14 +538,14 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1733130784, - "narHash": "sha256-B3PK+e717FdrQXhg53DwTPWLY458yGYsH20tYj0pgzU=", + "lastModified": 1735816258, + "narHash": "sha256-7zBiXoC43piFocq0wHvNm5KgzolCi3axD4QhWfsw4DU=", "owner": "viperML", "repo": "nh", - "rev": "83db9160f7d79c0e3af45686454853d239202e54", + "rev": "b7a857066e726dafe9c5f00a8af6ab3f25036ee1", "type": "github" }, "original": { @@ -631,21 +554,41 @@ "type": "github" } }, + "nil": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1732053863, + "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", + "owner": "oxalica", + "repo": "nil", + "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1733268356, - "narHash": "sha256-1fVGnG7Sai4Z5hXnUxRPiuFWsP9uAKCpHrd6yVeBW5Y=", + "lastModified": 1735823072, + "narHash": "sha256-wjTWcLksaiFf+6sB0DPIS2Pyt27oRS/V1qRlDuQf5Qw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e62c3c242aae3628161c2411b0fe33674d83c762", + "rev": "a8505caae4c8c308e7a954ff4ce5235c8a7ee47c", "type": "github" }, "original": { @@ -674,11 +617,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733234028, - "narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", + "lastModified": 1735820123, + "narHash": "sha256-PtFFkpsj+dLs/Anj+p3HwvRAPfTvUB6qQhz7WJD/tq0=", "owner": "YaLTeR", "repo": "niri", - "rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", + "rev": "c17d4dc050327c974535369b0b70726b269fd82b", "type": "github" }, "original": { @@ -689,14 +632,14 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -710,9 +653,9 @@ "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_9", "nixpkgs-lib": "nixpkgs-lib_2", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1729607649, @@ -728,158 +671,20 @@ "type": "github" } }, - "nixago": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixago-exts": "nixago-exts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714086354, - "narHash": "sha256-yKVQMxL9p7zCWUhnGhDzRVT8sDgHoI3V595lBK0C2YA=", - "owner": "jmgilman", - "repo": "nixago", - "rev": "5133633e9fe6b144c8e00e3b212cdbd5a173b63d", - "type": "github" - }, - "original": { - "owner": "jmgilman", - "repo": "nixago", - "type": "github" - } - }, - "nixago-exts": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixago": "nixago_2", - "nixpkgs": [ - "nixago", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1676070308, - "narHash": "sha256-QaJ65oc2l8iwQIGWUJ0EKjCeSuuCM/LqR8RauxZUUkc=", - "owner": "nix-community", - "repo": "nixago-extensions", - "rev": "e5380cb0456f4ea3c86cf94e3039eb856bf07d0b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago-extensions", - "type": "github" - } - }, - "nixago-exts_2": { - "inputs": { - "flake-utils": "flake-utils_8", - "nixago": "nixago_3", - "nixpkgs": [ - "nixago", - "nixago-exts", - "nixago", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655508669, - "narHash": "sha256-BDDdo5dZQMmwNH/GNacy33nPBnCpSIydWFPZs0kkj/g=", - "owner": "nix-community", - "repo": "nixago-extensions", - "rev": "3022a932ce109258482ecc6568c163e8d0b426aa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago-extensions", - "type": "github" - } - }, - "nixago_2": { - "inputs": { - "flake-utils": "flake-utils_7", - "nixago-exts": "nixago-exts_2", - "nixpkgs": [ - "nixago", - "nixago-exts", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1676070010, - "narHash": "sha256-iYzJIWptE1EUD8VINAg66AAMUajizg8JUYN3oBmb8no=", - "owner": "nix-community", - "repo": "nixago", - "rev": "d480ba6c0c16e2c5c0bd2122852d6a0c9ad1ed0e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "rename-config-data", - "repo": "nixago", - "type": "github" - } - }, - "nixago_3": { - "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": [ - "nixago", - "nixago-exts", - "nixago", - "nixago-exts", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655405483, - "narHash": "sha256-Crd49aZWNrpczlRTOwWGfwBMsTUoG9vlHDKQC7cx264=", - "owner": "nix-community", - "repo": "nixago", - "rev": "e6a9566c18063db5b120e69e048d3627414e327d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixd": { - "inputs": { - "flake-parts": "flake-parts_2", - "flake-root": "flake-root", - "nixpkgs": "nixpkgs_14", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1732760430, - "narHash": "sha256-HC+kuzNIL5q87s5ISeJQk3Dv8pqg8U8wDyRSBrpFeFY=", - "owner": "nix-community", - "repo": "nixd", - "rev": "f12e2f77094ac73c1b1101390c02ec5bcf69ad46", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixd", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "path" + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -909,36 +714,18 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -961,11 +748,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -977,90 +764,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1729507178, - "narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1732617236, - "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -1072,11 +780,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "path" + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "type": "github" }, "original": { "id": "nixpkgs", @@ -1085,11 +794,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -1100,78 +809,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1732359803, - "narHash": "sha256-DPGw9u0Ejy5Hkip79wWSfC1i8q+YqKYngi0AFx3Z4W8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c79f7f85262067ecdffd95234032dda50f42958", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c79f7f85262067ecdffd95234032dda50f42958", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1733016324, "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", @@ -1187,32 +824,119 @@ "type": "github" } }, - "nur": { + "nixpkgs_5": { "locked": { - "lastModified": 1733362599, - "narHash": "sha256-Sx17Rvik70fZzQtZbXVpC+uI63stkj5JLOq0cOq1ndM=", - "owner": "nix-community", - "repo": "NUR", - "rev": "9223fb5839acf2342955c532f561e912d34accdb", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "NUR", + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1729507178, + "narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", "type": "github" } }, "ocaml-overlay": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "culr", + "nixpkgs" + ] }, "locked": { - "lastModified": 1732401100, - "narHash": "sha256-eNxEkqGdyD+x3yNhJ096N7/8j8TryWA493rSmaL9jAQ=", + "lastModified": 1734156418, + "narHash": "sha256-7I6hKojqDm0Z+q9ZvDk8R5J/TfoPbprmVquwfQIzQrg=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "f6f12811924de05d921c397fad7455e0e2ee644c", + "rev": "3bd751c1d602713195432d4818b35d29c4b1dccc", + "type": "github" + }, + "original": { + "owner": "nix-ocaml", + "repo": "nix-overlays", + "type": "github" + } + }, + "ocaml-overlay_2": { + "inputs": { + "nixpkgs": [ + "meat", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734156418, + "narHash": "sha256-7I6hKojqDm0Z+q9ZvDk8R5J/TfoPbprmVquwfQIzQrg=", + "owner": "nix-ocaml", + "repo": "nix-overlays", + "rev": "3bd751c1d602713195432d4818b35d29c4b1dccc", "type": "github" }, "original": { @@ -1237,27 +961,11 @@ "type": "github" } }, - "podman": { - "flake": false, - "locked": { - "lastModified": 1733340422, - "narHash": "sha256-n7ZWSQfY+RQNKu/QGA5zA2IzngXMHEuHPStv74pFpuk=", - "owner": "containers", - "repo": "podman", - "rev": "26605568a139ff7d4a1c5d80453fc206dab317b9", - "type": "github" - }, - "original": { - "owner": "containers", - "repo": "podman", - "type": "github" - } - }, "root": { "inputs": { "comfyui": "comfyui", "comfyui-plugins": "comfyui-plugins", - "flatpaks": "flatpaks", + "culr": "culr", "helix": "helix", "home-manager": "home-manager", "ironbar": "ironbar", @@ -1269,18 +977,14 @@ "murex-jump": "murex-jump", "murex-starship": "murex-starship", "nh": "nh", + "nil": "nil", "niri": "niri", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", - "nixago": "nixago", - "nixd": "nixd", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_10", "nixpkgs-stable": "nixpkgs-stable_3", - "nur": "nur", - "podman": "podman", - "rust-overlay": "rust-overlay_3", - "sirula": "sirula", - "wrapper-manager": "wrapper-manager" + "rust-overlay": "rust-overlay_4", + "sirula": "sirula" } }, "rust-overlay": { @@ -1312,11 +1016,11 @@ ] }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1735612067, + "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", "type": "github" }, "original": { @@ -1328,15 +1032,36 @@ "rust-overlay_3": { "inputs": { "nixpkgs": [ + "nil", "nixpkgs" ] }, "locked": { - "lastModified": 1733279627, - "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", + "lastModified": 1731983527, + "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", + "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735871325, + "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a599f011db521766cbaf7c2f5874182485554f00", "type": "github" }, "original": { @@ -1348,15 +1073,15 @@ "sirula": { "flake": false, "locked": { - "lastModified": 1724260121, - "narHash": "sha256-Bp0D4OPDmqil4O6HK2kj8HD5rQAhGqUtvQwwPHD0wIA=", - "owner": "jlo62", + "lastModified": 1734194271, + "narHash": "sha256-rBaH2cIIaRoaw8Os60s4MknZywzDuGLagJiAvEYU4m8=", + "owner": "DorianRudolph", "repo": "sirula", - "rev": "c5afda153ae9279c8b55046ba9594705a4bd3c8a", + "rev": "f4da8f5fe50c367e7684334c31ec65fc0fe6997c", "type": "github" }, "original": { - "owner": "jlo62", + "owner": "DorianRudolph", "repo": "sirula", "type": "github" } @@ -1468,6 +1193,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tensorrt": { "flake": false, "locked": { @@ -1484,47 +1224,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "wrapper-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724503599, - "narHash": "sha256-WVhNq3QjnG/2mi772CkTxZCQcomKV5S03TbQKwe1Kj4=", - "owner": "viperML", - "repo": "wrapper-manager", - "rev": "c936f9203217e654a6074d206505c16432edbc70", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "wrapper-manager", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -1545,11 +1244,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1732233710, - "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e1d3fca..2334e0b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; - nur.url = "github:/nix-community/NUR"; - rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,7 +21,8 @@ nix-rice.url = "github:bertof/nix-rice"; - nixd.url = "github:nix-community/nixd"; + # nixd.url = "github:nix-community/nixd"; + nil.url = "github:oxalica/nil"; madness.url = "github:antithesishq/madness"; @@ -45,16 +44,22 @@ inputs.lix.follows = "lix"; inputs.lix-module.follows = "lix-module"; inputs.nh.follows = "nh"; + inputs.nixpkgs.follows = "nixpkgs"; }; - culr.url = "git+https://git.atagen.co/atagen/culr"; + culr = { + url = "git+https://git.atagen.co/atagen/culr"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - comfyui.url = "path:./flakes/ComfyUI"; - comfyui-plugins.url = "path:./flakes/ComfyUI-Plugins"; + comfyui = { + url = "path:./flakes/comfyui"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - podman = { - flake = false; - url = "github:containers/podman"; + comfyui-plugins = { + url = "path:./flakes/comfyui-plugins"; + inputs.nixpkgs.follows = "nixpkgs"; }; murex = { @@ -62,36 +67,47 @@ flake = false; }; - murex-jump.url = "path:./flakes/murex-module-jump"; - murex-starship.url = "path:./flakes/murex-module-starship"; + murex-jump = { + url = "path:./flakes/murex-module-jump"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - niri.url = "github:sodiboo/niri-flake"; + murex-starship = { + url = "path:./flakes/murex-module-starship"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + niri = { + url = "github:sodiboo/niri-flake"; + }; ironbar.url = "github:JakeStanger/ironbar"; sirula = { - url = "github:jlo62/sirula"; + url = "github:DorianRudolph/sirula"; flake = false; }; - nixago = { - url = "github:jmgilman/nixago"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # hjem = { + # url = "github:feel-co/hjem"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; - wrapper-manager = { - url = "github:viperML/wrapper-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + # nixago = { + # url = "github:jmgilman/nixago"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + + # wrapper-manager = { + # url = "github:viperML/wrapper-manager"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = { self, nixpkgs, home-manager, - nur, - flatpaks, nix-index-database, madness, meat, @@ -100,54 +116,25 @@ ... } @ inputs: let inherit (self) outputs; - inherit (nixpkgs) lib; - inherit (lib) mapAttrs; - sharedModules = [ - meat.nixosModules.meat - culr.nixosModules.culr - madness.nixosModules.madness - nur.nixosModules.nur - nix-index-database.nixosModules.nix-index - niri.nixosModules.niri - ./system/cachix.nix - ]; - system = "x86_64-linux"; - createSystems = definitions: - mapAttrs (name: info: - nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { - inherit inputs outputs; - mainUser = info.user; - }; - modules = - [ - ./system/${name}.nix - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - extraSpecialArgs = { - inherit inputs outputs; - mainUser = info.user; - }; - users.${info.user}.imports = - [ - flatpaks.homeManagerModules.nix-flatpak - ./home/${info.user}.nix - ] - ++ info.hmImports or []; - }; - } - ] - ++ info.imports or [] - ++ sharedModules; - }) - definitions; + create = import ./util/create.nix { + inherit nixpkgs home-manager inputs outputs; + system = "x86_64-linux"; + sharedModules = [ + culr.nixosModules.culr + meat.nixosModules.meat + madness.nixosModules.madness + niri.nixosModules.niri + nix-index-database.nixosModules.nix-index + ./system/cachix.nix + ]; + }; in { - overlays = import ./util/overlay.nix {inherit inputs;}; + overlays = import ./util/overlay.nix { + inherit inputs; + inherit (nixpkgs) lib; + }; - nixosConfigurations = createSystems { + nixosConfigurations = create.systems { quiver.user = "bolt"; adrift.user = "plank"; }; diff --git a/flakes/ComfyUI-Plugins/essentials/default.nix b/flakes/comfyui-plugins/essentials/default.nix similarity index 100% rename from flakes/ComfyUI-Plugins/essentials/default.nix rename to flakes/comfyui-plugins/essentials/default.nix diff --git a/flakes/ComfyUI-Plugins/flake.lock b/flakes/comfyui-plugins/flake.lock similarity index 79% rename from flakes/ComfyUI-Plugins/flake.lock rename to flakes/comfyui-plugins/flake.lock index fee8a2f..275e8d8 100644 --- a/flakes/ComfyUI-Plugins/flake.lock +++ b/flakes/comfyui-plugins/flake.lock @@ -3,11 +3,11 @@ "gguf": { "flake": false, "locked": { - "lastModified": 1732341089, - "narHash": "sha256-fOGRAv42TXqM/2exNPYHH8cTy0TX6rfLlIBqBiqdQoo=", + "lastModified": 1735245753, + "narHash": "sha256-2o05HLPoFLPwj5zh/B1hHPsfZ9rbfydo/STKPXW1zkM=", "owner": "city96", "repo": "ComfyUI-GGUF", - "rev": "4a8432884167f2526d60ef36e985bdabebb9e1e0", + "rev": "3dc384b23366983b28222cbf681b808053949a43", "type": "github" }, "original": { @@ -18,10 +18,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "path": "/nix/store/8vz84mqgnm1gz5yk7hgnnb5gir5hjxas-source", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "path" }, "original": { diff --git a/flakes/ComfyUI-Plugins/flake.nix b/flakes/comfyui-plugins/flake.nix similarity index 100% rename from flakes/ComfyUI-Plugins/flake.nix rename to flakes/comfyui-plugins/flake.nix diff --git a/flakes/ComfyUI-Plugins/gguf/default.nix b/flakes/comfyui-plugins/gguf/default.nix similarity index 100% rename from flakes/ComfyUI-Plugins/gguf/default.nix rename to flakes/comfyui-plugins/gguf/default.nix diff --git a/flakes/ComfyUI-Plugins/openpose/default.nix b/flakes/comfyui-plugins/openpose/default.nix similarity index 100% rename from flakes/ComfyUI-Plugins/openpose/default.nix rename to flakes/comfyui-plugins/openpose/default.nix diff --git a/flakes/ComfyUI-Plugins/openpose/openpose_no_update.patch b/flakes/comfyui-plugins/openpose/openpose_no_update.patch similarity index 100% rename from flakes/ComfyUI-Plugins/openpose/openpose_no_update.patch rename to flakes/comfyui-plugins/openpose/openpose_no_update.patch diff --git a/flakes/ComfyUI-Plugins/tensorrt/default.nix b/flakes/comfyui-plugins/tensorrt/default.nix similarity index 100% rename from flakes/ComfyUI-Plugins/tensorrt/default.nix rename to flakes/comfyui-plugins/tensorrt/default.nix diff --git a/flakes/ComfyUI/default.nix b/flakes/comfyui/default.nix similarity index 100% rename from flakes/ComfyUI/default.nix rename to flakes/comfyui/default.nix diff --git a/flakes/ComfyUI/flake.lock b/flakes/comfyui/flake.lock similarity index 59% rename from flakes/ComfyUI/flake.lock rename to flakes/comfyui/flake.lock index ce6de06..7defbcd 100644 --- a/flakes/ComfyUI/flake.lock +++ b/flakes/comfyui/flake.lock @@ -3,11 +3,11 @@ "comfyui": { "flake": false, "locked": { - "lastModified": 1732969631, - "narHash": "sha256-4TNU6987zvTc9Fo6CptEq7unowEQGleFNdNQPHvOspQ=", + "lastModified": 1735863648, + "narHash": "sha256-hMe8kXco8PTtOeLq0Q2+P3MbcnnShzAlOeCnY1MSuyI=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "3fc6ebcdd72272349c0d1e18ad2f2d02f2d0fe84", + "rev": "0b9839ef433572609b37d880afb427e4c9ddf151", "type": "github" }, "original": { @@ -18,10 +18,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "path": "/nix/store/8vz84mqgnm1gz5yk7hgnnb5gir5hjxas-source", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "path" }, "original": { diff --git a/flakes/ComfyUI/flake.nix b/flakes/comfyui/flake.nix similarity index 100% rename from flakes/ComfyUI/flake.nix rename to flakes/comfyui/flake.nix diff --git a/flakes/ComfyUI/folder_paths.patch b/flakes/comfyui/folder_paths.patch similarity index 100% rename from flakes/ComfyUI/folder_paths.patch rename to flakes/comfyui/folder_paths.patch diff --git a/flakes/ComfyUI/module.nix b/flakes/comfyui/module.nix similarity index 98% rename from flakes/ComfyUI/module.nix rename to flakes/comfyui/module.nix index c7d691b..ff81ee7 100644 --- a/flakes/ComfyUI/module.nix +++ b/flakes/comfyui/module.nix @@ -21,6 +21,7 @@ in { plugins = mkOption { type = with types; listOf package; description = "list of comfyui plugins"; + default = []; }; }; config = lib.mkIf cfg.enable { diff --git a/flakes/ComfyUI/spandrel.nix b/flakes/comfyui/spandrel.nix similarity index 100% rename from flakes/ComfyUI/spandrel.nix rename to flakes/comfyui/spandrel.nix diff --git a/flakes/murex-module-jump/flake.lock b/flakes/murex-module-jump/flake.lock index 38fce2d..a06a341 100644 --- a/flakes/murex-module-jump/flake.lock +++ b/flakes/murex-module-jump/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "path": "/nix/store/8vz84mqgnm1gz5yk7hgnnb5gir5hjxas-source", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "path" }, "original": { diff --git a/flakes/murex-module-starship/flake.lock b/flakes/murex-module-starship/flake.lock index 9145a57..3a69f1b 100644 --- a/flakes/murex-module-starship/flake.lock +++ b/flakes/murex-module-starship/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "path": "/nix/store/8vz84mqgnm1gz5yk7hgnnb5gir5hjxas-source", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "path" }, "original": { diff --git a/home/bolt.nix b/home/bolt.nix index 28e1cf6..7d9e05f 100644 --- a/home/bolt.nix +++ b/home/bolt.nix @@ -23,14 +23,15 @@ ]; programs.comfyui = { - enable = true; + enable = false; storage = "/home/${config.mainUser}/.local/share/comfyui/"; - plugins = let - inherit (pkgs.comfyui-plugins) gguf openpose; - in [ - gguf - # essentials - openpose - ]; + plugins = []; + # plugins = let + # inherit (pkgs.comfyui-plugins) gguf openpose; + # in [ + # gguf + # # essentials + # openpose + # ]; }; } diff --git a/home/home.nix b/home/home.nix index 4b46bf5..eeafffc 100644 --- a/home/home.nix +++ b/home/home.nix @@ -15,7 +15,6 @@ in { ./modules/theming.nix ./modules/niri.nix ./util/ez.nix - ./util/flatpak.nix ./util/murex.nix ./util/name.nix inputs.nix-index-database.hmModules.nix-index @@ -50,10 +49,11 @@ in { }; home.packages = let - inherit (pkgs.rice) icons fonts; + inherit (pkgs.rice) icons fonts cursor; in fonts.pkgs - ++ icons.pkgs; + ++ icons.pkgs + ++ [cursor.package]; systemd.user.targets.tray = { Unit = { @@ -91,6 +91,6 @@ in { systemd.user.startServices = "sd-switch"; ezServices = { - ckb-next = "${getExe inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next} -c -b"; + ckb-next = "${getExe pkgs.ckb-next} -c -b"; }; } diff --git a/home/modules/chat.nix b/home/modules/chat.nix index d51c654..54cee7a 100644 --- a/home/modules/chat.nix +++ b/home/modules/chat.nix @@ -1,7 +1,6 @@ {config, ...}: { imports = [ ../util/firefox-webapp.nix - ../util/flatpak.nix ]; programs.firefox.webapps = { "Microsoft-Teams" = { @@ -19,5 +18,4 @@ icon = ../icons/fb_msg.png; }; }; - # flatpaks = ["im.riot.Riot"]; } diff --git a/home/modules/cli.nix b/home/modules/cli.nix index 7f0e96b..e1d8730 100644 --- a/home/modules/cli.nix +++ b/home/modules/cli.nix @@ -2,9 +2,9 @@ imports = [ ../programs/kitty.nix ../programs/zsh.nix - ../programs/xresources.nix + # ../programs/xresources.nix ../programs/helix.nix - ../programs/atuin.nix + # ../programs/atuin.nix ../programs/murex.nix ]; home.packages = with pkgs; [ diff --git a/home/modules/creative.nix b/home/modules/creative.nix index d77b93d..2321f10 100644 --- a/home/modules/creative.nix +++ b/home/modules/creative.nix @@ -1,10 +1,10 @@ {...}: { - imports = [ - ../util/flatpak.nix - ]; - flatpaks = [ - "ar.com.tuxguitar.TuxGuitar" - "org.inkscape.Inkscape" - "com.github.PintaProject.Pinta" - ]; + # imports = [ + # ../util/flatpak.nix + # ]; + # flatpaks = [ + # "ar.com.tuxguitar.TuxGuitar" + # "org.inkscape.Inkscape" + # "com.github.PintaProject.Pinta" + # ]; } diff --git a/home/modules/documents.nix b/home/modules/documents.nix index 2af436c..72145eb 100644 --- a/home/modules/documents.nix +++ b/home/modules/documents.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { imports = [ - ../util/flatpak.nix + # ../util/flatpak.nix ]; # home.packages = with pkgs; [ # libreoffice diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 488db42..62221bc 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -127,6 +127,7 @@ in { hide-after-inactive-ms = 5000; hide-when-typing = true; size = 16; + theme = pkgs.rice.cursor.name; }; layout = { always-center-single-column = true; diff --git a/home/programs/helix.nix b/home/programs/helix.nix index 8936848..a2e814c 100644 --- a/home/programs/helix.nix +++ b/home/programs/helix.nix @@ -157,22 +157,6 @@ in { # theme = "nix-rice" - # [editor] - # bufferline = "multiple" - # cursorline = true - # true-color = true - - # [editor.cursor-shape] - # insert = "bar" - # normal = "block" - # select = "underline" - - # [editor.lsp] - # display-messages = true - - # [editor.statusline] - # left = ["mode", "spinner", "version-control", "file-name", "file-modification-indicator"] - settings = { theme = "nix-rice"; editor = { @@ -206,7 +190,7 @@ in { } { name = "nix"; - language-servers = ["nixd"]; + language-servers = ["nil"]; file-types = ["nix"]; # auto-format = true; formatter = { @@ -216,8 +200,8 @@ in { ]; language-server = { - nixd = { - command = "nixd"; + nil = { + command = "nil"; }; rust-analyzer = { diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix index 3119bbb..9006f5c 100644 --- a/home/programs/vscode.nix +++ b/home/programs/vscode.nix @@ -17,11 +17,12 @@ "editor.fontFamily" = "${pkgs.rice.fonts.monospace.name}"; "editor.fontSize" = 12; "workbench.colorTheme" = "KanagawaTheme"; - "rust-analyzer.check.overrideCommand" = ["clippy"]; "rust-analyzer.debug.engine" = "vadimcn.vscode-lldb"; "rust-analyzer.inlayHints.chainingHints.enable" = false; "rust-analyzer.inlayHints.parameterHints.enable" = false; "rust-analyzer.inlayHints.typeHints.enable" = false; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nil"; }; }; } diff --git a/home/programs/xresources.nix b/home/programs/xresources.nix index 6229d99..faa10cd 100644 --- a/home/programs/xresources.nix +++ b/home/programs/xresources.nix @@ -13,7 +13,6 @@ in { }; home.packages = with pkgs; [ xorg.xrdb - culr ]; xresources.properties = with palette-hex; { "*.foreground" = util.fg; diff --git a/mullvad/au-syd-wg-001.conf b/mullvad/au-syd-wg-001.conf deleted file mode 100644 index 55f3731..0000000 --- a/mullvad/au-syd-wg-001.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = 4JpfHBvthTFOhCK0f5HAbzLXAVcB97uAkuLx7E8kqW0= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 146.70.200.2:51820 \ No newline at end of file diff --git a/mullvad/au-syd-wg-002.conf b/mullvad/au-syd-wg-002.conf deleted file mode 100644 index d05605f..0000000 --- a/mullvad/au-syd-wg-002.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = lUeDAOy+iAhZDuz5+6zh0Co8wZcs3ahdu2jfqQoDW3E= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 146.70.141.194:51820 \ No newline at end of file diff --git a/mullvad/au-syd-wg-003.conf b/mullvad/au-syd-wg-003.conf deleted file mode 100644 index 576160e..0000000 --- a/mullvad/au-syd-wg-003.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 146.70.200.194:51820 \ No newline at end of file diff --git a/mullvad/au-syd-wg-101.conf b/mullvad/au-syd-wg-101.conf deleted file mode 100644 index 2adc148..0000000 --- a/mullvad/au-syd-wg-101.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = NKP4jSvSDZg5HJ3JxpGYMxIYt7QzoxSFrU2F0m1ZxwA= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 103.136.147.3:51820 \ No newline at end of file diff --git a/mullvad/au-syd-wg-102.conf b/mullvad/au-syd-wg-102.conf deleted file mode 100644 index f8ffe42..0000000 --- a/mullvad/au-syd-wg-102.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = w825smx7YI9/SrwSYGdsuwD1Qt5UsS/CyaGTjwSYljU= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 103.136.147.65:51820 \ No newline at end of file diff --git a/mullvad/au-syd-wg-103.conf b/mullvad/au-syd-wg-103.conf deleted file mode 100644 index f96f62f..0000000 --- a/mullvad/au-syd-wg-103.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = poOHsF6v91yURxDrNe/P/adyNUqsRGzhFIioyBYUPww= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 103.136.147.129:51820 \ No newline at end of file diff --git a/mullvad/au-syd-wg-104.conf b/mullvad/au-syd-wg-104.conf deleted file mode 100644 index ea63cfb..0000000 --- a/mullvad/au-syd-wg-104.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Interface] -# Device: Deep Cat -PrivateKey = MCWyrdXm37YlzX8BhmP3qPleVJEVlBmAPD7Yt6aWO3M= -Address = 10.73.2.12/32,fc00:bbbb:bbbb:bb01::a:20b/128 -DNS = 10.64.0.1 - -[Peer] -PublicKey = 61Ovy3ObuHqllZK/P/5cOWZnY26SY2csmjzVK1q+fFs= -AllowedIPs = 0.0.0.0/0,::0/0 -Endpoint = 103.136.147.197:51820 \ No newline at end of file diff --git a/system/cachix.nix b/system/cachix.nix index 77e69b3..e5b5af1 100644 --- a/system/cachix.nix +++ b/system/cachix.nix @@ -19,6 +19,7 @@ in { "https://cache.garnix.io" "https://walker-git.cachix.org" "https://anmonteiro.nix-cache.workers.dev" + "https://viperml.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" @@ -28,6 +29,7 @@ in { "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=" + "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8=" ]; }; } diff --git a/system/configuration.nix b/system/configuration.nix index 6087167..f25b90d 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -5,22 +5,25 @@ pkgs, mainUser, ... -}: { +}: let + getFlakePackage = package: inputs."${package}".packages.x86_64-linux.default; +in { # these settings propagate to home-manager's nixpkgs nixpkgs = { overlays = [ inputs.nix-rice.overlays.default inputs.helix.overlays.default - inputs.nixd.overlays.default + inputs.nil.overlays.nil + # inputs.nixd.overlays.default inputs.niri.overlays.niri - outputs.overlays.additions + # outputs.overlays.additions outputs.overlays.rice outputs.overlays.murex outputs.overlays.murex-starship outputs.overlays.murex-jump outputs.overlays.comfyui outputs.overlays.comfyui-plugins - outputs.overlays.sirula + # outputs.overlays.sirula ]; config = { allowUnfree = true; @@ -55,8 +58,14 @@ ./modules/nix-meta.nix ./modules/anal-retentive.nix ./modules/niri.nix + ./modules/culr.nix ]; + programs.meat = { + enable = true; + flake = "/home/${mainUser}/.nix"; + }; + hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; @@ -102,15 +111,16 @@ eza git jujutsu + nil ]; - services.atuin.enable = true; + # services.atuin.enable = true; programs.nh = { enable = true; clean.enable = true; clean.extraArgs = "--keep-since 3d --keep 3"; - package = inputs.nh.packages.x86_64-linux.default; + package = getFlakePackage "nh"; }; programs.nix-index-database.comma.enable = true; diff --git a/system/modules/culr.nix b/system/modules/culr.nix index 9d66041..8f80fc7 100644 --- a/system/modules/culr.nix +++ b/system/modules/culr.nix @@ -1,6 +1,6 @@ {...}: { - programs.meat = { + programs.culr = { enable = true; - pattern = "rainbow-pair"; + pattern = "rainbow-split"; }; } diff --git a/system/modules/network.nix b/system/modules/network.nix index 1b3e19a..04893dd 100644 --- a/system/modules/network.nix +++ b/system/modules/network.nix @@ -1,7 +1,7 @@ -{...}: { - imports = [ - ./mullvad.nix - ]; +{pkgs,...}: { + # imports = [ + # ./mullvad.nix + # ]; networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. systemd.services.NetworkManager-wait-online.enable = true; # for some reason nm doesn't enable without this services.resolved = { @@ -9,7 +9,7 @@ fallbackDns = ["103.1.206.179" "168.138.8.38" "168.138.12.137"]; dnssec = "false"; }; - # services.mullvad-vpn.enable = true; + services.mullvad-vpn.enable = true; # systemd.services.mullvad-daemon.environment.TALPID_NET_CLS_MOUNT_DIR = "/opt/net-cls-v1"; networking.firewall = { checkReversePath = "loose"; diff --git a/system/modules/nix-meta.nix b/system/modules/nix-meta.nix index 23046c1..9e4a3d4 100644 --- a/system/modules/nix-meta.nix +++ b/system/modules/nix-meta.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - nixd + # nixd home-manager cachix alejandra diff --git a/system/quiver.nix b/system/quiver.nix index 6802ebd..e502826 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -24,17 +24,12 @@ ]; }; - programs.meat = { - enable = true; - flake = "/home/bolt/.nix"; - }; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbcore" "sd_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-amd" "i2c-dev"]; boot.kernelParams = [ "mitigations=off" - "acpi_enforce_resources=lax" + # "acpi_enforce_resources=lax" "preempt=full" "quiet" "loglevel=3" @@ -61,7 +56,7 @@ environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"]; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5"; + # ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5"; GBM_BACKEND = "nvidia-drm"; NVD_BACKEND = "direct"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; @@ -73,6 +68,10 @@ nix.settings.trusted-users = ["bolt"]; + virtualisation.lxc = { + unprivilegedContainers = true; + enable = true; + }; virtualisation.oci-containers.backend = "podman"; hardware.nvidia-container-toolkit.enable = true; virtualisation = { @@ -80,10 +79,6 @@ enable = true; dockerSocket.enable = true; defaultNetwork.settings.dns_enabled = true; - # package = pkgs.podman.overrideAttrs { - # version = "5.3.0-dev"; - # src = inputs.podman; - # }; }; }; @@ -103,7 +98,7 @@ # description = "rgb led turn-off-er"; # serviceConfig = { # Type = "oneshot"; - # ExecStart = ''${pkgs.openrgb}/bin/openrgb -d "HyperX Fury RGB" -m static -c 000000''; + # ExecStart = ''${pkgs.openrgb}/bin/openrgb -d "HyperX DRAM" -m static -c 000000''; # After = ["openrgb"]; # }; # }; @@ -113,16 +108,19 @@ # motherboard = "amd"; # }; - hardware.ckb-next= { + hardware.ckb-next = { enable = true; - package = inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next; + # package = inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next; }; - environment.systemPackages = with pkgs; [ - wl-clipboard - wl-clipboard-x11 - xclip - ]; + environment.systemPackages = builtins.attrValues { + inherit + (pkgs) + wl-clipboard + wl-clipboard-x11 + xclip + ; + }; fileSystems = { "/" = { diff --git a/util/create.nix b/util/create.nix new file mode 100644 index 0000000..8125a32 --- /dev/null +++ b/util/create.nix @@ -0,0 +1,40 @@ +{ + nixpkgs, + home-manager, + system, + inputs, + outputs, + sharedModules, + ... +}: { + systems = definitions: + nixpkgs.lib.mapAttrs (name: info: + nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { + inherit inputs outputs; + mainUser = info.user; + }; + modules = + [ + ../system/${name}.nix + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + extraSpecialArgs = { + inherit inputs outputs; + mainUser = info.user; + }; + users.${info.user}.imports = + [ + ../home/${info.user}.nix + ] + ++ info.hmImports or []; + }; + } + ] + ++ info.imports or [] + ++ sharedModules; + }) definitions; +} diff --git a/util/overlay.nix b/util/overlay.nix index 274d467..94c6a02 100644 --- a/util/overlay.nix +++ b/util/overlay.nix @@ -1,5 +1,8 @@ -{inputs, ...}: { - additions = final: _prev: import ../.old/pkgs {pkgs = final;}; +{ + inputs, + lib, + ... +}: { rice = import ./rice.nix; murex-jump = inputs.murex-jump.overlays.murex-jump; murex-starship = inputs.murex-starship.overlays.murex-starship; @@ -12,10 +15,35 @@ vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE="; }; }; - sirula = final: prev: { - sirula = prev.sirula.overrideAttrs { - version = "1.0.0-${builtins.toString inputs.sirula.lastModifiedDate}"; - src = inputs.sirula; - }; - }; + # sirula = let + # src = inputs.sirula; + # in + # final: prev: { + # sirula = + # (prev.sirula.override (old: { + # rustPlatform = + # old.rustPlatform + # // { + # buildRustPackage = args: + # old.rustPlatform.buildRustPackage (args + # // { + # inherit src; + # cargoHash = prev.lib.fakeHash; + # cargoSha256 = prev.lib.fakeHash; + # cargoLock = { + # lockFile = "${inputs.sirula}" + /Cargo.lock; + # }; + # }); + # }; + # })) + # .overrideAttrs (oldAttrs: { + # version = "1.0.0-${builtins.toString inputs.sirula.lastModifiedDate}"; + # inherit src; + # cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const { + # inherit src; + # outputHash = prev.lib.fakeHash; + # outputHashMode = "recursive"; + # }); + # }); + # }; } diff --git a/util/rice.nix b/util/rice.nix index c5bfede..5f4befd 100644 --- a/util/rice.nix +++ b/util/rice.nix @@ -102,6 +102,14 @@ in { }; }; + cursor = { + package = prev.afterglow-cursors-recolored.override { + themeVariants = ["Dracula"]; + draculaColorVariants = ["Orange"]; + }; + name = "Afterglow-Recolored-Dracula-Orange"; + }; + plymouth = { # no easy way to automate filename sadly - could try stripping "real" font name of spaces? font = "${fonts.sans.package}/share/fonts/truetype/InriaSans-Regular.ttf";