From 605b6279cad1b9b5a80d74941794f175e670e9ea Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 15 Mar 2025 12:44:18 +0100 Subject: [PATCH] chore: update flake --- flake.lock | 665 +++++++----------- flake.nix | 2 +- .../clock-weather-card/package.json | 54 -- .../clock-weather-card/package.nix | 52 -- hosts/sausebiene/home-assistant.nix | 4 +- hosts/sausebiene/pip.nix | 192 ----- hosts/sausebiene/wfw.nix | 346 --------- hosts/sausebiene/wyoming.nix | 9 - 8 files changed, 267 insertions(+), 1057 deletions(-) delete mode 100644 hosts/sausebiene/hass-lovelace/clock-weather-card/package.json delete mode 100644 hosts/sausebiene/hass-lovelace/clock-weather-card/package.nix delete mode 100644 hosts/sausebiene/pip.nix delete mode 100644 hosts/sausebiene/wfw.nix diff --git a/flake.lock b/flake.lock index a9af58b..9c52bdc 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737808592, - "narHash": "sha256-zSr8rSnaDlsifQhKW6kLKr+zZj0h9jbx/DQ8V7PENhM=", + "lastModified": 1741545559, + "narHash": "sha256-K28WBQoi1XSFfuakma+TJveihNbhpYMZUGYwvjAmic8=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "a1dcdd27ff12a24f0d3ac1fe016ed08e1a89291f", + "rev": "86f26bd7401b8c1e1bde2b9479e88d3b532488d8", "type": "github" }, "original": { @@ -102,16 +102,17 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1735953590, - "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -151,11 +152,11 @@ }, "crane_3": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1741148495, + "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "type": "github" }, "original": { @@ -235,11 +236,11 @@ ] }, "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -277,11 +278,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -316,28 +317,6 @@ "nixpkgs": [ "nixos-extra-modules", "nixpkgs" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1701787589, - "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=", - "owner": "numtide", - "repo": "devshell", - "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_7": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" ] }, "locked": { @@ -354,7 +333,7 @@ "type": "github" } }, - "devshell_8": { + "devshell_7": { "inputs": { "flake-utils": "flake-utils_6", "nixpkgs": [ @@ -383,11 +362,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -431,11 +410,11 @@ "pyproject-nix": "pyproject-nix_2" }, "locked": { - "lastModified": 1732214960, - "narHash": "sha256-ViyEMSYwaza6y55XTDrsRi2K4YKCLsefMTorjWSE27s=", + "lastModified": 1735160684, + "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=", "owner": "nix-community", "repo": "dream2nix", - "rev": "a8dac99db44307fdecead13a39c584b97812d0d4", + "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4", "type": "github" }, "original": { @@ -472,11 +451,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1736899990, - "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -502,23 +481,6 @@ } }, "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_11": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -533,7 +495,7 @@ "type": "github" } }, - "flake-compat_12": { + "flake-compat_11": { "flake": false, "locked": { "lastModified": 1696426674, @@ -616,11 +578,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -648,11 +610,11 @@ "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -662,17 +624,19 @@ } }, "flake-compat_9": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-parts": { @@ -719,11 +683,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -737,11 +701,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -758,11 +722,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -779,11 +743,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -793,6 +757,28 @@ } }, "flake-parts_7": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_8": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -810,7 +796,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_9": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_5" }, @@ -866,14 +852,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -884,7 +870,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -923,7 +909,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1701680307, @@ -956,49 +942,23 @@ } }, "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_7", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { "inputs": { "flake-compat": [ "stylix", "flake-compat" ], - "gitignore": "gitignore_9", + "gitignore": "gitignore_8", "nixpkgs": [ "stylix", "nixpkgs" ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1029,28 +989,6 @@ "type": "github" } }, - "gitignore_10": { - "inputs": { - "nixpkgs": [ - "whisper-overlay", - "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": [ @@ -1147,28 +1085,6 @@ "nixpkgs" ] }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_7": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, "locked": { "lastModified": 1709087332, "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", @@ -1183,7 +1099,7 @@ "type": "github" } }, - "gitignore_8": { + "gitignore_7": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -1204,7 +1120,7 @@ "type": "github" } }, - "gitignore_9": { + "gitignore_8": { "inputs": { "nixpkgs": [ "stylix", @@ -1226,6 +1142,28 @@ "type": "github" } }, + "gitignore_9": { + "inputs": { + "nixpkgs": [ + "whisper-overlay", + "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" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -1250,32 +1188,11 @@ ] }, "locked": { - "lastModified": 1737299337, - "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -1296,11 +1213,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1732405639, - "narHash": "sha256-/amsyYIdOMr3ZUrkbiFYEDtYfNeRw+mWExCisQL2Cj0=", + "lastModified": 1740386689, + "narHash": "sha256-qe3WU3s3UhfF4Q/1eVNyXG3Xq4zINKN++AUhvHbTeNE=", "owner": "oddlama", "repo": "idmail", - "rev": "0e7170cc5888f33c3c630390f9601771ae0bb2b8", + "rev": "392c475e90831d00a94bbe6e7e032fc5a271b57a", "type": "github" }, "original": { @@ -1311,11 +1228,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -1364,11 +1281,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1737299073, - "narHash": "sha256-hOydnO9trHDo3qURqLSDdmE/pHNWDzlhkmyZ/gcBX2s=", + "lastModified": 1741442524, + "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64d20cb2afaad8b73f4e38de41d27fb30a782bb5", + "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", "type": "github" }, "original": { @@ -1399,11 +1316,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1736905611, - "narHash": "sha256-eW6SfZRaOnOybBzhvEzu3iRL8IhwE0ETxUpnkErlqkE=", + "lastModified": 1741893540, + "narHash": "sha256-NEsR+FQ+AsY4cOZ3OL69JVdPTAYzSzBqeAhHGRRuDGk=", "owner": "astro", "repo": "microvm.nix", - "rev": "a18d7ba1bb7fd4841191044ca7a7f895ef2adf3b", + "rev": "5bbc126db87b5ffc36394df630eead403c48fac8", "type": "github" }, "original": { @@ -1485,11 +1402,11 @@ "treefmt": "treefmt_2" }, "locked": { - "lastModified": 1732342495, - "narHash": "sha256-7qfvmnJQByEtl5bS+rTydLCe3Saz9kMRaJxPCdqb1wQ=", + "lastModified": 1739773009, + "narHash": "sha256-OqIMaQfP2/jwwugFGPSOT2VStbjiHRtH8rJt5tyBneM=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "ae9de2d06519a3bb26b649e1c0d1cfa22c20dc0e", + "rev": "ec2afcecb37f72b16cbd9e0cbd4547e44c2961b4", "type": "github" }, "original": { @@ -1498,27 +1415,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1526,11 +1422,11 @@ ] }, "locked": { - "lastModified": 1737257306, - "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", + "lastModified": 1741619381, + "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "744d330659e207a1883d2da0141d35e520eb87bd", + "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", "type": "github" }, "original": { @@ -1549,11 +1445,11 @@ "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { - "lastModified": 1737379892, - "narHash": "sha256-M5FfyuvKAd5K8H0IZedlXaN04IvJesmWRhE9sviQNCQ=", + "lastModified": 1738246091, + "narHash": "sha256-2+KkZsRO+XlOFbXbRgMZbRtlqn5MBNYj4HNmZ/2Tojg=", "owner": "oddlama", "repo": "nix-topology", - "rev": "21dceaf1a116f648a286a66516612c7e2b726306", + "rev": "5526269fa3eedf4f4bc00c0bf7a03db31d24b029", "type": "github" }, "original": { @@ -1588,11 +1484,11 @@ "pre-commit-hooks": "pre-commit-hooks_5" }, "locked": { - "lastModified": 1737813840, - "narHash": "sha256-XuaDHWeUGsCTvGb+61ztE/6kFPC70ZU2LtBnJvRf2ag=", + "lastModified": 1738095226, + "narHash": "sha256-JprmheIKPIs1iqvGpISJEW0v/19yyUxpLOqqBH5RM3g=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "0660c722cf4b703214022a7ca5fbda8a5fe428ee", + "rev": "86bb6fb118c59bcda460815c33932bc3d18c1430", "type": "github" }, "original": { @@ -1609,11 +1505,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -1624,11 +1520,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737359802, - "narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61c79181e77ef774ab0468b28a24bc2647d498d6", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -1660,16 +1556,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1742002193, + "narHash": "sha256-zf9xEtVjvkR0h1+PfrJF2usNCiyzmWVw2AK0eMTJwmA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "a17b3fe5a72d0eb137b95f74a84cff6a7eee0af5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1688,26 +1584,29 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs-lib_4": { @@ -1751,54 +1650,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_5": { "locked": { "lastModified": 1718447546, "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", @@ -1832,24 +1683,18 @@ }, "nixvim": { "inputs": { - "devshell": "devshell_7", - "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_6", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_4" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1737832569, - "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", + "lastModified": 1741709061, + "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", "owner": "nix-community", "repo": "nixvim", - "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", + "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", "type": "github" }, "original": { @@ -1858,6 +1703,29 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_7", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_4" + }, + "locked": { + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_4", @@ -1868,11 +1736,11 @@ ] }, "locked": { - "lastModified": 1737372689, - "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -1912,11 +1780,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -1958,15 +1826,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_3" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -2006,15 +1873,14 @@ "nixpkgs": [ "idmail", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -2053,23 +1919,18 @@ "pre-commit-hooks_5": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": [ - "nixos-extra-modules", - "flake-utils" - ], "gitignore": "gitignore_6", "nixpkgs": [ "nixos-extra-modules", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_4" + ] }, "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -2080,18 +1941,18 @@ }, "pre-commit-hooks_6": { "inputs": { - "flake-compat": "flake-compat_10", - "gitignore": "gitignore_8", + "flake-compat": "flake-compat_9", + "gitignore": "gitignore_7", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1737301351, - "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -2102,13 +1963,13 @@ }, "pre-commit-hooks_7": { "inputs": { - "flake-compat": "flake-compat_12", - "gitignore": "gitignore_10", + "flake-compat": "flake-compat_11", + "gitignore": "gitignore_9", "nixpkgs": [ "whisper-overlay", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1718879355, @@ -2267,11 +2128,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1739759407, + "narHash": "sha256-YIrVxD2SaUyaEdMry2nAd2qG1E0V38QIV6t6rpguFwk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "6e6ae2acf4221380140c22d65b6c41f4726f5932", "type": "github" }, "original": { @@ -2288,11 +2149,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1741228283, + "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "type": "github" }, "original": { @@ -2390,9 +2251,9 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_10", "flake-utils": "flake-utils_5", - "git-hooks": "git-hooks_2", + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -2400,18 +2261,20 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7", + "nur": "nur", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737207873, - "narHash": "sha256-XTCuMv753lpm8DvdVf9q2mH3rhlfsKrCUYbaADPC/bA=", + "lastModified": 1741976991, + "narHash": "sha256-74Q3Kpzde+S3pWaZihNFMjCn8lo4wmDVmg+Uvw8YLLQ=", "owner": "danth", "repo": "stylix", - "rev": "51ad2cec11e773a949bdbec88bed2524f098f49a", + "rev": "e43eb4e2a7dfbd96454df2b1c9418299b4373773", "type": "github" }, "original": { @@ -2525,21 +2388,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -2574,14 +2422,30 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1735737224, - "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { @@ -2678,11 +2542,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { @@ -2694,16 +2558,17 @@ "treefmt-nix_4": { "inputs": { "nixpkgs": [ - "nixvim", + "stylix", + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { @@ -2719,11 +2584,11 @@ ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -2741,11 +2606,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { @@ -2756,8 +2621,8 @@ }, "whisper-overlay": { "inputs": { - "devshell": "devshell_8", - "flake-parts": "flake-parts_7", + "devshell": "devshell_7", + "flake-parts": "flake-parts_8", "nixpkgs": [ "nixpkgs" ], @@ -2779,7 +2644,7 @@ }, "wired-notify": { "inputs": { - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_9", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 8011a80..a597106 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixvim = { url = "github:nix-community/nixvim"; diff --git a/hosts/sausebiene/hass-lovelace/clock-weather-card/package.json b/hosts/sausebiene/hass-lovelace/clock-weather-card/package.json deleted file mode 100644 index 27d6f02..0000000 --- a/hosts/sausebiene/hass-lovelace/clock-weather-card/package.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "clock-weather-card", - "version": "2.8.7", - "description": "Lovelace clock-weather-card", - "keywords": [ - "home-assistant", - "homeassistant", - "hass", - "automation", - "lovelace", - "custom-cards" - ], - "module": "clock-weather-card.js", - "repository": "git@github.com:pkissling/clock-weather-card.git", - "author": "Patrick Kissling ", - "license": "MIT", - "type": "module", - "dependencies": { - "custom-card-helpers": "^1.8.0", - "home-assistant-js-websocket": "^9.0.0", - "lit": "^2.8.0", - "luxon": "^3.4.3" - }, - "devDependencies": { - "@babel/core": "^7.15.0", - "@babel/plugin-proposal-class-properties": "^7.14.5", - "@babel/plugin-proposal-decorators": "^7.14.5", - "@rollup/plugin-babel": "^6.0.0", - "@rollup/plugin-image": "^3.0.0", - "@rollup/plugin-json": "^6.0.0", - "@rollup/plugin-node-resolve": "^16.0.0", - "@types/luxon": "^3.3.2", - "@typescript-eslint/eslint-plugin": "^7.0.0", - "@typescript-eslint/parser": "^7.0.0", - "eslint": "^8.0.1", - "eslint-config-standard-with-typescript": "^43.0.0", - "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0 || ^16.0.0 || ^17.0.0", - "eslint-plugin-promise": "^7.0.0", - "rollup": "^4.0.0", - "rollup-plugin-commonjs": "^10.1.0", - "rollup-plugin-gzip": "^4.0.0", - "rollup-plugin-serve": "^3.0.0", - "@rollup/plugin-terser": "^0.4.0", - "rollup-plugin-typescript2": "^0.36.0", - "typescript": "*" - }, - "scripts": { - "start": "rollup -c rollup.config.dev.js --watch", - "build": "yarn rollup", - "lint": "eslint **/*.ts --max-warnings 0", - "rollup": "rollup -c" - } -} diff --git a/hosts/sausebiene/hass-lovelace/clock-weather-card/package.nix b/hosts/sausebiene/hass-lovelace/clock-weather-card/package.nix deleted file mode 100644 index dfd5b6b..0000000 --- a/hosts/sausebiene/hass-lovelace/clock-weather-card/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - fetchFromGitHub, - mkYarnPackage, - fetchYarnDeps, -}: -mkYarnPackage rec { - pname = "clock-weather-card"; - version = "2.8.7"; - - src = fetchFromGitHub { - owner = "pkissling"; - repo = "clock-weather-card"; - rev = "v${version}"; - hash = "sha256-ylJNI0DE+3j8EZFpUmuuBnII8nBMrJ5bhlGVh3M25eo="; - }; - - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - hash = "sha256-EUuPF2kS6CaJ2MUYoBocLOQyOgkhRHd34ul+efJua7Q="; - }; - - buildPhase = '' - runHook preBuild - - yarn build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir $out - cp ./deps/clock-weather-card/dist/clock-weather-card.js $out/ - - runHook postInstall - ''; - - doDist = false; - - meta = with lib; { - description = "A Home Assistant Card indicating today's date/time, along with an iOS inspired weather forecast for the next days with animated icons"; - homepage = "https://github.com/pkissling/clock-weather-card"; - changelog = "https://github.com/pkissling/clock-weather-card/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ oddlama ]; - mainProgram = "clock-weather-card"; - platforms = platforms.linux; - }; -} diff --git a/hosts/sausebiene/home-assistant.nix b/hosts/sausebiene/home-assistant.nix index 70c8f1e..821bbf3 100644 --- a/hosts/sausebiene/home-assistant.nix +++ b/hosts/sausebiene/home-assistant.nix @@ -65,15 +65,13 @@ in ]; customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [ - (builtins.trace "soon upstreamed" ( - pkgs.callPackage ./hass-lovelace/clock-weather-card/package.nix { } - )) (pkgs.callPackage ./hass-lovelace/config-template-card/package.nix { }) (pkgs.callPackage ./hass-lovelace/hui-element/package.nix { }) apexcharts-card bubble-card button-card card-mod + clock-weather-card hourly-weather lg-webos-remote-control mini-graph-card diff --git a/hosts/sausebiene/pip.nix b/hosts/sausebiene/pip.nix deleted file mode 100644 index 90abefc..0000000 --- a/hosts/sausebiene/pip.nix +++ /dev/null @@ -1,192 +0,0 @@ -{ - config, - lib, - pkgs, - utils, - ... -}: - -let - cfg = config.services.wyoming.piper; - - inherit (lib) - mkOption - mkEnableOption - mkPackageOption - types - ; - - inherit (builtins) - toString - ; - - inherit (utils) - escapeSystemdExecArgs - ; -in - -{ - options.services.wyoming.piper = with types; { - package = mkPackageOption pkgs "wyoming-piper" { }; - - servers = mkOption { - default = { }; - description = '' - Attribute set of wyoming-piper instances to spawn. - ''; - type = types.attrsOf ( - types.submodule (_: { - options = { - enable = mkEnableOption "Wyoming Piper server"; - - piper = mkPackageOption pkgs "piper-tts" { }; - - voice = mkOption { - type = str; - example = "en-us-ryan-medium"; - description = '' - Name of the voice model to use. See the following website for samples: - https://rhasspy.github.io/piper-samples/ - ''; - }; - - uri = mkOption { - type = strMatching "^(tcp|unix)://.*$"; - example = "tcp://0.0.0.0:10200"; - description = '' - URI to bind the wyoming server to. - ''; - }; - - speaker = mkOption { - type = ints.unsigned; - default = 0; - description = '' - ID of a specific speaker in a multi-speaker model. - ''; - apply = toString; - }; - - noiseScale = mkOption { - type = numbers.between 0.0 1.0; - default = 0.667; - description = '' - Generator noise value. - ''; - apply = toString; - }; - - noiseWidth = mkOption { - type = numbers.between 0.0 1.0; - default = 0.333; - description = '' - Phoneme width noise value. - ''; - apply = toString; - }; - - lengthScale = mkOption { - type = numbers.between 0.0 1.0; - default = 1.0; - description = '' - Phoneme length value. - ''; - apply = toString; - }; - - extraArgs = mkOption { - type = listOf str; - default = [ ]; - description = '' - Extra arguments to pass to the server commandline. - ''; - }; - }; - }) - ); - }; - }; - - config = - let - inherit (lib) - mapAttrs' - mkIf - nameValuePair - ; - in - mkIf (cfg.servers != { }) { - systemd.services = mapAttrs' ( - server: options: - nameValuePair "wyoming-piper-${server}" { - inherit (options) enable; - description = "Wyoming Piper server instance ${server}"; - wants = [ - "network-online.target" - ]; - after = [ - "network-online.target" - ]; - wantedBy = [ - "multi-user.target" - ]; - serviceConfig = { - DynamicUser = true; - User = "wyoming-piper"; - StateDirectory = [ "wyoming/piper" ]; - # https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run - ExecStart = escapeSystemdExecArgs ( - [ - (lib.getExe cfg.package) - "--data-dir" - "/var/lib/wyoming/piper" - "--uri" - options.uri - "--piper" - (lib.getExe options.piper) - "--voice" - options.voice - "--speaker" - options.speaker - "--length-scale" - options.lengthScale - "--noise-scale" - options.noiseScale - "--noise-w" - options.noiseWidth - ] - ++ options.extraArgs - ); - CapabilityBoundingSet = ""; - DeviceAllow = ""; - DevicePolicy = "closed"; - LockPersonality = true; - MemoryDenyWriteExecute = true; - PrivateDevices = true; - PrivateUsers = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectControlGroups = true; - ProtectProc = "invisible"; - ProcSubset = "pid"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - ]; - UMask = "0077"; - }; - } - ) cfg.servers; - }; -} diff --git a/hosts/sausebiene/wfw.nix b/hosts/sausebiene/wfw.nix deleted file mode 100644 index a79cf04..0000000 --- a/hosts/sausebiene/wfw.nix +++ /dev/null @@ -1,346 +0,0 @@ -{ - config, - lib, - pkgs, - utils, - ... -}: - -let - cfg = config.services.wyoming.faster-whisper; - - inherit (lib) - mkOption - mkEnableOption - mkPackageOption - types - ; - - inherit (builtins) - toString - ; - - inherit (utils) - escapeSystemdExecArgs - ; - -in - -{ - options.services.wyoming.faster-whisper = with types; { - package = mkPackageOption pkgs "wyoming-faster-whisper" { }; - - servers = mkOption { - default = { }; - description = '' - Attribute set of wyoming-faster-whisper instances to spawn. - ''; - type = types.attrsOf ( - types.submodule (_: { - options = { - enable = mkEnableOption "Wyoming faster-whisper server"; - - model = mkOption { - type = str; - default = "tiny-int8"; - example = "Systran/faster-distil-whisper-small.en"; - description = '' - Name of the voice model to use. Can also be a HuggingFace model ID or a path to - a custom model directory. - - Compressed models (`int8`) are slightly less accurate, but smaller and faster. - - Available models: - - `tiny-int8` (compressed) - - `tiny` - - `tiny.en` (English only) - - `base-int8` (compressed) - - `base` - - `base.en` (English only) - - `small-int8` (compressed) - - `distil-small.en` (distilled, English only) - - `small` - - `small.en` (English only) - - `medium-int8` (compressed) - - `distil-medium.en` (distilled, English only) - - `medium` - - `medium.en` (English only) - - `large` - - `large-v1` - - `distil-large-v2` (distilled, English only) - - `large-v2` - - `distil-large-v3` (distilled, English only) - - `large-v3` - - `turbo` (faster than large-v3) - ''; - }; - - uri = mkOption { - type = strMatching "^(tcp|unix)://.*$"; - example = "tcp://0.0.0.0:10300"; - description = '' - URI to bind the wyoming server to. - ''; - }; - - device = mkOption { - # https://opennmt.net/CTranslate2/python/ctranslate2.models.Whisper.html# - type = types.enum [ - "cpu" - "cuda" - "auto" - ]; - default = "cpu"; - description = '' - Determines the platform faster-whisper is run on. CPU works everywhere, CUDA requires a compatible NVIDIA GPU. - ''; - }; - - language = mkOption { - type = enum [ - # https://github.com/home-assistant/addons/blob/master/whisper/config.yaml#L20 - "auto" - "af" - "am" - "ar" - "as" - "az" - "ba" - "be" - "bg" - "bn" - "bo" - "br" - "bs" - "ca" - "cs" - "cy" - "da" - "de" - "el" - "en" - "es" - "et" - "eu" - "fa" - "fi" - "fo" - "fr" - "gl" - "gu" - "ha" - "haw" - "he" - "hi" - "hr" - "ht" - "hu" - "hy" - "id" - "is" - "it" - "ja" - "jw" - "ka" - "kk" - "km" - "kn" - "ko" - "la" - "lb" - "ln" - "lo" - "lt" - "lv" - "mg" - "mi" - "mk" - "ml" - "mn" - "mr" - "ms" - "mt" - "my" - "ne" - "nl" - "nn" - "no" - "oc" - "pa" - "pl" - "ps" - "pt" - "ro" - "ru" - "sa" - "sd" - "si" - "sk" - "sl" - "sn" - "so" - "sq" - "sr" - "su" - "sv" - "sw" - "ta" - "te" - "tg" - "th" - "tk" - "tl" - "tr" - "tt" - "uk" - "ur" - "uz" - "vi" - "yi" - "yue" - "yo" - "zh" - ]; - example = "en"; - description = '' - The language used to to parse words and sentences. - ''; - }; - - initialPrompt = mkOption { - type = nullOr str; - default = null; - example = '' - The following conversation takes place in the universe of Wizard of Oz. Key terms include 'Yellow Brick Road' (the path to follow), 'Emerald City' (the ultimate goal), and 'Ruby Slippers' (the magical tools to succeed). Keep these in mind as they guide the journey. - ''; - description = '' - Optional text to provide as a prompt for the first window. This can be used to provide, or - "prompt-engineer" a context for transcription, e.g. custom vocabularies or proper nouns - to make it more likely to predict those word correctly. - ''; - }; - - beamSize = mkOption { - type = ints.unsigned; - default = 0; - example = 5; - description = '' - The number of beams to use in beam search. - Use `0` to automatically select a value based on the CPU. - ''; - apply = toString; - }; - - extraArgs = mkOption { - type = listOf str; - default = [ ]; - description = '' - Extra arguments to pass to the server commandline. - ''; - }; - }; - }) - ); - }; - }; - - config = - let - inherit (lib) - mapAttrs' - mkIf - nameValuePair - ; - in - mkIf (cfg.servers != { }) { - systemd.services = mapAttrs' ( - server: options: - nameValuePair "wyoming-faster-whisper-${server}" { - inherit (options) enable; - description = "Wyoming faster-whisper server instance ${server}"; - wants = [ - "network-online.target" - ]; - after = [ - "network-online.target" - ]; - wantedBy = [ - "multi-user.target" - ]; - # https://github.com/rhasspy/wyoming-faster-whisper/issues/27 - environment."HF_HUB_CACHE" = "/tmp"; - serviceConfig = { - DynamicUser = true; - User = "wyoming-faster-whisper"; - StateDirectory = [ "wyoming/faster-whisper" ]; - # https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run - ExecStart = escapeSystemdExecArgs ( - [ - (lib.getExe cfg.package) - "--data-dir" - "/var/lib/wyoming/faster-whisper" - "--uri" - options.uri - "--device" - options.device - "--model" - options.model - "--language" - options.language - "--beam-size" - options.beamSize - ] - ++ lib.optionals (options.initialPrompt != null) [ - "--initial-prompt" - options.initialPrompt - ] - ++ options.extraArgs - ); - CapabilityBoundingSet = ""; - DeviceAllow = - if - builtins.elem options.device [ - "cuda" - "auto" - ] - then - [ - # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf - "char-nvidia-uvm" - "char-nvidia-frontend" - "char-nvidia-caps" - "char-nvidiactl" - ] - else - ""; - DevicePolicy = "closed"; - LockPersonality = true; - MemoryDenyWriteExecute = true; - PrivateUsers = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectControlGroups = true; - ProtectProc = "invisible"; - # "all" is required because faster-whisper accesses /proc/cpuinfo to determine cpu capabilities - ProcSubset = "all"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - ]; - UMask = "0077"; - }; - } - ) cfg.servers; - }; -} diff --git a/hosts/sausebiene/wyoming.nix b/hosts/sausebiene/wyoming.nix index 7c254fb..6428396 100644 --- a/hosts/sausebiene/wyoming.nix +++ b/hosts/sausebiene/wyoming.nix @@ -1,13 +1,4 @@ { - disabledModules = [ - "services/home-automation/wyoming/faster-whisper.nix" - "services/home-automation/wyoming/piper.nix" - ]; - imports = [ - (builtins.trace "remove after next flake update" ./wfw.nix) - (builtins.trace "remove after next flake update" ./pip.nix) - ]; - environment.persistence."/persist".directories = [ { directory = "/var/lib/private/wyoming";