diff --git a/flake.lock b/flake.lock index 8a6e9eb..5849dfd 100644 --- a/flake.lock +++ b/flake.lock @@ -23,30 +23,6 @@ "type": "github" } }, - "agenix_2": { - "inputs": { - "darwin": "darwin_2", - "home-manager": "home-manager_2", - "nixpkgs": [ - "depot", - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", - "owner": "ryantm", - "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "attic": { "inputs": { "crane": "crane", @@ -71,55 +47,6 @@ "type": "github" } }, - "attic_2": { - "inputs": { - "crane": "crane_2", - "flake-compat": [ - "depot", - "blank" - ], - "flake-utils": [ - "depot", - "repin-flake-utils" - ], - "nixpkgs": [ - "depot", - "nixpkgs" - ], - "nixpkgs-stable": [ - "depot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707922053, - "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -142,28 +69,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "depot", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { "inputs": { "nixpkgs": [ "helix", @@ -184,7 +89,7 @@ "type": "github" } }, - "crane_4": { + "crane_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -227,29 +132,6 @@ "type": "github" } }, - "darwin_2": { - "inputs": { - "nixpkgs": [ - "depot", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat_2", @@ -272,65 +154,6 @@ "type": "github" } }, - "depot": { - "inputs": { - "agenix": "agenix_2", - "attic": "attic_2", - "blank": "blank", - "devshell": "devshell", - "drv-parts": "drv-parts", - "flake-parts": "flake-parts", - "hercules-ci-agent": "hercules-ci-agent", - "hercules-ci-effects": "hercules-ci-effects", - "mms": "mms", - "nar-serve": "nar-serve", - "nix-filter": "nix-filter", - "nix-super": "nix-super", - "nixpkgs": "nixpkgs_2", - "repin-flake-utils": "repin-flake-utils", - "systems": "systems_4" - }, - "locked": { - "host": "git.privatevoid.net", - "lastModified": 1713908099, - "narHash": "sha256-zL40fNj+xNV+8/HGKfyIUa3ZgSchO9XFmHD7IsEn4qM=", - "owner": "private-void", - "repo": "depot", - "rev": "7929c28b7d5ecfdc7f236060b9b554a0d655da31", - "type": "gitlab" - }, - "original": { - "host": "git.privatevoid.net", - "owner": "private-void", - "repo": "depot", - "type": "gitlab" - } - }, - "devshell": { - "inputs": { - "flake-utils": [ - "depot", - "repin-flake-utils" - ], - "nixpkgs": [ - "depot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", - "owner": "numtide", - "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { "nixpkgs": [ @@ -353,32 +176,6 @@ "type": "github" } }, - "drv-parts": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": [ - "depot", - "flake-parts" - ], - "nixpkgs": [ - "depot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690881582, - "narHash": "sha256-DKJucaTOmnsJV3ZC68yzpyMb+OHWCDT9Z2fB2GPErck=", - "owner": "DavHau", - "repo": "drv-parts", - "rev": "77bbde0616b445e06c8ad4621643983250e0e4f1", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "drv-parts", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -414,11 +211,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -443,51 +240,19 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ - "depot", + "hyprspace", "nixpkgs" ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -637,7 +402,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_3" }, "locked": { "lastModified": 1709126324, @@ -655,7 +420,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -673,7 +438,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -742,25 +507,9 @@ "type": "github" } }, - "haskell-flake_2": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, "helix": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -782,33 +531,10 @@ } }, "hercules-ci-agent": { - "inputs": { - "flake-parts": [ - "depot", - "flake-parts" - ], - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1708547903, - "narHash": "sha256-7FXt8lznqCO8w3c0YFcq1slwueqEb73n/yeTai0gSpc=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "fa0a146c8711761606f01f06be7018696e419438", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "type": "github" - } - }, - "hercules-ci-agent_2": { "inputs": { "flake-parts": "flake-parts_6", - "haskell-flake": "haskell-flake_2", - "nixpkgs": "nixpkgs_4" + "haskell-flake": "haskell-flake", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1686721748, @@ -824,34 +550,9 @@ } }, "hercules-ci-effects": { - "inputs": { - "flake-parts": [ - "depot", - "flake-parts" - ], - "nixpkgs": [ - "depot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708547820, - "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "hercules-ci-effects_2": { "inputs": { "flake-parts": "flake-parts_5", - "hercules-ci-agent": "hercules-ci-agent_2", + "hercules-ci-agent": "hercules-ci-agent", "nixpkgs": [ "nixified-ai", "nixpkgs" @@ -871,7 +572,7 @@ "type": "github" } }, - "hercules-ci-effects_3": { + "hercules-ci-effects_2": { "inputs": { "flake-parts": [ "nixpak", @@ -918,28 +619,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "depot", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -960,6 +639,27 @@ "type": "github" } }, + "hyprspace": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714691324, + "narHash": "sha256-7LZk0yXj3Rpk4Fq43I9j03fQKOAcz7PMs6JvzMlO0pM=", + "owner": "privatevoid-net", + "repo": "hyprspace", + "rev": "2e6d5c401cb813b940aecb41accda4b6969bed20", + "type": "github" + }, + "original": { + "owner": "privatevoid-net", + "repo": "hyprspace", + "type": "github" + } + }, "invokeai-src": { "flake": false, "locked": { @@ -995,8 +695,8 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_5", + "crane": "crane_3", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_3", "nixpkgs": [ @@ -1035,97 +735,6 @@ "type": "github" } }, - "libgit2_2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "mms": { - "inputs": { - "flake-compat": [ - "depot", - "blank" - ], - "flake-utils": [ - "depot", - "repin-flake-utils" - ], - "nix": [ - "depot", - "nix-super" - ], - "nixpkgs": [ - "depot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669478601, - "narHash": "sha256-IQcS8IPeXvSoIrQRPgtnLxAs0Pkh8wmglDAtqE4ivNo=", - "owner": "mkaito", - "repo": "nixos-modded-minecraft-servers", - "rev": "68f2066499c035fd81c9dacfea2f512d6b0b62e5", - "type": "github" - }, - "original": { - "owner": "mkaito", - "repo": "nixos-modded-minecraft-servers", - "type": "github" - } - }, - "nar-serve": { - "inputs": { - "flake-utils": [ - "depot", - "repin-flake-utils" - ], - "nixpkgs": [ - "depot", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1626443268, - "narHash": "sha256-LAsxgaWKTxOVZVpNrUG9ZrHMnzNMKKxKciVitxdgylE=", - "owner": "numtide", - "repo": "nar-serve", - "rev": "84a77d8ab3ddec9d8090d2f0bc6718484e2d94ea", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "v0.5.0", - "repo": "nar-serve", - "type": "github" - } - }, "nil": { "inputs": { "flake-utils": "flake-utils_4", @@ -1168,57 +777,12 @@ "url": "https://git.privatevoid.net/max/nix-crx.git" } }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-super": { "inputs": { "flake-compat": "flake-compat_4", - "libgit2": "libgit2", - "lowdown-src": "lowdown-src", - "nixpkgs": [ - "depot", - "nixpkgs" - ], - "nixpkgs-regression": [ - "depot", - "blank" - ] - }, - "locked": { - "host": "git.privatevoid.net", - "lastModified": 1701958654, - "narHash": "sha256-ZhXujNwvwTDLmCpYb7h2bTDdZG4h97hEYjzBmKP8p2U=", - "owner": "max", - "repo": "nix-super", - "rev": "661b025c79eac08beda593ede47b41b2052e8ebf", - "type": "gitlab" - }, - "original": { - "host": "git.privatevoid.net", - "owner": "max", - "repo": "nix-super", - "type": "gitlab" - } - }, - "nix-super_2": { - "inputs": { - "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "libgit2": "libgit2_2", - "nixpkgs": "nixpkgs_3", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" }, @@ -1241,9 +805,9 @@ "nixified-ai": { "inputs": { "flake-parts": "flake-parts_4", - "hercules-ci-effects": "hercules-ci-effects_2", + "hercules-ci-effects": "hercules-ci-effects", "invokeai-src": "invokeai-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "textgen-src": "textgen-src" }, "locked": { @@ -1280,7 +844,7 @@ "nixpak": { "inputs": { "flake-parts": "flake-parts_7", - "hercules-ci-effects": "hercules-ci-effects_3", + "hercules-ci-effects": "hercules-ci-effects_2", "nixpkgs": [ "nixpkgs" ] @@ -1301,16 +865,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -1382,38 +946,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1708541170, - "narHash": "sha256-WzeyGUHjvDlVWTw0q03O3WaQevZzjk7gRWQ6RdlCnE4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e6d61b7214a8df4fa5a0e3d76506f12689585bab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1686501370, "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", @@ -1429,7 +961,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1697059129, "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", @@ -1445,7 +977,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1713895582, "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", @@ -1563,45 +1095,24 @@ "type": "github" } }, - "repin-flake-utils": { - "inputs": { - "systems": [ - "depot", - "systems" - ] - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "attic": "attic", "deploy-rs": "deploy-rs", - "depot": "depot", "dream2nix": "dream2nix", "helix": "helix", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", + "hyprspace": "hyprspace", "kernel-clr": "kernel-clr", "lanzaboote": "lanzaboote", "nil": "nil", "nix-crx": "nix-crx", - "nix-super": "nix-super_2", + "nix-super": "nix-super", "nixified-ai": "nixified-ai", "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" } }, "rust-overlay": { @@ -1748,16 +1259,16 @@ }, "systems_4": { "locked": { - "lastModified": 1683988522, - "narHash": "sha256-cAVqq+Mjx4EiWovT7rwbwncX5QBnhNsqwsgyg+eeYrg=", - "owner": "privatevoid-net", - "repo": "nix-systems-default-linux", - "rev": "d7aa6df10eec9ee8055e30f0c2f9b8f73f68015e", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "privatevoid-net", - "repo": "nix-systems-default-linux", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, @@ -1776,36 +1287,6 @@ "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" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "textgen-src": { "flake": false, "locked": {