From e015fb9c1b619216052ce7520060cb30a2e1a305 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 24 Oct 2024 19:08:12 -0400 Subject: [PATCH] chore: update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'astal': 'github:Aylur/astal/306e649' (2024-10-23) → 'github:Aylur/astal/61727b0' (2024-10-24) • Updated input 'firefox-gx-src': 'github:Godiesc/firefox-gx/153523b' (2024-10-19) → 'github:Godiesc/firefox-gx/eed2d63' (2024-10-24) • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=422f214' (2024-10-22) → 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=5ffa725' (2024-10-24) • Updated input 'home-manager': 'github:nix-community/home-manager/5ec753a' (2024-10-21) → 'github:nix-community/home-manager/a4353cc' (2024-10-23) • Updated input 'hyprland': 'github:hyprwm/Hyprland/cdac649' (2024-10-23) → 'github:hyprwm/Hyprland/3cec45d' (2024-10-24) • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS/82bdda1' (2024-10-21) → 'github:Jovian-Experiments/Jovian-NixOS/899f84d' (2024-10-24) • Updated input 'material-symbols-src': 'github:beecho01/material-symbols/26224d6' (2024-10-23) → 'github:beecho01/material-symbols/f32fef0' (2024-10-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1997e4a' (2024-10-20) → 'github:NixOS/nixpkgs/2768c7d' (2024-10-23) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/7832830' (2024-10-23) → 'github:nix-community/nixpkgs-wayland/6adff06' (2024-10-24) • Updated input 'pcsd': 'github:matt1432/nixos-pcsd/fe8f65b' (2024-10-14) → 'github:matt1432/nixos-pcsd/774ed5f' (2024-10-24) • Updated input 'sops-nix': 'github:Mic92/sops-nix/d089e74' (2024-10-23) → 'github:Mic92/sops-nix/78a0e63' (2024-10-24) Docker Images: • vegardit/gitea-act-runner dind-latest: sha256:456898884eb289ef4590e654804e05b84866279495768bf12bc91451ca160329 → sha256:fe6f44905830a17f404e9912e2c4fe2f4a2c47bb3ee35409da6476618cf9dab5 --- common/packages.nix | 16 +---- .../docker/forgejo/images/act_runner.nix | 4 +- devices/nos/modules/llm.nix | 55 +++--------------- flake.lock | Bin 57613 -> 57613 bytes .../custom-sidebar/default.nix | 2 +- overlays/build-failures/default.nix | 4 -- 6 files changed, 12 insertions(+), 69 deletions(-) diff --git a/common/packages.nix b/common/packages.nix index 3d1076ba..1600c22f 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -14,21 +14,7 @@ inputs @ { (self.overlays) xdg-desktop-portal-kde ; - }) - ++ [ - # FIXME: https://pr-tracker.nelim.org/?pr=349200 - (final: prev: { - tailscale = prev.tailscale.overrideAttrs rec { - version = "1.76.1"; - src = final.fetchFromGitHub { - owner = "tailscale"; - repo = "tailscale"; - rev = "v${version}"; - hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw="; - }; - }; - }) - ]; + }); environment.systemPackages = (builtins.attrValues { diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix index 10f51bbb..bad9150a 100644 --- a/devices/nos/modules/docker/forgejo/images/act_runner.nix +++ b/devices/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:456898884eb289ef4590e654804e05b84866279495768bf12bc91451ca160329"; - sha256 = "1pgcd1lk9x93q16l732yfd7dz3ywc0yjrdyfxj5p5y5x9ni30dpz"; + imageDigest = "sha256:fe6f44905830a17f404e9912e2c4fe2f4a2c47bb3ee35409da6476618cf9dab5"; + sha256 = "0jci209g7qqsqa1qi87fjj00q1yz8d4wj7gqsy4la8jjrkb23arg"; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/llm.nix b/devices/nos/modules/llm.nix index 466bbd66..2b5684fa 100644 --- a/devices/nos/modules/llm.nix +++ b/devices/nos/modules/llm.nix @@ -1,8 +1,4 @@ -{ - pkgs, - self, - ... -}: let +{self, ...}: let tailscaleIP = "100.64.0.4"; in { imports = [self.nixosModules.wyoming-plus]; @@ -12,49 +8,14 @@ in { services = { # Speech-to-Text - wyoming.faster-whisper = { - # FIXME: https://pr-tracker.nelim.org/?pr=350083 - package = - (pkgs.wyoming-faster-whisper.override { - python3Packages = - (pkgs.python3.override { - packageOverrides = pyfinal: pyprev: { - faster-whisper = pyprev.faster-whisper.overridePythonAttrs { - version = "unstable-2024-07-26"; - src = pkgs.fetchFromGitHub { - owner = "SYSTRAN"; - repo = "faster-whisper"; - rev = "d57c5b40b06e59ec44240d93485a95799548af50"; - hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; - }; - pythonRelaxDeps = [ - "tokenizers" - "av" - ]; - }; - }; - }) - .pkgs; - }) - .overridePythonAttrs rec { - version = "2.2.0"; - src = pkgs.fetchFromGitHub { - owner = "rhasspy"; - repo = "wyoming-faster-whisper"; - rev = "refs/tags/v${version}"; - hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48="; - }; - }; + wyoming.faster-whisper.servers."en" = { + enable = true; + uri = "tcp://${tailscaleIP}:10300"; - servers."en" = { - enable = true; - uri = "tcp://${tailscaleIP}:10300"; - - # see https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0 - model = "medium"; - language = "en"; - device = "cuda"; - }; + # see https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0 + model = "medium"; + language = "en"; + device = "cuda"; }; # Text-to-Intent diff --git a/flake.lock b/flake.lock index adc2c5a94f283ffa164f6b5bdfcef2bfa989a69e..099d3da9a69f0290be2bd71bc132636f06e85c44 100644 GIT binary patch delta 1513 zcmXw3OKcNI7*<6dkg8H>f$%605G_`M@XYKyk%*Mo-q=nY$FaS3eCq7%Y;c^!k2p@^ zs^Un61T>ioJpk>sry{Eo>Y-Fz+FR+NH!Ahs3!JN#PMmg+D}D3*-{b%9y*P63#gT72 z$A&l{f^qZa;`s@cr_Ibvvys`!NI#cA2(8p;ba8XGkPUOGm3a_%TaE2>lr;9wjG5O1 zXU)Tr(Y?QiuTsbm^8xfFpdn|JQY?c&N$zOIu=0^F1EI9}`ll=Av!vghYVL3IOGw+-^WwPTuqIG}* z>Sz#X#H9?Rpj@z!!w@SarGNlQ=%CQ#j?P&CG><->=oK$59Uru+u`u%4g=@(y+uX`| z-gY%zpYv%I#&Fz=t}ZWtM!b>pM4Yg-a=BUc8vLet`QW7a@!7lPlruI%!ca0q9Lf;J zeuywcP!gai;0}~R2LN#gaen#Q$oPNX<(BTm>RTJ_%Qwb3B?kTmdtW(!9UWwl3UV;c zgzGQO%`PnkK(24rqNRMa=!vabny(gMP(h9KOe()qD^G4Usd@VAm}&exVE*~+ycxfF zF(R=;9Hp=mKpzJI^#d)HmI7#BAjy5^GcHBI%+vMx{hQppcjKep=+xbz0S&dvA;FF~wDOOst5#zQnzXS6;al*Xa8@}o&tuP5V zg3tj31`g32Q*HkM21UTN1R(>!JoVr?wi+0w}KIe)iXwr)=#aT!@fcrGTO!3>66i0d3XL0X_9K z=7eaQl7A3?@A`86s4cs|9QHYv+Bny{XK_Zlu4+E|ad;Y3>y7$eem60Jz34@2E(`#xyR!&zIQ)^igth-&$ z@le^NJJD=op;Ywva@5T%&IY`4Xz=L$56pvihRoE1vk}B7S1bS+NrwfR65oeD@f}2Y zs03%4I9OrP7i>oFU+7)CgGUAhA_yM{o)D#t?P^`EE>`BI-IXGo$8K@Eo~4~Otkt_a z(UlF!cSA3U>*md+{~JBNe|NzAxpyu?rHvL)$U}?;2f((55D_xvI6zB@IOWzG$`4CD zZYLhLxD)0Rdd1wnGu-=QfA83!b>AW8i-C)iV4fEwz$gs?!OK`G>;#hGE?p0h&^RGAR%EsMiePKmV%l(5-}KR$pV2xKzye9 z*Tw>Sj~_i5A7qRmX7&ayOr}w%ootHDZMa=p2eObUHxh~I?xq(jW-9SQLX%o`W?8Am ze4@|&_VyX`{SW6Nc5Cfbad4=(y@GbH3AIeN3O0L1g=B;%Y!mA99)eC7@XM9nm(Sam F{slx6<5K_t delta 1505 zcmXw3J8YX(6c&&sZ4e?rY5JgPTD2wA6}j&RqLrN3j_Wu{?YNHZiF^NhZ{zrx__rGy zA;ba*399riAW@(z6P1NjF;LX08+1ToU|>f`upuEHzXP28=sV|oz5n2e_a8j*Meoo! zhg4AHe>-(D*0A%*)lTU~uC(kFA6&%?wWXF@+sbYi+pC4fMr}!V955^0O5h(mcEtZW zcHDnBIpu#jckn!5mJumM0JVcoOUVNWq)=8O!>n=EVHg;Hx0oHR4L_V*fBpa_3_!m( zHgll{dcDj>zPOw0#4OE*;Yz33j&0_5t}IlGn~BY8WhvQot{?08M~_eYwOKI-DW(W( zJ_1lyYt6I^h+qNcgb5C<0!A?x_}szeXaV}$=PwMeoz6dVfI-TLSNCQvx=g-?+TD6* zV=U$ZDem<68@=I&JCw7zc)SxDW(3Ihcg!v)$4`L zU9yttk#HkfZETkZyZy$MO6porxSqoa*sJuHL@FVR{_dk`|7rfXzn?tp|K6LJ3ycaP z5;(9zk^mzJjU+}1iKx>~Mnq7gs3egVc6dLz{_FuF5yT_uWBpQNv7&B(tCpl?sfQO5 z>#dww@78TEvy#T7v=inMxW`qiyl=Xf%a`~5oR||x8>1isTso~S0fB)QF@poG9R(6c z`co8uk^IA#%dLZB96{ix9-fM=Z6s8!N0WrgbR!ooG_P*K2HXM}Qtea#aEpBVdNs`B zFfJm*qy9_H{OY?CbBG~C45Qeo2v}S0={^#E}U5pjSxP-ORTuDaBG__=WjkX?l0dw{vwQ0Y>8475)4rQmE$&|U2&%jWQ5qr z>dqm5=eew(`e0^w@f|WbhA<@indZyYcBb0AY8yz#%G+p149aU+lP&BlELXG5WZKr( z7D*)oHhu2x|IIvm>%B4m^WKR$E+XbI;6Pg=2!c^ZamAR3Xh+Bdk|QS_Qc^tLhCkifJ2WnYkWsgd+>Mt@^R8i7qsvgCs|&dmy*j_0hWQwbcj_Bk z@zmyadXvP{=GL)k|Eqbye{%bXzZ_1ScUCw?wNQ|Y00j~=2ptEJQ6wg#6A`i6_(xB- z{O=!6`8Q6U9sY3J&W