From 9f365bbb9c792131967f85a315fc6e20ccab563b Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 26 Apr 2025 11:48:17 +0200 Subject: [PATCH] chore: flake update --- flake.lock | 248 +++++++++++++---------------- hosts/ward/guests/firefly.nix | 5 +- nix/devshell.nix | 2 +- pkgs/0000-zha-none-value.patch | 74 --------- pkgs/default.nix | 12 +- secrets/global.nix.age | Bin 3609 -> 3617 bytes users/config/shell/zsh/default.nix | 20 +-- users/myuser/default.nix | 2 +- users/myuser/neovim/lsp.nix | 7 +- 9 files changed, 137 insertions(+), 233 deletions(-) delete mode 100644 pkgs/0000-zha-none-value.patch diff --git a/flake.lock b/flake.lock index 69e16bd..121a024 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -36,11 +36,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741545559, - "narHash": "sha256-K28WBQoi1XSFfuakma+TJveihNbhpYMZUGYwvjAmic8=", + "lastModified": 1742656338, + "narHash": "sha256-Vkg5dyXKwoAfEVlKPxbCbdTCF9sXmTySZBSL28Kcdmo=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "86f26bd7401b8c1e1bde2b9479e88d3b532488d8", + "rev": "b677dbe0d675c68a19dedbc771aff22de76b11ea", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "crane_3": { "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "owner": "ipetkov", "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -451,11 +451,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1741628778, - "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -801,11 +801,11 @@ "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -954,11 +954,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1185,15 +1185,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_3" + ] }, "locked": { - "lastModified": 1744136669, - "narHash": "sha256-033f44gmj3aTN4as/dX8O0qMnhA497eM1OABprp9fcM=", + "lastModified": 1745656186, + "narHash": "sha256-r0wuxF3YQK4Vi3nmBymbyy+lyqzgMww7pcQ+KHKPP8s=", "owner": "oddlama", "repo": "home-manager", - "rev": "c1f5072d3fad49b96894182ea43115ea73873668", + "rev": "0226691e1fab209dafda1da563653d89dc3b66e7", "type": "github" }, "original": { @@ -1211,7 +1210,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_3", - "treefmt-nix": "treefmt-nix_4" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1740386689, @@ -1256,16 +1255,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -1282,11 +1281,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", + "lastModified": 1745271491, + "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", + "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", "type": "github" }, "original": { @@ -1317,11 +1316,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1741893540, - "narHash": "sha256-NEsR+FQ+AsY4cOZ3OL69JVdPTAYzSzBqeAhHGRRuDGk=", + "lastModified": 1745262696, + "narHash": "sha256-hbk/u7Tyl7PUw+e9fa2Vk3VKchy7zovEAjichIoZvTM=", "owner": "astro", "repo": "microvm.nix", - "rev": "5bbc126db87b5ffc36394df630eead403c48fac8", + "rev": "ae53cb29425c3077d7b088bec5d2bd9275594db3", "type": "github" }, "original": { @@ -1423,11 +1422,11 @@ ] }, "locked": { - "lastModified": 1741619381, - "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", + "lastModified": 1745120797, + "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", + "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", "type": "github" }, "original": { @@ -1446,11 +1445,11 @@ "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { - "lastModified": 1738246091, - "narHash": "sha256-2+KkZsRO+XlOFbXbRgMZbRtlqn5MBNYj4HNmZ/2Tojg=", + "lastModified": 1744142264, + "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", "owner": "oddlama", "repo": "nix-topology", - "rev": "5526269fa3eedf4f4bc00c0bf7a03db31d24b029", + "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", "type": "github" }, "original": { @@ -1506,11 +1505,11 @@ ] }, "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -1521,11 +1520,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -1557,11 +1556,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -1585,11 +1584,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -1624,14 +1623,14 @@ }, "nixpkgs-lib_5": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs-stable": { @@ -1668,11 +1667,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1736320768, + "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", "type": "github" }, "original": { @@ -1691,11 +1690,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743844372, - "narHash": "sha256-59T+ikFiTt0CiSvuja3/xYahT6SL2s3XtNykfG8l0gk=", + "lastModified": 1745593478, + "narHash": "sha256-GV0YnG6ZLW+BDsEKS2rjTtKcfTcTbdlVaf0ESQDBsK8=", "owner": "nix-community", "repo": "nixvim", - "rev": "7b4311333b542178828e90f6997d8f03e8327b89", + "rev": "b72ba2e4e2af53269a19b99bf684480f3ad4a78f", "type": "github" }, "original": { @@ -1711,14 +1710,14 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_5" + "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1741693509, - "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "lastModified": 1745459908, + "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", "owner": "nix-community", "repo": "NUR", - "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", "type": "github" }, "original": { @@ -1737,11 +1736,11 @@ ] }, "locked": { - "lastModified": 1743201766, - "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -1830,11 +1829,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1949,11 +1948,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -2093,7 +2092,7 @@ "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_6", "stylix": "stylix", - "treefmt-nix": "treefmt-nix_6", + "treefmt-nix": "treefmt-nix_5", "whisper-overlay": "whisper-overlay", "wired-notify": "wired-notify" } @@ -2150,11 +2149,11 @@ ] }, "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", + "lastModified": 1741573199, + "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", + "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", "type": "github" }, "original": { @@ -2168,11 +2167,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730341826, - "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", + "lastModified": 1740709839, + "narHash": "sha256-4dF++MXIXna/AwlZWDKr7bgUmY4xoEwvkF1GewjNrt0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", + "rev": "b4270835bf43c6f80285adac6f66a26d83f0f277", "type": "github" }, "original": { @@ -2271,11 +2270,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741976991, - "narHash": "sha256-74Q3Kpzde+S3pWaZihNFMjCn8lo4wmDVmg+Uvw8YLLQ=", + "lastModified": 1745618823, + "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=", "owner": "danth", "repo": "stylix", - "rev": "e43eb4e2a7dfbd96454df2b1c9418299b4373773", + "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126", "type": "github" }, "original": { @@ -2426,11 +2425,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1741468895, - "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -2442,11 +2441,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740877430, - "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -2536,27 +2535,6 @@ } }, "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "home-manager", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_4": { "inputs": { "nixpkgs": [ "idmail", @@ -2577,7 +2555,7 @@ "type": "github" } }, - "treefmt-nix_5": { + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "stylix", @@ -2599,18 +2577,18 @@ "type": "github" } }, - "treefmt-nix_6": { + "treefmt-nix_5": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { @@ -2673,11 +2651,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1730615238, - "narHash": "sha256-u/ZGtyEUvAkFOBgLo2YldOx0GKjE3/esWpWruRD376E=", + "lastModified": 1743305055, + "narHash": "sha256-NIsi8Dno9YsOLUUTrLU4p+hxYeJr3Vkg1gIpQKVTaDs=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "1632418aa15889343028261663e81d8b5595860e", + "rev": "75d43f54a02b15f2a15f5c1a0e1c7d15100067a6", "type": "github" }, "original": { diff --git a/hosts/ward/guests/firefly.nix b/hosts/ward/guests/firefly.nix index c86dba0..bf549b3 100644 --- a/hosts/ward/guests/firefly.nix +++ b/hosts/ward/guests/firefly.nix @@ -11,7 +11,7 @@ in { wireguard.proxy-home = { client.via = "ward"; - firewallRuleForNode.sausebiene.allowedTCPPorts = [ config.services.firefly.port ]; + firewallRuleForNode.sausebiene.allowedTCPPorts = [ 80 ]; }; globals.services.firefly.domain = fireflyDomain; @@ -55,8 +55,7 @@ in nodes.ward-web-proxy = { services.nginx = { upstreams.firefly = { - servers."${config.wireguard.proxy-home.ipv4}:${toString config.services.firefly.settings.server.http_port}" = - { }; + servers."${config.wireguard.proxy-home.ipv4}:80" = { }; extraConfig = '' zone firefly 64k; keepalive 2; diff --git a/nix/devshell.nix b/nix/devshell.nix index 9f5ca78..cd41585 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -26,7 +26,7 @@ devshells.default = { packages = [ - pkgs.nix # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions. + (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions. ]; commands = [ diff --git a/pkgs/0000-zha-none-value.patch b/pkgs/0000-zha-none-value.patch deleted file mode 100644 index 5877add..0000000 --- a/pkgs/0000-zha-none-value.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 4d9b897f73ccb24c32c48584667fd71b8eb433e9 Mon Sep 17 00:00:00 2001 -From: puddly <32534428+puddly@users.noreply.github.com> -Date: Tue, 8 Apr 2025 20:01:07 -0400 -Subject: [PATCH] Ignore "non-value" values for sensors - ---- - zha/application/platforms/sensor/__init__.py | 26 ++++++++++++++------ - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/zha/application/platforms/sensor/__init__.py b/zha/application/platforms/sensor/__init__.py -index 73cc7fe1..e9d7ad30 100644 ---- a/zha/application/platforms/sensor/__init__.py -+++ b/zha/application/platforms/sensor/__init__.py -@@ -17,6 +17,7 @@ - from zigpy import types - from zigpy.quirks.v2 import ZCLEnumMetadata, ZCLSensorMetadata - from zigpy.state import Counter, State -+from zigpy.zcl import foundation - from zigpy.zcl.clusters.closures import WindowCovering - from zigpy.zcl.clusters.general import Basic - -@@ -297,10 +298,25 @@ def handle_cluster_handler_attribute_updated( - ): - self.maybe_emit_state_changed_event() - -+ def _is_non_value(self, value: int) -> bool: -+ # Ignore "non-value" values -+ try: -+ attr_def = self._cluster_handler.cluster.find_attribute( -+ self._attribute_name -+ ) -+ except ValueError: -+ return False -+ -+ data_type = foundation.DataType.from_type_id(attr_def.zcl_type) -+ return value == data_type.non_value -+ - def formatter( - self, value: int | enum.IntEnum - ) -> datetime | int | float | str | None: - """Numeric pass-through formatter.""" -+ if self._is_non_value(value): -+ return None -+ - if self._decimals > 0: - return round( - float(value * self._multiplier) / self._divisor, self._decimals -@@ -885,10 +901,10 @@ class Illuminance(Sensor): - - def formatter(self, value: int) -> int | None: - """Convert illumination data.""" -+ if self._is_non_value(value): -+ return None - if value == 0: - return 0 -- if value == 0xFFFF: -- return None - return round(pow(10, ((value - 1) / 10000))) - - -@@ -1244,12 +1260,6 @@ class Flow(Sensor): - _attr_native_unit_of_measurement = UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR - _attr_primary_weight = 1 - -- def formatter(self, value: int) -> datetime | int | float | str | None: -- """Handle unknown value state.""" -- if value == 0xFFFF: -- return None -- return super().formatter(value) -- - - @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_TEMPERATURE) - class Temperature(Sensor): - diff --git a/pkgs/default.nix b/pkgs/default.nix index 52c749b..42128dc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,13 +12,11 @@ _inputs: [ wrapProgram $out/bin/nvim --add-flags "--clean" ''; }); - pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ - (_pythonFinal: pythonPrev: { - zha = pythonPrev.zha.overrideAttrs { - patches = [ ./0000-zha-none-value.patch ]; - }; - }) - ]; + # pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + # (_pythonFinal: pythonPrev: { + # xy = pythonPrev.xy.overrideAttrs { }; + # }) + # ]; mdns-repeater = prev.callPackage ./mdns-repeater.nix { }; diff --git a/secrets/global.nix.age b/secrets/global.nix.age index 43d79534b94bf1d07df44e820945152ae8d57a3a..38567d8a1319331f915fc845bb495597dff0778f 100644 GIT binary patch literal 3617 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 ndY!ZP@8Dr9r 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