diff --git a/.old/pkgs/culr.nix b/.old/pkgs/culr.nix index 65bcf30..0e689fa 100644 --- a/.old/pkgs/culr.nix +++ b/.old/pkgs/culr.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "git.atagen.co"; owner = "atagen"; - repo = pname; + repo = pname + "-rs"; rev = "8cb1323bdc388ce1fdb0675ade756ea8b59b803d"; sha256 = "sha256-Blo1PyhzKU4LzflmeGrvWOQEon2BCTkF3uQR+7D5/kc="; }; diff --git a/flake.lock b/flake.lock index 7e68bfd..e67b3b1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,7 +7,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-b4DgmtbzcVRzD2FSH113W6HWaDdmM9TmXGA+Z445dGc=", + "narHash": "sha256-rH+15M79lD1lRR2f0xKGXanjJQgSRiCbFzIBRGPgDRY=", "path": "./flakes/ComfyUI", "type": "path" }, @@ -25,7 +25,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-PJia0sldEmsFenbwvCOKpAUbrOPOxt1fTnzwzB8sa+8=", + "narHash": "sha256-ycS39Pa74MyURwvyv91l1xCxalyIxZZSIeLO3spuWQY=", "path": "./flakes/ComfyUI-Plugins", "type": "path" }, @@ -37,11 +37,11 @@ "comfyui_2": { "flake": false, "locked": { - "lastModified": 1732327155, - "narHash": "sha256-3k+qoBQjMKMnnGbtpptWwLRrrtsYIW5qIeHtm/T5G9Q=", + "lastModified": 1732969631, + "narHash": "sha256-4TNU6987zvTc9Fo6CptEq7unowEQGleFNdNQPHvOspQ=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "839ed3368efd0f61a2b986f57fe9e0698fd08e9f", + "rev": "3fc6ebcdd72272349c0d1e18ad2f2d02f2d0fe84", "type": "github" }, "original": { @@ -67,11 +67,11 @@ }, "crane_2": { "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "lastModified": 1732991615, + "narHash": "sha256-CgEHGXSzUdlRI1MzsZmWUwW8+6MKYqtCBIDrD/5H5/o=", "owner": "ipetkov", "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", + "rev": "da87d1af7e4e09fd0271432340a5cadf3eb96005", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "systems": "systems_3" }, "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": { @@ -206,11 +206,86 @@ "systems": "systems_4" }, "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": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "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_6": { + "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_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", "type": "github" }, "original": { @@ -236,11 +311,11 @@ }, "flatpaks": { "locked": { - "lastModified": 1732304879, - "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=", + "lastModified": 1733345341, + "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "c84579946c03c996916be0fb6e1340f444c277af", + "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b", "type": "github" }, "original": { @@ -252,11 +327,11 @@ "gguf": { "flake": false, "locked": { - "lastModified": 1732317027, - "narHash": "sha256-NX0S1Uu28Ro9lLYKI+JzBy/Gz2mNiSVu8MsdQNpdfYk=", + "lastModified": 1732341089, + "narHash": "sha256-fOGRAv42TXqM/2exNPYHH8cTy0TX6rfLlIBqBiqdQoo=", "owner": "city96", "repo": "ComfyUI-GGUF", - "rev": "57562d54a57d4beda3a94fef6f354e090aa02a77", + "rev": "4a8432884167f2526d60ef36e985bdabebb9e1e0", "type": "github" }, "original": { @@ -316,11 +391,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732284611, - "narHash": "sha256-SH7WRJnFSXDJ6f9UzMUdaa6cS5Fc2kACSW8wB9BA8WU=", + "lastModified": 1733358210, + "narHash": "sha256-fomGUxEZKQsF0gUEWSyfe/vocWEScjj3VFzWzzot39I=", "owner": "helix-editor", "repo": "helix", - "rev": "cbbeca6c5227e65bebdbe9abbadbd2202ffc1005", + "rev": "4c8175ca04dd18a74e8d1a5973042b89a381e3ce", "type": "github" }, "original": { @@ -336,16 +411,15 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", - "owner": "n-hass", + "lastModified": 1733354384, + "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", + "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", "type": "github" }, "original": { - "owner": "n-hass", - "ref": "podman-module", + "owner": "nix-community", "repo": "home-manager", "type": "github" } @@ -358,11 +432,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732055037, - "narHash": "sha256-gTl7l/jJReaxhKn1HA6JJp1mfq/eu8XJbeK88NVeGnw=", + "lastModified": 1733355936, + "narHash": "sha256-G9LPJf27OTW5lMVntXow9NuVhABsxpG+DVsCBcpGlA8=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "230dd8b13b024eb039613c579f940802ea5857e5", + "rev": "13c2f8fa8b73c22553ee2cf0006958e9b4e00da3", "type": "github" }, "original": { @@ -390,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1732112222, - "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=", - "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff", + "lastModified": 1733254721, + "narHash": "sha256-2HjYrmwQtOTJJGzWmDf6isy8aPuHmhlDCbFN4rLkzpY=", + "rev": "473c1bdcabcb5c513ec7ff9aaa7bcd8b1cee68a5", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/473c1bdcabcb5c513ec7ff9aaa7bcd8b1cee68a5.tar.gz?rev=473c1bdcabcb5c513ec7ff9aaa7bcd8b1cee68a5" }, "original": { "type": "tarball", @@ -413,11 +487,11 @@ ] }, "locked": { - "lastModified": 1731967274, - "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=", - "rev": "aa2846680fa9a2032939d720487942567fd9eb63", + "lastModified": 1732603698, + "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", + "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730" }, "original": { "type": "tarball", @@ -452,29 +526,34 @@ "nh" ], "nixpkgs": [ + "meat", + "ocaml-overlay", "nixpkgs" ], "ocaml-overlay": "ocaml-overlay" }, "locked": { - "lastModified": 1732342552, - "narHash": "sha256-Wg3H0O/XecKRZcwOUHnlG516VTC2igXZCWF77QioLRI=", - "path": "/home/bolt/code/meat-ocaml", - "type": "path" + "lastModified": 1732408484, + "narHash": "sha256-TrcZ/y47Ozsq4uvqSUVO3reBH6/kzM+fmvGR4Xyje+c=", + "ref": "refs/heads/master", + "rev": "f3a64228a40ecd237f345ae1cc15c6c031739a96", + "revCount": 20, + "type": "git", + "url": "https://git.atagen.co/atagen/meat" }, "original": { - "path": "/home/bolt/code/meat-ocaml", - "type": "path" + "type": "git", + "url": "https://git.atagen.co/atagen/meat" } }, "murex": { "flake": false, "locked": { - "lastModified": 1732322445, - "narHash": "sha256-fTbkqMRjv1Ra1bpx2zZs7m+nUfBfY8/X27aqD+cF4rA=", + "lastModified": 1732661129, + "narHash": "sha256-fAuBKAfJ7X3WVRifEfR3IkslQhw2qm3mghxznzlQvco=", "owner": "lmorg", "repo": "murex", - "rev": "bff0948bf6271fecff565ed858149625025e7e14", + "rev": "8494093fa594ef9fe3e9c800f9f4b49294931cde", "type": "github" }, "original": { @@ -491,7 +570,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-hqsHL6+Mch+gksvWCGZGNHdczuTzPlozPZU0LRlOLOo=", + "narHash": "sha256-0U6FvOXSAeii6bCW9OwONwkFs8m63oK4+SCkmQ7NTgw=", "path": "./flakes/murex-module-jump", "type": "path" }, @@ -507,7 +586,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Fo9IUgaqTbLJZ2QJ9v/nstKoV3skS/1+djDiFCfV1P8=", + "narHash": "sha256-8OUmNGTENHpnrTX5pyfZUtLDLooHsyEGwrI9N5c74zw=", "path": "./flakes/murex-module-starship", "type": "path" }, @@ -539,11 +618,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1732089528, - "narHash": "sha256-+yXeJiSFn96pW6H/50DfCfZiOLSfZNGhK7R4f0aUvGY=", + "lastModified": 1733130784, + "narHash": "sha256-B3PK+e717FdrQXhg53DwTPWLY458yGYsH20tYj0pgzU=", "owner": "viperML", "repo": "nh", - "rev": "cff51af0ebb09227070b0332c598c7a4b7f8175a", + "rev": "83db9160f7d79c0e3af45686454853d239202e54", "type": "github" }, "original": { @@ -562,11 +641,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1732261496, - "narHash": "sha256-GLPyY+OMmiTMPXUwwdFiM4GVwouOSh/hLoPg5D6X2bc=", + "lastModified": 1733268356, + "narHash": "sha256-1fVGnG7Sai4Z5hXnUxRPiuFWsP9uAKCpHrd6yVeBW5Y=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d4b0bc42a58a4cee1deb19d7d8350384e9aa4240", + "rev": "e62c3c242aae3628161c2411b0fe33674d83c762", "type": "github" }, "original": { @@ -595,11 +674,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1732257446, - "narHash": "sha256-xTqbonT9ZJ1PkgDvftoyMYuDul8J4VJccOtsOeRorZM=", + "lastModified": 1733234028, + "narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", "owner": "YaLTeR", "repo": "niri", - "rev": "c239937fac836f308311eff5f5d5fc5262c6eb55", + "rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", "type": "github" }, "original": { @@ -613,11 +692,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1731814505, - "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -649,6 +728,126 @@ "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", @@ -657,11 +856,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732158339, - "narHash": "sha256-37M8Ohbf5Ui5+4GE//5isxjdzGIlsmVN6NXhTgxiCXo=", + "lastModified": 1732760430, + "narHash": "sha256-HC+kuzNIL5q87s5ISeJQk3Dv8pqg8U8wDyRSBrpFeFY=", "owner": "nix-community", "repo": "nixd", - "rev": "6d80199f5b3b24521a1be335e2a75683f859d82a", + "rev": "f12e2f77094ac73c1b1101390c02ec5bcf69ad46", "type": "github" }, "original": { @@ -672,10 +871,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { @@ -730,11 +929,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -762,11 +961,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -778,11 +977,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -794,11 +993,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -841,11 +1040,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1730831018, - "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { @@ -857,11 +1056,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -873,10 +1072,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { @@ -902,11 +1101,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1732937961, + "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", "type": "github" }, "original": { @@ -916,11 +1115,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -932,26 +1131,26 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730359060, - "narHash": "sha256-Hkk0mf4pgvX9Ut0YA397nsFqMLhzFVBdFHc4PhBrxYE=", + "lastModified": 1732359803, + "narHash": "sha256-DPGw9u0Ejy5Hkip79wWSfC1i8q+YqKYngi0AFx3Z4W8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e19cfce6f3f08d07653157d8826f5c920c770d7b", + "rev": "1c79f7f85262067ecdffd95234032dda50f42958", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "e19cfce6f3f08d07653157d8826f5c920c770d7b", + "rev": "1c79f7f85262067ecdffd95234032dda50f42958", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { @@ -961,10 +1160,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { @@ -974,11 +1173,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1733016324, + "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "type": "github" }, "original": { @@ -990,11 +1189,11 @@ }, "nur": { "locked": { - "lastModified": 1732334681, - "narHash": "sha256-Enfvh3ZFikJua3raZIUXqh+NHXnv9khx0tn5f1xgDG8=", + "lastModified": 1733362599, + "narHash": "sha256-Sx17Rvik70fZzQtZbXVpC+uI63stkj5JLOq0cOq1ndM=", "owner": "nix-community", "repo": "NUR", - "rev": "b657d937257e899c8103f8d7c68d83aa5f23b16e", + "rev": "9223fb5839acf2342955c532f561e912d34accdb", "type": "github" }, "original": { @@ -1009,11 +1208,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1730414122, - "narHash": "sha256-eAfo1XsQMdKuiOOhqCuai7vpIBH8S4ll7Sm4BP/M58c=", + "lastModified": 1732401100, + "narHash": "sha256-eNxEkqGdyD+x3yNhJ096N7/8j8TryWA493rSmaL9jAQ=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "1de1cabdb68cbc667dd48da2f128c2df6d5fe604", + "rev": "f6f12811924de05d921c397fad7455e0e2ee644c", "type": "github" }, "original": { @@ -1041,11 +1240,11 @@ "podman": { "flake": false, "locked": { - "lastModified": 1732308047, - "narHash": "sha256-JcI0X0//cXHcF0L+gQeZh5Z/0yohv3EPRrBKjGuRr7U=", + "lastModified": 1733340422, + "narHash": "sha256-n7ZWSQfY+RQNKu/QGA5zA2IzngXMHEuHPStv74pFpuk=", "owner": "containers", "repo": "podman", - "rev": "5d7700bc41f8639d672a60c81ffecc4704a765ad", + "rev": "26605568a139ff7d4a1c5d80453fc206dab317b9", "type": "github" }, "original": { @@ -1073,12 +1272,15 @@ "niri": "niri", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", + "nixago": "nixago", "nixd": "nixd", "nixpkgs": "nixpkgs_15", "nixpkgs-stable": "nixpkgs-stable_3", "nur": "nur", "podman": "podman", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_3", + "sirula": "sirula", + "wrapper-manager": "wrapper-manager" } }, "rust-overlay": { @@ -1110,11 +1312,11 @@ ] }, "locked": { - "lastModified": 1730341826, - "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { @@ -1130,11 +1332,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1733279627, + "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", "type": "github" }, "original": { @@ -1143,6 +1345,22 @@ "type": "github" } }, + "sirula": { + "flake": false, + "locked": { + "lastModified": 1724260121, + "narHash": "sha256-Bp0D4OPDmqil4O6HK2kj8HD5rQAhGqUtvQwwPHD0wIA=", + "owner": "jlo62", + "repo": "sirula", + "rev": "c5afda153ae9279c8b55046ba9594705a4bd3c8a", + "type": "github" + }, + "original": { + "owner": "jlo62", + "repo": "sirula", + "type": "github" + } + }, "src": { "flake": false, "locked": { @@ -1287,6 +1505,26 @@ "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": { diff --git a/flake.nix b/flake.nix index 06f3d32..e1d3fca 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,7 @@ helix.url = "github:helix-editor/helix"; home-manager = { - # url = "github:nix-community/home-manager"; - url = "github:n-hass/home-manager/podman-module"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -26,8 +25,6 @@ nixd.url = "github:nix-community/nixd"; - flatpaks.url = "github:gmodena/nix-flatpak"; - madness.url = "github:antithesishq/madness"; nh.url = "github:viperML/nh"; @@ -44,13 +41,14 @@ }; meat = { - url = "path:/home/bolt/code/meat-ocaml"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "git+https://git.atagen.co/atagen/meat"; inputs.lix.follows = "lix"; inputs.lix-module.follows = "lix-module"; inputs.nh.follows = "nh"; }; + culr.url = "git+https://git.atagen.co/atagen/culr"; + comfyui.url = "path:./flakes/ComfyUI"; comfyui-plugins.url = "path:./flakes/ComfyUI-Plugins"; @@ -70,6 +68,22 @@ niri.url = "github:sodiboo/niri-flake"; ironbar.url = "github:JakeStanger/ironbar"; + + sirula = { + url = "github:jlo62/sirula"; + flake = false; + }; + + nixago = { + url = "github:jmgilman/nixago"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + wrapper-manager = { + url = "github:viperML/wrapper-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = { @@ -81,7 +95,7 @@ nix-index-database, madness, meat, - comfyui, + culr, niri, ... } @ inputs: let @@ -90,6 +104,7 @@ inherit (lib) mapAttrs; sharedModules = [ meat.nixosModules.meat + culr.nixosModules.culr madness.nixosModules.madness nur.nixosModules.nur nix-index-database.nixosModules.nix-index diff --git a/flakes/ComfyUI-Plugins/flake.lock b/flakes/ComfyUI-Plugins/flake.lock index c097330..fee8a2f 100644 --- a/flakes/ComfyUI-Plugins/flake.lock +++ b/flakes/ComfyUI-Plugins/flake.lock @@ -3,11 +3,11 @@ "gguf": { "flake": false, "locked": { - "lastModified": 1732317027, - "narHash": "sha256-NX0S1Uu28Ro9lLYKI+JzBy/Gz2mNiSVu8MsdQNpdfYk=", + "lastModified": 1732341089, + "narHash": "sha256-fOGRAv42TXqM/2exNPYHH8cTy0TX6rfLlIBqBiqdQoo=", "owner": "city96", "repo": "ComfyUI-GGUF", - "rev": "57562d54a57d4beda3a94fef6f354e090aa02a77", + "rev": "4a8432884167f2526d60ef36e985bdabebb9e1e0", "type": "github" }, "original": { @@ -18,10 +18,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { diff --git a/flakes/ComfyUI/flake.lock b/flakes/ComfyUI/flake.lock index 7a8a0a7..ce6de06 100644 --- a/flakes/ComfyUI/flake.lock +++ b/flakes/ComfyUI/flake.lock @@ -3,11 +3,11 @@ "comfyui": { "flake": false, "locked": { - "lastModified": 1732327155, - "narHash": "sha256-3k+qoBQjMKMnnGbtpptWwLRrrtsYIW5qIeHtm/T5G9Q=", + "lastModified": 1732969631, + "narHash": "sha256-4TNU6987zvTc9Fo6CptEq7unowEQGleFNdNQPHvOspQ=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "839ed3368efd0f61a2b986f57fe9e0698fd08e9f", + "rev": "3fc6ebcdd72272349c0d1e18ad2f2d02f2d0fe84", "type": "github" }, "original": { @@ -18,10 +18,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { diff --git a/flakes/murex-module-jump/flake.lock b/flakes/murex-module-jump/flake.lock index 54936b6..38fce2d 100644 --- a/flakes/murex-module-jump/flake.lock +++ b/flakes/murex-module-jump/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { diff --git a/flakes/murex-module-starship/flake.lock b/flakes/murex-module-starship/flake.lock index 36df848..9145a57 100644 --- a/flakes/murex-module-starship/flake.lock +++ b/flakes/murex-module-starship/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "path" }, "original": { diff --git a/home/bolt.nix b/home/bolt.nix index 9682479..28e1cf6 100644 --- a/home/bolt.nix +++ b/home/bolt.nix @@ -23,7 +23,7 @@ ]; programs.comfyui = { - enable = false; + enable = true; storage = "/home/${config.mainUser}/.local/share/comfyui/"; plugins = let inherit (pkgs.comfyui-plugins) gguf openpose; diff --git a/home/modules/chat.nix b/home/modules/chat.nix index 0b6152c..d51c654 100644 --- a/home/modules/chat.nix +++ b/home/modules/chat.nix @@ -19,5 +19,5 @@ icon = ../icons/fb_msg.png; }; }; - flatpaks = ["im.riot.Riot"]; + # flatpaks = ["im.riot.Riot"]; } diff --git a/home/modules/desktop.nix b/home/modules/desktop.nix index f1cb2ac..07e239a 100644 --- a/home/modules/desktop.nix +++ b/home/modules/desktop.nix @@ -3,8 +3,8 @@ ./cosmic.nix ./media-players.nix ./webapps.nix - ./documents.nix - ./creative.nix + # ./documents.nix + # ./creative.nix ./chat.nix ../programs/firefox.nix ../programs/wlogout.nix diff --git a/home/modules/documents.nix b/home/modules/documents.nix index 6da5298..2af436c 100644 --- a/home/modules/documents.nix +++ b/home/modules/documents.nix @@ -2,13 +2,13 @@ imports = [ ../util/flatpak.nix ]; - home.packages = with pkgs; [ - libreoffice - ]; + # home.packages = with pkgs; [ + # libreoffice + # ]; flatpaks = [ - "md.obsidian.Obsidian" - "com.logseq.Logseq" + # "md.obsidian.Obsidian" + # "com.logseq.Logseq" # "org.libreoffice.LibreOffice" - "com.jgraph.drawio.desktop" + # "com.jgraph.drawio.desktop" ]; } diff --git a/system/configuration.nix b/system/configuration.nix index 20a954d..6087167 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -20,7 +20,7 @@ outputs.overlays.murex-jump outputs.overlays.comfyui outputs.overlays.comfyui-plugins - outputs.overlays.utillinux + outputs.overlays.sirula ]; config = { allowUnfree = true; @@ -88,7 +88,7 @@ services.udisks2.enable = true; - services.flatpak.enable = true; + # services.flatpak.enable = true; security.polkit.enable = true; diff --git a/system/modules/culr.nix b/system/modules/culr.nix new file mode 100644 index 0000000..9d66041 --- /dev/null +++ b/system/modules/culr.nix @@ -0,0 +1,6 @@ +{...}: { + programs.meat = { + enable = true; + pattern = "rainbow-pair"; + }; +} diff --git a/system/modules/niri.nix b/system/modules/niri.nix index 5798756..1dbc393 100644 --- a/system/modules/niri.nix +++ b/system/modules/niri.nix @@ -1,16 +1,18 @@ { pkgs, lib, + mainUser, ... }: { services.greetd = { enable = true; - settings = { - default_session = let - tuigreet = "${lib.getExe pkgs.greetd.tuigreet}"; - in { - command = "${tuigreet} -g yo -r"; - }; + restart = false; + settings = let session = { + command = "niri-session"; + user = "${mainUser}"; + }; in { + default_session = session; + initial_session = session; }; }; programs.niri = { diff --git a/util/overlay.nix b/util/overlay.nix index 8bc6769..274d467 100644 --- a/util/overlay.nix +++ b/util/overlay.nix @@ -12,7 +12,10 @@ vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE="; }; }; - utillinux = final: prev: { - utillinux = prev.util-linux; + sirula = final: prev: { + sirula = prev.sirula.overrideAttrs { + version = "1.0.0-${builtins.toString inputs.sirula.lastModifiedDate}"; + src = inputs.sirula; + }; }; }