From c470c63ab2a668656e0807c6bb0e9f9d20b3b640 Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 23 Nov 2024 17:20:39 +1100 Subject: [PATCH] niri, ocaml meat --- flake.lock | 799 ++++++++------------ flake.nix | 9 +- flakes/ComfyUI-Plugins/flake.lock | 14 +- flakes/ComfyUI-Plugins/openpose/default.nix | 28 +- flakes/ComfyUI-Plugins/tensorrt/default.nix | 36 +- flakes/ComfyUI/flake.lock | 14 +- flakes/murex-meat/default.nix | 8 - flakes/murex-meat/flake.nix | 10 - flakes/murex-meat/meat.mx | 138 ---- flakes/murex-module-jump/flake.lock | 8 +- flakes/murex-module-starship/flake.lock | 8 +- home/home.nix | 5 +- home/modules/desktop.nix | 1 - home/modules/niri.nix | 138 +++- home/programs/atuin.nix | 4 +- home/programs/kitty.nix | 1 + home/programs/wlogout.nix | 30 + system/cachix.nix | 10 +- system/configuration.nix | 30 +- system/modules/hyprland.nix | 8 - system/modules/niri.nix | 16 +- system/modules/term.nix | 3 +- system/quiver.nix | 14 +- util/gtk-theme.nix | 4 +- util/rice.nix | 3 +- 25 files changed, 583 insertions(+), 756 deletions(-) delete mode 100644 flakes/murex-meat/default.nix delete mode 100644 flakes/murex-meat/flake.nix delete mode 100755 flakes/murex-meat/meat.mx delete mode 100644 system/modules/hyprland.nix diff --git a/flake.lock b/flake.lock index 2fac085..7e68bfd 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "comfyui": { "inputs": { "comfyui": "comfyui_2", @@ -40,7 +7,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-i8aDgwpx8MU3fC5wozbQ9E82BHqxzX0eHtpPczgN3xU=", + "narHash": "sha256-b4DgmtbzcVRzD2FSH113W6HWaDdmM9TmXGA+Z445dGc=", "path": "./flakes/ComfyUI", "type": "path" }, @@ -58,7 +25,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-7oaN0HXDIpTAHQxu6+hE/0n4rkuLAV/GYSGBOfOPAB8=", + "narHash": "sha256-PJia0sldEmsFenbwvCOKpAUbrOPOxt1fTnzwzB8sa+8=", "path": "./flakes/ComfyUI-Plugins", "type": "path" }, @@ -70,11 +37,11 @@ "comfyui_2": { "flake": false, "locked": { - "lastModified": 1730402285, - "narHash": "sha256-Al5oTuy6LsVpfOLHJ6YkY1Suc3HEXc8eR7jKJszli5c=", + "lastModified": 1732327155, + "narHash": "sha256-3k+qoBQjMKMnnGbtpptWwLRrrtsYIW5qIeHtm/T5G9Q=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "cc9cf6d1bd957d764ad418258b61d7e08187573b", + "rev": "839ed3368efd0f61a2b986f57fe9e0698fd08e9f", "type": "github" }, "original": { @@ -98,23 +65,22 @@ "type": "github" } }, - "flake-compat": { - "flake": false, + "crane_2": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "flake-compat_2": { + "flake-compat": { "flake": false, "locked": { "lastModified": 1696426674, @@ -200,6 +166,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -217,6 +201,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -234,11 +236,11 @@ }, "flatpaks": { "locked": { - "lastModified": 1730108712, - "narHash": "sha256-vIvmXmjAQIY39hACGFe/cdBK2r3ZprpHLwX2HIy7Mj8=", + "lastModified": 1732304879, + "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "1cba177bb0a948c919af7596e40bef307543d40a", + "rev": "c84579946c03c996916be0fb6e1340f444c277af", "type": "github" }, "original": { @@ -250,11 +252,11 @@ "gguf": { "flake": false, "locked": { - "lastModified": 1729651119, - "narHash": "sha256-1TLoQS8rcJ5Y4VcWk3mAGg7/+jnjF/VN9QkhU99nCC4=", + "lastModified": 1732317027, + "narHash": "sha256-NX0S1Uu28Ro9lLYKI+JzBy/Gz2mNiSVu8MsdQNpdfYk=", "owner": "city96", "repo": "ComfyUI-GGUF", - "rev": "6561064dcfb3dfa638e3739506acfd34924e1cc5", + "rev": "57562d54a57d4beda3a94fef6f354e090aa02a77", "type": "github" }, "original": { @@ -265,10 +267,10 @@ }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_10", - "nixpkgs-stable": "nixpkgs-stable_3" + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_12", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1729104314, @@ -285,28 +287,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "nix-rice", @@ -336,11 +316,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730790589, - "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=", + "lastModified": 1732284611, + "narHash": "sha256-SH7WRJnFSXDJ6f9UzMUdaa6cS5Fc2kACSW8wB9BA8WU=", "owner": "helix-editor", "repo": "helix", - "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e", + "rev": "cbbeca6c5227e65bebdbe9abbadbd2202ffc1005", "type": "github" }, "original": { @@ -370,161 +350,24 @@ "type": "github" } }, - "hyprcursor": { + "ironbar": { "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "crane": "crane_2", + "naersk": "naersk", + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "lastModified": 1732055037, + "narHash": "sha256-gTl7l/jJReaxhKn1HA6JJp1mfq/eu8XJbeK88NVeGnw=", + "owner": "JakeStanger", + "repo": "ironbar", + "rev": "230dd8b13b024eb039613c579f940802ea5857e5", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1731254055, - "narHash": "sha256-OLEpnZ1b7oT7yHKRigweL1xn6vHYzaPoWRuEitzJigk=", - "path": "/nix/store/k01761gz6v14dgwb8cz5mlvzqb1a7g26-source", - "rev": "9e628067fc54851dc9138c2882abb21f72c5a5a6", - "type": "path" - }, - "original": { - "id": "hyprland", - "type": "indirect" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1731163338, - "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "owner": "JakeStanger", + "repo": "ironbar", "type": "github" } }, @@ -547,11 +390,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1731235488, - "narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=", - "rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771", + "lastModified": 1732112222, + "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=", + "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771.tar.gz?rev=d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff" }, "original": { "type": "tarball", @@ -570,11 +413,11 @@ ] }, "locked": { - "lastModified": 1731185731, - "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", - "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", + "lastModified": 1731967274, + "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=", + "rev": "aa2846680fa9a2032939d720487942567fd9eb63", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63" }, "original": { "type": "tarball", @@ -598,6 +441,7 @@ }, "meat": { "inputs": { + "flake-utils": "flake-utils_3", "lix": [ "lix" ], @@ -610,30 +454,27 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": [ - "rust-overlay" - ], - "utils": "utils" + "ocaml-overlay": "ocaml-overlay" }, "locked": { - "lastModified": 1730435090, - "narHash": "sha256-psE+ujalvatAdFmtFiFsxUlQjHP9zFNi0+UaEDsyci0=", - "path": "/home/bolt/code/meat", + "lastModified": 1732342552, + "narHash": "sha256-Wg3H0O/XecKRZcwOUHnlG516VTC2igXZCWF77QioLRI=", + "path": "/home/bolt/code/meat-ocaml", "type": "path" }, "original": { - "path": "/home/bolt/code/meat", + "path": "/home/bolt/code/meat-ocaml", "type": "path" } }, "murex": { "flake": false, "locked": { - "lastModified": 1731098536, - "narHash": "sha256-fEQ5q1jTgKOIcu6i6BvXh1bI+38oS1iquZE50m4ZGmA=", + "lastModified": 1732322445, + "narHash": "sha256-fTbkqMRjv1Ra1bpx2zZs7m+nUfBfY8/X27aqD+cF4rA=", "owner": "lmorg", "repo": "murex", - "rev": "59b5468bf29bae77d952c0b7cf2528cbab7f048f", + "rev": "bff0948bf6271fecff565ed858149625025e7e14", "type": "github" }, "original": { @@ -645,12 +486,12 @@ }, "murex-jump": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "src": "src" }, "locked": { "lastModified": 1, - "narHash": "sha256-+uxh2LvWiKil2pHmniWKhsRla4St4cRe79GObfzVQkc=", + "narHash": "sha256-hqsHL6+Mch+gksvWCGZGNHdczuTzPlozPZU0LRlOLOo=", "path": "./flakes/murex-module-jump", "type": "path" }, @@ -661,12 +502,12 @@ }, "murex-starship": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "src": "src_2" }, "locked": { "lastModified": 1, - "narHash": "sha256-z3f1BUGtTb/mTMRPJfqZy1r11XDnsEbOEiRGi90+Tos=", + "narHash": "sha256-Fo9IUgaqTbLJZ2QJ9v/nstKoV3skS/1+djDiFCfV1P8=", "path": "./flakes/murex-module-starship", "type": "path" }, @@ -675,16 +516,34 @@ "type": "path" } }, - "nh": { + "naersk": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728371783, - "narHash": "sha256-ufI7115ims2PPxggpWQhigAUrwlwu155wVgngZzzyZ0=", + "lastModified": 1721727458, + "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "owner": "nix-community", + "repo": "naersk", + "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "nh": { + "inputs": { + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1732089528, + "narHash": "sha256-+yXeJiSFn96pW6H/50DfCfZiOLSfZNGhK7R4f0aUvGY=", "owner": "viperML", "repo": "nh", - "rev": "afdff9ab4fdb9c329b5d97c5b742242b97f8754d", + "rev": "cff51af0ebb09227070b0332c598c7a4b7f8175a", "type": "github" }, "original": { @@ -697,17 +556,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1731269425, - "narHash": "sha256-qgwdIlBWvSN+mThrvjfo6rRnkLVBThZggrCytDuzdM0=", + "lastModified": 1732261496, + "narHash": "sha256-GLPyY+OMmiTMPXUwwdFiM4GVwouOSh/hLoPg5D6X2bc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "28e1701eda8eac4aa0da250cb50dfd1017235795", + "rev": "d4b0bc42a58a4cee1deb19d7d8350384e9aa4240", "type": "github" }, "original": { @@ -719,16 +578,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1731164272, - "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", + "lastModified": 1731483594, + "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", "owner": "YaLTeR", "repo": "niri", - "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", + "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v0.1.10", + "ref": "v0.1.10.1", "repo": "niri", "type": "github" } @@ -736,11 +595,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1731221223, - "narHash": "sha256-E9lhNv83Z4R+c2H+ymLgybHZ+KylU0QHzO7sh5IHD/E=", + "lastModified": 1732257446, + "narHash": "sha256-xTqbonT9ZJ1PkgDvftoyMYuDul8J4VJccOtsOeRorZM=", "owner": "YaLTeR", "repo": "niri", - "rev": "010a2368823bc3959c1468609cd05367e5b6d0b6", + "rev": "c239937fac836f308311eff5f5d5fc5262c6eb55", "type": "github" }, "original": { @@ -751,14 +610,14 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1731814505, + "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", "type": "github" }, "original": { @@ -772,7 +631,7 @@ "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_13", "nixpkgs-lib": "nixpkgs-lib_2", "systems": "systems_5" }, @@ -794,15 +653,15 @@ "inputs": { "flake-parts": "flake-parts_2", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_14", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731087557, - "narHash": "sha256-W70xy7WFqA5940zhodAsGiC/nvqGwZ07YE34ObMK/po=", + "lastModified": 1732158339, + "narHash": "sha256-37M8Ohbf5Ui5+4GE//5isxjdzGIlsmVN6NXhTgxiCXo=", "owner": "nix-community", "repo": "nixd", - "rev": "1cf9ec0a82bcac57c7c12b6378bd8c28513cd3a6", + "rev": "6d80199f5b3b24521a1be335e2a75683f859d82a", "type": "github" }, "original": { @@ -813,10 +672,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "path" }, "original": { @@ -871,11 +730,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -886,22 +745,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730963269, - "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -917,7 +760,55 @@ "type": "github" } }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -933,7 +824,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1729507178, "narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=", @@ -948,7 +839,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1730831018, "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=", @@ -964,13 +855,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -982,10 +873,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "path" }, "original": { @@ -1011,53 +902,83 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "type": "github" + }, + "original": { + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_6": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "path" + "lastModified": 1730359060, + "narHash": "sha256-Hkk0mf4pgvX9Ut0YA397nsFqMLhzFVBdFHc4PhBrxYE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e19cfce6f3f08d07653157d8826f5c920c770d7b", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e19cfce6f3f08d07653157d8826f5c920c770d7b", + "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", "type": "github" }, "original": { @@ -1067,45 +988,13 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1731275204, - "narHash": "sha256-g54hkRM0SfYOyAADwaJ5XuZyEoNSWLBWiB2pYBmj8q8=", + "lastModified": 1732334681, + "narHash": "sha256-Enfvh3ZFikJua3raZIUXqh+NHXnv9khx0tn5f1xgDG8=", "owner": "nix-community", "repo": "NUR", - "rev": "cbbf744eff5a0cb1c8504170989d003abdd08510", + "rev": "b657d937257e899c8103f8d7c68d83aa5f23b16e", "type": "github" }, "original": { @@ -1114,6 +1003,25 @@ "type": "github" } }, + "ocaml-overlay": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1730414122, + "narHash": "sha256-eAfo1XsQMdKuiOOhqCuai7vpIBH8S4ll7Sm4BP/M58c=", + "owner": "nix-ocaml", + "repo": "nix-overlays", + "rev": "1de1cabdb68cbc667dd48da2f128c2df6d5fe604", + "type": "github" + }, + "original": { + "owner": "nix-ocaml", + "repo": "nix-overlays", + "type": "github" + } + }, "openpose": { "flake": false, "locked": { @@ -1133,11 +1041,11 @@ "podman": { "flake": false, "locked": { - "lastModified": 1731082507, - "narHash": "sha256-lCKoRNM20AJDgswOqcTqcRzMjXwe9GizLcF1lFCF7TA=", + "lastModified": 1732308047, + "narHash": "sha256-JcI0X0//cXHcF0L+gQeZh5Z/0yohv3EPRrBKjGuRr7U=", "owner": "containers", "repo": "podman", - "rev": "483a1327d1551c8f157b6333f490366c07473ce6", + "rev": "5d7700bc41f8639d672a60c81ffecc4704a765ad", "type": "github" }, "original": { @@ -1146,30 +1054,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "comfyui": "comfyui", @@ -1177,7 +1061,7 @@ "flatpaks": "flatpaks", "helix": "helix", "home-manager": "home-manager", - "hyprland": "hyprland", + "ironbar": "ironbar", "lix": "lix", "lix-module": "lix-module", "madness": "madness", @@ -1190,10 +1074,11 @@ "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", "nixd": "nixd", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_15", + "nixpkgs-stable": "nixpkgs-stable_3", "nur": "nur", "podman": "podman", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" } }, "rust-overlay": { @@ -1220,15 +1105,36 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ + "ironbar", "nixpkgs" ] }, "locked": { - "lastModified": 1731119076, - "narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=", + "lastModified": 1730341826, + "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032", + "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -1286,16 +1192,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1381,65 +1287,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -1460,11 +1307,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1731123454, - "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", + "lastModified": 1732233710, + "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", + "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f6317c2..06f3d32 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; nur.url = "github:/nix-community/NUR"; @@ -27,7 +28,6 @@ flatpaks.url = "github:gmodena/nix-flatpak"; - madness.url = "github:antithesishq/madness"; nh.url = "github:viperML/nh"; @@ -44,12 +44,11 @@ }; meat = { - url = "path:/home/bolt/code/meat"; + url = "path:/home/bolt/code/meat-ocaml"; inputs.nixpkgs.follows = "nixpkgs"; inputs.lix.follows = "lix"; inputs.lix-module.follows = "lix-module"; inputs.nh.follows = "nh"; - inputs.rust-overlay.follows = "rust-overlay"; }; comfyui.url = "path:./flakes/ComfyUI"; @@ -69,6 +68,8 @@ murex-starship.url = "path:./flakes/murex-module-starship"; niri.url = "github:sodiboo/niri-flake"; + + ironbar.url = "github:JakeStanger/ironbar"; }; outputs = { @@ -79,10 +80,8 @@ flatpaks, nix-index-database, madness, - lix-module, meat, comfyui, - hyprland, niri, ... } @ inputs: let diff --git a/flakes/ComfyUI-Plugins/flake.lock b/flakes/ComfyUI-Plugins/flake.lock index 2e6f0e9..c097330 100644 --- a/flakes/ComfyUI-Plugins/flake.lock +++ b/flakes/ComfyUI-Plugins/flake.lock @@ -3,11 +3,11 @@ "gguf": { "flake": false, "locked": { - "lastModified": 1729651119, - "narHash": "sha256-1TLoQS8rcJ5Y4VcWk3mAGg7/+jnjF/VN9QkhU99nCC4=", + "lastModified": 1732317027, + "narHash": "sha256-NX0S1Uu28Ro9lLYKI+JzBy/Gz2mNiSVu8MsdQNpdfYk=", "owner": "city96", "repo": "ComfyUI-GGUF", - "rev": "6561064dcfb3dfa638e3739506acfd34924e1cc5", + "rev": "57562d54a57d4beda3a94fef6f354e090aa02a77", "type": "github" }, "original": { @@ -18,10 +18,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "path" }, "original": { diff --git a/flakes/ComfyUI-Plugins/openpose/default.nix b/flakes/ComfyUI-Plugins/openpose/default.nix index 8609689..9adf02c 100644 --- a/flakes/ComfyUI-Plugins/openpose/default.nix +++ b/flakes/ComfyUI-Plugins/openpose/default.nix @@ -1,20 +1,20 @@ { - pkgs, - src, - ... + pkgs, + src, + ... }: pkgs.stdenvNoCC.mkDerivation { - pname = "comfyui-openpose-editor"; - version = "dev-${builtins.toString src.lastModified}"; - inherit src; + pname = "comfyui-openpose-editor"; + version = "dev-${builtins.toString src.lastModified}"; + inherit src; - patches = [ - ./openpose_no_update.patch - ]; + patches = [ + ./openpose_no_update.patch + ]; - installPhase = '' - mkdir -p $out - cp -r * $out/ - cp js/* $out/ - ''; + installPhase = '' + mkdir -p $out + cp -r * $out/ + cp js/* $out/ + ''; } diff --git a/flakes/ComfyUI-Plugins/tensorrt/default.nix b/flakes/ComfyUI-Plugins/tensorrt/default.nix index 713b1b3..455ff3e 100644 --- a/flakes/ComfyUI-Plugins/tensorrt/default.nix +++ b/flakes/ComfyUI-Plugins/tensorrt/default.nix @@ -1,23 +1,23 @@ { - pkgs, - src, - python3Packages, - ... + pkgs, + src, + python3Packages, + ... }: let - inherit (python3Packages) tensorrt onnx; + inherit (python3Packages) tensorrt onnx; in -pkgs.stdenvNoCC.mkDerivation { - pname = "comfyui-tensorrt"; - version = "dev-${builtins.toString src.lastModified}"; - src = src; + pkgs.stdenvNoCC.mkDerivation { + pname = "comfyui-tensorrt"; + version = "dev-${builtins.toString src.lastModified}"; + src = src; - propagatedBuildInputs = [ - tensorrt - onnx - ]; + propagatedBuildInputs = [ + tensorrt + onnx + ]; - installPhase = '' - mkdir -p $out - cp -r * $out - ''; -} + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + } diff --git a/flakes/ComfyUI/flake.lock b/flakes/ComfyUI/flake.lock index 23eb88b..7a8a0a7 100644 --- a/flakes/ComfyUI/flake.lock +++ b/flakes/ComfyUI/flake.lock @@ -3,11 +3,11 @@ "comfyui": { "flake": false, "locked": { - "lastModified": 1730402285, - "narHash": "sha256-Al5oTuy6LsVpfOLHJ6YkY1Suc3HEXc8eR7jKJszli5c=", + "lastModified": 1732327155, + "narHash": "sha256-3k+qoBQjMKMnnGbtpptWwLRrrtsYIW5qIeHtm/T5G9Q=", "owner": "comfyanonymous", "repo": "ComfyUI", - "rev": "cc9cf6d1bd957d764ad418258b61d7e08187573b", + "rev": "839ed3368efd0f61a2b986f57fe9e0698fd08e9f", "type": "github" }, "original": { @@ -18,10 +18,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "path" }, "original": { diff --git a/flakes/murex-meat/default.nix b/flakes/murex-meat/default.nix deleted file mode 100644 index 66ca496..0000000 --- a/flakes/murex-meat/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pkgs, - src, - ... -}: -pkgs.stdenvNoCC.mkDerivation { - inherit src; -} diff --git a/flakes/murex-meat/flake.nix b/flakes/murex-meat/flake.nix deleted file mode 100644 index 03271f7..0000000 --- a/flakes/murex-meat/flake.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - - outputs = { nixpkgs, ... }: let - pkgs = import nixpkgs {}; - in { - - packages.x86_64-linux.meat = pkgs.callPackage ./default.nix; - - }; -} diff --git a/flakes/murex-meat/meat.mx b/flakes/murex-meat/meat.mx deleted file mode 100755 index f669761..0000000 --- a/flakes/murex-meat/meat.mx +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env murex - -config: set proc force-tty true -config: set proc strict-types true - -args meat_args %{ - AllowAdditional: true - Flags: { - --all: bool - -a: --all - } -} - -catch { - err $meat_args.error - exit 1 -} - -function meat { - if { is-null $ENV.FLAKE } { - meat_print(NO RECIPE FOUND) - exit - } - $pd = $PWD - cd $ENV.FLAKE - meat_print "----- MEAT ----------------------------------------" true - $a = $args[Additional] - if { $a -> len } then { - meat_parse_cmd $a - } else { - meat_print_help - } - meat_print "---------------------------------------------------" true - cd $pd -} - -function meat_print (t: str, !title: bool [false]) { - if {$title} { - out ( - $t - ) - - } else { - out ( - $t - ) - } -} - -function meat_parse_cmd (args: json) { - out args $args - out arglen $args -> count - out argscast $args -> cast json - out argscast $args -> cast json -> count - $cmd = $args[ 0 ] - out cmd $cmd - if { ${$args -> len} > 1 } then { - $opts = ${$args -> ![ 0 ]} - } - out opts $opts - switch $cmd { - case "yum" { - meat_print (CONSUMING DELICIOUS MEATS..) - nh os switch @opts - } - case "poke" { - meat_print (PREPARING SUSPICIOUS MEATS..) - nh os test @opts - } - case "cook" { - meat_print (PREPARING MEATS..) - nh os build @opts - } - case "fresh" { - meat_print (PROCESSING FRESH MEATS..) - meat_do_fresh $opts - } - case "look" { - meat_print (INSPECTING MEAT..) - nix flake info @opts - } - case "gut" { - meat_print (CLEANING MEAT STORES..) - nh clean all @opts - } - default { meat_print_help } - } -} - -function meat_print_help { - out ( FRESH - HUNT LATEST MEATS - ..N - HUNT LATEST SUBMEATS OF N - ..-A - HUNT ALL SUBMEATS - YUM - CONSUME DELICIOUS MEATS - COOK - ONLY PREPARE MEATS - POKE - TASTE SUSPICIOUS MEATS - GUT - CLEAN MEAT STORES - LOOK - INSPECT MEAT) -} - -function meat_do_fresh (!opts: str) { - # handle --all flag - if { $GLOBAL.args.flags.all } then { - recursive_update $ENV.FLAKE/flakes - cd $ENV.FLAKE - nix flake update - } - if { $opts } then { - # handle specified subflakes - $opts -> foreach subflake { - meat_print "GET NEW MEAT FOR $(subflake).." - recursive_update $ENV.FLAKE/flakes/$subflake - cd $ENV.FLAKE - nix flake update $subflake - } - } - # simple update - nix flake update -} - -function recursive_update (path: str) { - if { $path.Exists } { - cd $path - # update subflakes - g */flake.nix -> foreach dir { recursive_update $dir } - # update this flake - $isflake = ${g flake.nix -> count} > 0 - if { $isflake } then { - nix flake update - } - } else { - err "No such subflake at $path" - exit 1 - } -} - -$GLOBAL.args = $meat_args -meat diff --git a/flakes/murex-module-jump/flake.lock b/flakes/murex-module-jump/flake.lock index 9ed43ba..54936b6 100644 --- a/flakes/murex-module-jump/flake.lock +++ b/flakes/murex-module-jump/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "path" }, "original": { diff --git a/flakes/murex-module-starship/flake.lock b/flakes/murex-module-starship/flake.lock index bcc5e22..36df848 100644 --- a/flakes/murex-module-starship/flake.lock +++ b/flakes/murex-module-starship/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "path": "/nix/store/c9wv7i0af6mysmy65x6nvyfw5izzxv4g-source", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "path" }, "original": { diff --git a/home/home.nix b/home/home.nix index 5407be8..4b46bf5 100644 --- a/home/home.nix +++ b/home/home.nix @@ -19,6 +19,7 @@ in { ./util/murex.nix ./util/name.nix inputs.nix-index-database.hmModules.nix-index + inputs.ironbar.homeManagerModules.default ]; nix.gc = { @@ -57,7 +58,7 @@ in { systemd.user.targets.tray = { Unit = { Description = "Home Manager System Tray"; - Requires = ["graphical-session-pre.target"]; + Requires = ["graphical-session.target"]; }; }; @@ -90,6 +91,6 @@ in { systemd.user.startServices = "sd-switch"; ezServices = { - ckb-next = "${getExe pkgs.ckb-next} -c -b"; + ckb-next = "${getExe inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next} -c -b"; }; } diff --git a/home/modules/desktop.nix b/home/modules/desktop.nix index 0677fdc..f1cb2ac 100644 --- a/home/modules/desktop.nix +++ b/home/modules/desktop.nix @@ -14,6 +14,5 @@ nautilus thunderbird keepassxc - wofi ]; } diff --git a/home/modules/niri.nix b/home/modules/niri.nix index b01938f..488db42 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -2,26 +2,33 @@ pkgs, lib, config, + inputs, ... }: let services = let - inherit (pkgs) ironbar swaynotificationcenter; + inherit (pkgs) swaynotificationcenter sway-audio-idle-inhibit; in [ - ironbar swaynotificationcenter + sway-audio-idle-inhibit ]; errata = let - inherit (pkgs) anyrun; + inherit (pkgs) sirula avizo playerctl; in [ - anyrun + sirula + avizo + playerctl ]; extraServices = let - inherit (pkgs) swayidle swaylock swaybg systemd niri-unstable; + inherit (pkgs) swayidle swaybg systemd niri-unstable avizo; in [ { name = "swaybg"; value = "${lib.getExe swaybg} -m fill -i /home/${config.mainUser}/.nix/wallpaper.jpg"; } + { + name = "avizo-service"; + value = "${lib.getExe' avizo "avizo-service"}"; + } { name = "swayidle"; value = let @@ -30,27 +37,23 @@ systemctl = lib.getExe' systemd "systemctl"; in '' ${lib.getExe swayidle} -w \ - timeout 1200 '${systemctl} suspend' \ - timeout 601 '${niri} msg action power-off-monitors' \ - timeout 600 '${lock} -f' \ + timeout 1800 '${systemctl} suspend' \ + timeout 600 '${niri} msg action power-off-monitors' \ + timeout 599 '${lock} -f' \ before-sleep '${lock} -f' ''; } ]; in { home.packages = errata; - ezServices = let - attrify = - map (entry: { - name = "${entry.pname}"; + ezServices = builtins.listToAttrs ( + (map (entry: { + name = "${lib.strings.toLower entry.pname}"; value = "${lib.getExe entry}"; }) - services; - in - builtins.listToAttrs ( - attrify - ++ extraServices - ); + services) + ++ extraServices + ); programs.niri.settings = let inherit (lib) range nameValuePair mapAttrs'; inherit (builtins) listToAttrs replaceStrings; @@ -80,38 +83,45 @@ in { }) (range 0 6)); in { - "Mod+D".action.spawn = "anyrun"; + "Mod+D".action.spawn = "sirula"; "Mod+F".action.spawn = "firefox"; "Mod+E".action.spawn = "nautilus"; "Mod+Return".action.spawn = "kitty"; "Mod+Shift+E".action.spawn = "wlogout"; + "Mod+Equal".action.spawn = "keepassxc"; "Mod+Shift+Q".action = actions.close-window; "Mod+Shift+S".action = actions.screenshot; "Mod+R".action = actions.switch-preset-column-width; - "Mod+Shift+Space".action = actions.maximize-column; + "Mod+Shift+R".action = actions.maximize-column; + "XF86AudioRaiseVolume".action.spawn = ["volumectl" "-u" "up"]; + "XF86AudioLowerVolume".action.spawn = ["volumectl" "-u" "down"]; + "XF86AudioMute".action.spawn = ["volumectl" "toggle-mute"]; + "XF86AudioStop".action.spawn = ["playerctl" "stop"]; + "XF86AudioPlay".action.spawn = ["playerctl" "play-pause"]; + "XF86AudioNext".action.spawn = ["playerctl" "next"]; + "XF86AudioPrev".action.spawn = ["playerctl" "previous"]; } // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds // makeDirBind "Mod" "focus-column-or-monitor-$DIR" hBinds // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds // makeDirBind "Mod+Shift" "move-column-$DIR-or-to-monitor-$DIR" hBinds // makeDirBind "Mod+Ctrl" "consume-or-expel-window-$DIR" hBinds + // makeDirBind "Mod+Ctrl" "move-window-$DIR" vBinds // makeWsBind "Mod" "focus-workspace" // makeWsBind "Mod+Shift" "move-window-to-workspace"; - prefer-no-csd = true; outputs = { "Unknown-1".enable = false; - "HDMI-A-2" = { - transform.rotation = 90; - scale = 1; - }; "DP-1" = { variable-refresh-rate = true; scale = 1; }; + "HDMI-A-2" = { + transform.rotation = 90; + scale = 1; + }; }; input = { warp-mouse-to-focus = true; - workspace-auto-back-and-forth = true; }; cursor = { hide-after-inactive-ms = 5000; @@ -130,11 +140,87 @@ in { 0.5 (1.0 / 3.0) ]; + focus-ring = let + pal = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.palette; + in { + active = {color = pal.bright.yellow;}; + inactive = {color = pal.normal.black;}; + }; }; + prefer-no-csd = true; + hotkey-overlay.skip-at-startup = true; }; programs.swaylock = { enable = true; settings.color = (pkgs.lib.nix-rice.palette.toRGBShortHex pkgs.rice.palette).normal.black; }; + + programs.ironbar = { + enable = true; + systemd = true; + config = { + monitors."DP-1" = { + position = "top"; + height = 16; + start = [ + { + type = "music"; + player_type = "mpris"; + } + ]; + center = [ + { + type = "focused"; + icon_size = 16; + truncate = "middle"; + } + ]; + end = [ + {type = "clock";} + {type = "tray";} + ]; + }; + }; + }; + + systemd.user.services.ironbar = { + Unit.PartOf = ["graphical-session.target"]; + Unit.After = [ + "graphical-session.target" + "niri.service" + ]; + Install.WantedBy = ["graphical-session.target"]; + }; + + xdg.configFile = { + "sirula/config.toml".text = '' + exclusive = false + icon_size = 24 + lines = 2 + anchor_left = false + anchor_right = true + anchor_bottom = false + anchor_top = false + width = 320 + height = 720 + command_prefix = ":" + frequent_first = true + recent_first = true + term_command = "kitty {}" + ''; + + "sirula/style.css".text = let + pal = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.palette; + in '' + #root-box { + background-color: ${pal.normal.black}; + color: ${pal.normal.yellow}; + font-family: '${pkgs.rice.fonts.sans.name}'; + } + /* what's the name of the highlighted search text? + color: ${pal.normal.white}; + */ + ''; + }; } diff --git a/home/programs/atuin.nix b/home/programs/atuin.nix index 4a442b0..26728ff 100644 --- a/home/programs/atuin.nix +++ b/home/programs/atuin.nix @@ -1,5 +1,4 @@ -{...}: -{ +{...}: { programs.atuin = { enable = true; enableZshIntegration = true; @@ -12,5 +11,4 @@ style = "compact"; }; }; - } diff --git a/home/programs/kitty.nix b/home/programs/kitty.nix index d844a27..4cf83c6 100644 --- a/home/programs/kitty.nix +++ b/home/programs/kitty.nix @@ -37,6 +37,7 @@ in { color14 = bright.cyan; color15 = bright.white; sync_to_monitor = "yes"; + # shell = "elvish"; }; }; } diff --git a/home/programs/wlogout.nix b/home/programs/wlogout.nix index 1f20b4e..e13ebb6 100644 --- a/home/programs/wlogout.nix +++ b/home/programs/wlogout.nix @@ -8,6 +8,7 @@ in { programs.wlogout = { enable = true; + package = pkgs.wleave; layout = builtins.fromJSON (builtins.readFile ../dots/wlogout/layout); style = with palette-hex; (builtins.replaceStrings [ @@ -34,4 +35,33 @@ in { ] (builtins.readFile ../dots/wlogout/style.css)); }; + # xdg.configFile = { + # "wleave/layout".text = builtins.readFile ../dots/wlogout/layout; + # "wleave/style.css".text = with palette-hex; (builtins.replaceStrings + # [ + # "/usr/share/wlogout" + # "/etc/wlogout" + # "#WINBG" + # "#BTNCOL" + # "#BTNBG" + # "#BTNFOCUSBG" + # "#WINLOGO" + # ] + # [ + # "${pkgs.wleave}/share/wleave" + # "${pkgs.wleave}/etc/wleave" + # util.bg + # bright.yellow + # util.bg + # normal.black + # (builtins.path { + # name = "winlogo"; + # path = ../icons/winlogo.png; + # sha256 = "7c1ff96b553c7a7ca3a7b7cf8efe830ab7feea92355aed288a10ee7347c24108"; + # }) + # ] + # (builtins.readFile ../dots/wlogout/style.css)); + # }; + + home.packages = [pkgs.wlogout]; } diff --git a/system/cachix.nix b/system/cachix.nix index 5264490..77e69b3 100644 --- a/system/cachix.nix +++ b/system/cachix.nix @@ -15,17 +15,19 @@ in { "https://cache.nixos.org" "https://nix-community.cachix.org" "https://helix.cachix.org" - "https://cosmic.cachix.org" "https://cuda-maintainers.cachix.org" - "https://hyprland.cachix.org" + "https://cache.garnix.io" + "https://walker-git.cachix.org" + "https://anmonteiro.nix-cache.workers.dev" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" + "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=" ]; }; } diff --git a/system/configuration.nix b/system/configuration.nix index 7a48f08..20a954d 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -54,22 +54,34 @@ ./modules/docs.nix ./modules/nix-meta.nix ./modules/anal-retentive.nix + ./modules/niri.nix ]; - programs.niri = { - enable = true; - package = pkgs.niri-unstable; - }; - hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; boot.tmp.useTmpfs = true; - services.libinput.enable = true; + services.udev.extraHwdb = '' + evdev:atkbd:* + KEYBOARD_KEY_3a=esc + ''; + # services.xserver.xkb.options = "caps:swapescape"; + services.xserver.xkb.extraLayouts."swap" = { + description = "caps swap"; + languages = [ "eng" ]; + symbolsFile = pkgs.writeText "keyboard" '' + xkb_symbols + { + include "us(basic)" - # busted as hell - # services.usbmuxd.enable = true; # for iphone + key {[ Escape ]}; + } + ''; + }; + services.kmscon.useXkbConfig = true; + console.useXkbConfig = true; + services.libinput.enable = true; hardware.graphics.enable = true; hardware.graphics.enable32Bit = true; @@ -90,10 +102,8 @@ eza git jujutsu - ]; - services.atuin.enable = true; programs.nh = { diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix deleted file mode 100644 index 6ffbf7b..0000000 --- a/system/modules/hyprland.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, inputs, ...}: -{ - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.x86_64-linux.hyprland; - portalPackage = inputs.hyprland.packages.x86_64-linux.xdg-desktop-portal-hyprland; - }; -} diff --git a/system/modules/niri.nix b/system/modules/niri.nix index beedda4..5798756 100644 --- a/system/modules/niri.nix +++ b/system/modules/niri.nix @@ -1,4 +1,18 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { + services.greetd = { + enable = true; + settings = { + default_session = let + tuigreet = "${lib.getExe pkgs.greetd.tuigreet}"; + in { + command = "${tuigreet} -g yo -r"; + }; + }; + }; programs.niri = { enable = true; package = pkgs.niri-unstable; diff --git a/system/modules/term.nix b/system/modules/term.nix index 2d3d059..967c56e 100644 --- a/system/modules/term.nix +++ b/system/modules/term.nix @@ -1,10 +1,11 @@ {pkgs, ...}: let - inherit (pkgs) murex zsh; + inherit (pkgs) murex zsh elvish; in { environment.pathsToLink = ["/share/zsh"]; programs.zsh.enable = true; environment.systemPackages = [ murex + elvish ]; environment.shells = [murex]; users.defaultUserShell = murex; diff --git a/system/quiver.nix b/system/quiver.nix index 6fbb5ef..6802ebd 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -3,6 +3,7 @@ lib, pkgs, mainUser, + inputs, ... }: { imports = [ @@ -107,12 +108,15 @@ # }; # }; - services.hardware.openrgb = { - enable = true; - motherboard = "amd"; - }; + # services.hardware.openrgb = { + # enable = true; + # motherboard = "amd"; + # }; - hardware.ckb-next.enable = true; + hardware.ckb-next= { + enable = true; + package = inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next; + }; environment.systemPackages = with pkgs; [ wl-clipboard diff --git a/util/gtk-theme.nix b/util/gtk-theme.nix index 2d7a536..f1b400e 100644 --- a/util/gtk-theme.nix +++ b/util/gtk-theme.nix @@ -9,8 +9,8 @@ in src = pkgs.fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; - rev = "6e5850388a25f424b8193fe4523504d1dc364175"; - sha256 = "sha256-I6hpH0VTmftU4+/pRbztuTQcBKcOFBFbNZXJL/2bcgU="; + rev = "d7f59a37ef51f893c28b55dc344146e04b2cd52c"; + sha256 = "sha256-PnpFAmKEpfg3wBwShLYviZybWQQltcw7fpsQkTUZtww="; }; buildInputs = with pkgs; [ sassc diff --git a/util/rice.nix b/util/rice.nix index 6891975..c5bfede 100644 --- a/util/rice.nix +++ b/util/rice.nix @@ -1,5 +1,4 @@ -final: prev: -let +final: prev: let inherit (prev.lib.nix-rice) kitty-themes; inherit (prev.lib.nix-rice.palette) toRGBShortHex toRgbHex; # theme = kitty-themes.parseTheme ./op.pal;