From 4a2ad3911488f8f8016855f10d9ae005df48b5c4 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 4 Jan 2025 03:23:45 -0500 Subject: [PATCH] chore: update sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'astal': 'github:Aylur/astal' (2025-01-02) rev: 207557dd2b069a33bb78ce3ab3c83cd8bec7a58d → 'github:Aylur/astal' (2025-01-03) rev: a3bb83a22b7d237c2c2fc6bd531f30d6265135cf • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2024-12-31) rev: fbaa73bfc7c61bbe9e3c9d6077a46d758ae12a9f → 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-01-03) rev: 621f253f000863688d32f4f9a5a57db4690735c7 • Updated input 'home-manager': 'github:nix-community/home-manager' (2025-01-01) rev: 5f6aa268e419d053c3d5025da740e390b12ac936 → 'github:nix-community/home-manager' (2025-01-03) rev: a9987622b7b93c82e147f198574e8e6ffbf5e327 • Updated input 'hyprland': 'github:hyprwm/Hyprland' (2025-01-01) rev: dde3e082c96cd6987420556bfc430cd5b8e0980c → 'github:hyprwm/Hyprland' (2025-01-03) rev: 60f069d54015fec66e63f1ff7e6ff26ddb349976 • Updated input 'hyprland-plugins': 'github:hyprwm/hyprland-plugins' (2024-12-27) rev: a41bcdccac7d3fe220b3a8519633f0a812da3439 → 'github:hyprwm/hyprland-plugins' (2025-01-02) rev: 920af33577a889772e96a067130252df5674ca8a • Updated input 'hyprutils': 'github:hyprwm/hyprutils' (2025-01-01) rev: c42ce87eb3fe9f3c5fd62f370afe5a7170ebda44 → 'github:hyprwm/hyprutils' (2025-01-03) rev: fb9a816cb91c6b6c4fcdc348d56fd54ba524546d • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS' (2024-12-27) rev: a86d9cf841eff8b33a05d2bf25788abd8e018dbd → 'github:Jovian-Experiments/Jovian-NixOS' (2025-01-03) rev: 7e530766a5fd9b7577296fedd655f3255f7495d8 • Updated input 'nh': 'github:viperML/nh' (2024-12-11) rev: 6a69a145b0c7dbd5616bbded512b8bf8b5d2f8a4 → 'github:viperML/nh' (2025-01-02) rev: b7a857066e726dafe9c5f00a8af6ab3f25036ee1 • Updated input 'nix-gaming': 'github:fufexan/nix-gaming' (2025-01-01) rev: a3a26749e81ba3691451adf793242acf2d758574 → 'github:fufexan/nix-gaming' (2025-01-03) rev: afc74611082ecc4a961e4317fa2763c8812e217f • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2024-12-29) rev: 88195a94f390381c6afcdaa933c2f6ff93959cb4 → 'github:NixOS/nixpkgs' (2025-01-02) rev: 6df24922a1400241dae323af55f30e4318a6ca65 • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2024-12-22) rev: 8988b0603fed7e3d303718328cf4cd8dd137575e → 'github:nix-community/nixpkgs-wayland' (2025-01-03) rev: 42ccba23ce4661f9a1df9c4455533888ca123683 • Updated input 'sops-nix': 'github:Mic92/sops-nix' (2024-12-29) rev: bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27 → 'github:Mic92/sops-nix' (2025-01-02) rev: 24d89184adf76d7ccc99e659dc5f3838efb5ee32 • Updated input 'spotifyplus-src': 'github:thlucas1/homeassistantcomponent_spotifyplus' (2025-01-01) rev: 0cf00348e5d4317fee0a37675670d5a2f26614f0 → 'github:thlucas1/homeassistantcomponent_spotifyplus' (2025-01-03) rev: a55a6fbd3b9ea4664e90ae5c74a7936345008cf7 • Updated input 'spotifywebapi-src': 'github:thlucas1/SpotifyWebApiPython' (2025-01-01) rev: 33e38186dac5c28dc98ed14dbea08987ef66a031 → 'github:thlucas1/SpotifyWebApiPython' (2025-01-03) rev: be9d8420897f06789a00077f227f5a87a22c2fd4 • Updated input 'ts-for-gir-src': 'github:gjsify/ts-for-gir' (2024-11-16) rev: a366faa3d1912cbce931d3f2d489efdf06306093 → 'github:gjsify/ts-for-gir' (2025-01-02) rev: 8bb1e5670198b52be53d5585915a1a3f8cc324ed • Updated input 'tuya-local-src': 'github:make-all/tuya-local' (2025-01-01) rev: 80eae9dd82fea2f4b1f02193b1cfa9eda2d89365 → 'github:make-all/tuya-local' (2025-01-04) rev: 28f344ece2e4f1b8824000fea1a40276bb097cf5 Docker Images: • rssbridge/rss-bridge latest: sha256:4115e5d74af0ff37e5b993ae736a070737c478978701853ddb1431b71839ab49 → sha256:c72b284fe82f6c2bf676d55a3e5354e53108095a8d698ac1c9211b5b854c79d4 • docker.io/fallenbagel/jellyseerr latest: sha256:fe72f4b341fa5c3275826a39aebfff23cbd552c956b0ab2d51dfba6a49b528f8 → sha256:a324fa4d81cce73116801bee3c50b632f3457c0ca0ad31aa692c640e22f50dea • ghcr.io/linuxserver/sonarr latest: sha256:ca4ad72f07e532d1d414435eb43193d1dc407255e46c21c2694653ca8af4fd81 → sha256:6221d75e172247220c320bb340ce0ff96a09339216de52b8d861424bfc501cef Node modules: @types/node: 22.10.3 -> 22.10.5 --- apps/extract-subs/default.nix | 2 +- apps/extract-subs/package-lock.json | Bin 65179 -> 65179 bytes apps/extract-subs/package.json | 2 +- apps/update-sources/default.nix | 2 +- apps/update-sources/package-lock.json | Bin 65459 -> 65459 bytes apps/update-sources/package.json | 2 +- .../docker/freshrss/images/rss-bridge.nix | 4 +-- .../docker/media/seerr/images/jellyseerr.nix | 4 +-- .../docker/media/sonarr/images/sonarr.nix | 4 +-- flake.lock | Bin 57252 -> 57226 bytes flake.nix | Bin 11861 -> 11835 bytes modules/desktop/environment/modules/audio.nix | 30 ++++++++++-------- outputs.nix | 5 +-- overlays/build-failures/default.nix | 5 --- .../extended-ollama-conversation/default.nix | 2 +- 15 files changed, 28 insertions(+), 34 deletions(-) diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index c733a366..589088d3 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-Ke1os0/XJi2eRJSqEoEYsfWNtgcTO87Onem8bpBQ0/M="; + npmDepsHash = "sha256-Ze7WxJ4WVso3Bn+jEDstLhGPjI29kKoJrdeZFiW6jZ0="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index edcec0adb57d2642f20ef4b01d38217ffa235cee..aea96c7d454e9802155e36f1a4234ba6d16c8ae2 100644 GIT binary patch delta 139 zcmbRJmwEPI<_+%|8BHe(vWRSEVRB3aGB>JQOwLbWo7|Et1d`Cu2z9dv)DBK{&&)0N z&$lp3%giqe%&;iTj7W2H%`no>PmU}zF9|g*@G^Fd@C^>G$TsxK&oV7fO)GHoHcImd oNz?Z;^YC^LuJCkm3b9NxPIs<|2*{qi&_Z}}LcPQ0^c0g>0J~~04gdfE delta 137 zcmbRJmwEPI<_+%|8I30kvWRSEVRB3aGB>JQOwLbWo7|EtG+FVQW~fVMnqy_TiBon_ zX_~XAPnnBxX>wkvpG9hAN@!ZLzO$iwPGwP^r?!u`nW>3!xv9R7aad|tdYXZ0zOj=@ pT48WRfMJSvq>q18v3FW&NkK(GRaDXB!Z6{<3H1(}(^E`l0RZEJFa!Vq diff --git a/apps/extract-subs/package.json b/apps/extract-subs/package.json index 8afbf74a..32a55f1a 100644 --- a/apps/extract-subs/package.json +++ b/apps/extract-subs/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "eslint-conf": "file:../config", - "@types/node": "22.10.3", + "@types/node": "22.10.5", "esbuild": "0.24.2", "eslint": "9.17.0", "jiti": "2.4.2", diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 8e719e0c..9dd53400 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -9,7 +9,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-rXAf3REz6xFkZbb435Jk+Ya81tt+1ubspi+Lodf2V4Y="; + npmDepsHash = "sha256-XncG28x8w3Ufi1jZBrYa+CQMeYnqPTP8bSoLuHAHtNM="; runtimeInputs = [ go diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index fd4f924c624754c86a03609efb9f7c0f35265c27..3cf8a4b60033a4a7354431996e94afb7ccaa0e88 100644 GIT binary patch delta 133 zcmdn|pLz3t<_)=wjHZ(p_K9t7VcZ=LVscwdULVIcxh_#?GE;zNsGCKgc5teDW^TEE zzJ*y@W`0>-yAcaP==qgHh2oaS)#ea}Rmra2ss1nDM+{Inp-~G<_{l4!z zzrJ()$9Il@lsoZ+L{Pj}obyOxtGbh0>zNH5H#!?DZEa*}@j!Oh;CiUDySv_Qe;YOT z*k;DQaQ->_>deB8FHc-h*!Kli2>Dzi%mWl46EI&>3=IaFAx0slfqmoo_3^7SUw&&! zA|SXu){1zo+F~k{tDWW8N=8e#)Qui)jFvZn*w{f$znf}RYBg5NZsJDSzV`PQ?7f#~ z7a4*EQEUJJf?+0v#>fyO6;+gLpD+oygX8C3{_5Gs&$({6ztkEu`{%xMR$^x1^mF#% zKTg}fTzthYoSPeec=6`Ulq8&x$*HQ%<-j!3dxd7dkzWov_5Ge#r5JgQ{YJT$>SwmM z&7fAUHNBX9@N;h8kZ=Q~pqzvvWXAZ0h8S^s>Pmh5CV%bZ zv?PoJX#d?l<5icE$;xuIoa_O#iJ4hj(w@rkOr_J&8--TQv{wpgueYO{V50qpm%eFV zkDtE4fB{TuN&uuL3>XU;HqaP;1c;c{J|x1eLF=cQI!%-d<~_A{+w!5m~naZuZ2YZ;IP`BqmYPDZn_y08yk3Wt;>`D0}R3WqddB*^`bnA&5*^XZMI6CSjspuEvAv zO8#I_H>=&%_+G46C~USt1?5+9?GUbu)??NY`{~Z9Bi9*UDgjyGOX$qT0%8IkU?MbS z#>wF;iU=jlo|-u#9vOeSlbf277y@i>os29PT*w}%-qvnDHR|ri>gydZidV9$nY=m3 z8+veHK%p>frlqtuelTm_E-laVkYd0YQ`BhbbH^A-W!U<-&^OC)PZQj0h>y%CYGco=}_dj2m z5=;?G<$vJ*F*c@C#UU|>nH8a<1gC#Z=V?d>K!;UO$8(1QL=OWUIC<8 zwm2$v>cio#>{R31C3INsujgt(Gbe#q2|CN|^q}REE$rO8({}b}&)Tce6Bh^y0$(8< zgoH8Z`UYwv141aJ7z-f+1(B;G`{2g<_=}&uzc3{T5%S1v-cmAK?-XT!F@@A{t=7m7 zP>>p^b`)erm3VQxpD9HLQ7;rFGEx5XJ7gXaEhH2~X~UW3K@dn8GAgw*0Cu4bjZZ_T z%|wXL?_9K?{G$ErZgE;-$q}B!tF@g;ZZrpk9D>8G97)4!n;oVzA=>xWc2-)4oxw`F zTyNysjok_E!`si>+kc?*ic-aludy#f<=B!?0u{PWC5pTL#Du!;4Gf=PKN@<){{D|Y za`_TcOemM>$jf-OONwtMJvW%+#dEvkIeS)_8EKgPv__T zP-;Qk1tGaBHZG)cJ{Svzgkwa)AVeWC&=&%^zyT9FECO7zeIH037;4pTHpXY}zxB2M1EFH1 A8UO$Q delta 2054 zcmb7_%a2=E9mf?VGYKL>lonD5Od3cPXKt%G=bn3Bn^YdZXYBFVGk&5{ou|i-@nd3- z?Lkq=rc#SQw5O{yML}YTsz#PrupljEL7(bBfJ7JUSOEJ-obmJ@VCO6O-1GZ=exL8} zzVZ0{?;oFkzjE;cgM_%z%C(?zSnHWy*tgwgN`S*cie~9BJB^CzLjFh%hr^~lz<9nj z%g5dI=fCG(zO?SXb^l^41QcVcbtnPh0wF0WQw9l%6hlfgX%rQhX$Nm@FJ8X%+a(h zuEeYqf+A@ZRRl_DxIv0*0w@&`(G)XbU?{kCkH5Hbo}L1LT5v; z!s>XloEujPVLRUEvYOErPJ^Ja31@u_jwZX4UM5lL1Yk+};q4!|SCdz7YHg4KEL5B* zO*o@b2rwp|M1+9SSTX}R18==#{okK)zxex&#Ve_eb1Nao47%SPt*y7S$z&RKJHfP0 zZ8o#t+7<|0$0+rlL?8Mve4$a*GtUnuHcnAgsZHLJEx3;uNaC z_RIas$_hdt0`Ae}we`Y5y)}V@`Qf~CaL~*&_}ol)2K}vWe<$8)_f86#-3CnCLYXc* zeZ85A2}U$mmPOE5%OpYqU~jbzF=b3h?dd|MDC!`EP$h)(0_CIr{H6RtP5`@=ae`FSQ2wjUMdu)4h}0 zjvnCVILDGgn|qNMmQ(FB)DP~$Q_KQ+k7>jWgHj;EeKAmIOF0T7@30L| zGlgliDBbl1<)R76;%h2RLO&=PAo;+QLW*6sgwp!617yzxtLX*FV=2X*HL zYe6=ZxHI3w7zW#8Yt>1zHKWsw+40e&p4}c)Y_wIUvs#c+a`1J$H)D)5<~JGe&S`3p zMgURBP{@>x{5I1XB8n+C?)q=;ES|i5w7wD%7V@R*%}%8wkM{uS*vO`O#dLIRSSs6* zLs_n7v-9EJc+gefmLtg%V29X}W{KPODjNGh@koaD3eFS8?sITqF~n>41JCaXJ!u+{pI= z#oXw_)=i)+04QPx>j*(=jR6Ar*I`0|#v-&KAuzJ;-qU&a!e4*rT7UV&DkT_mxZK^v zNe@(;2~@Ay3?@7K8!UUgLCg7a0L!I=&0w!vYGpdpkj+X?d{mDiWco(~0(k1w*G&XKaPieg_b;pv?8&=-57*X9WEMYE?frUk+_aUMB?{uwXk0F{&EtAx zbYu6gH>C#9=hcv4@foNxTlcE_QvtLM561%Nt_hfT08HH!x!v~+x zn?63o3V}5ATR}->ID&p-hT2PMthRt4uNHUUR^C1M1i0VQ8}9z6wN-km{aL8CTfEnb zcLlA_PbMgd`v=3>yjU+~Hv1?+a{c5)m2j<^JUVe7#;&-^XFSG$5r%8cLTmigA_*-B fAx9D_E4a}j)Qls7m-)I44 diff --git a/modules/desktop/environment/modules/audio.nix b/modules/desktop/environment/modules/audio.nix index db8b74c7..53e8f51f 100644 --- a/modules/desktop/environment/modules/audio.nix +++ b/modules/desktop/environment/modules/audio.nix @@ -4,22 +4,24 @@ in { imports = [nix-gaming.nixosModules.pipewireLowLatency]; config = { - hardware.pulseaudio.enable = false; + services = { + pulseaudio.enable = false; - services.pipewire = { - enable = true; - alsa.enable = true; - jack.enable = true; - pulse.enable = true; - lowLatency.enable = true; + pipewire = { + enable = true; + alsa.enable = true; + jack.enable = true; + pulse.enable = true; + lowLatency.enable = true; - extraConfig.pipewire-pulse.combine-sink = { - "pulse.cmd" = [ - { - cmd = "load-module"; - args = "module-combine-sink"; - } - ]; + extraConfig.pipewire-pulse.combine-sink = { + "pulse.cmd" = [ + { + cmd = "load-module"; + args = "module-combine-sink"; + } + ]; + }; }; }; }; diff --git a/outputs.nix b/outputs.nix index 86ae03e7..257d6a7f 100644 --- a/outputs.nix +++ b/outputs.nix @@ -11,10 +11,7 @@ nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - # ref = "nixos-unstable"; - - # FIXME: pinned this because of astal issues and build failures - rev = "88195a94f390381c6afcdaa933c2f6ff93959cb4"; + ref = "nixos-unstable"; }; home-manager = mkDep { diff --git a/overlays/build-failures/default.nix b/overlays/build-failures/default.nix index 179770b3..a2fe3df7 100644 --- a/overlays/build-failures/default.nix +++ b/overlays/build-failures/default.nix @@ -2,11 +2,6 @@ final: prev: { # FIXME: https://pr-tracker.nelim.org/?pr=357699 nodejs_latest = prev.nodejs_22; - # FIXME: https://pr-tracker.nelim.org/?pr=368790 - triton-llvm = prev.triton-llvm.override { - buildTests = false; - }; - # FIXME: https://github.com/NixOS/nixpkgs/issues/365156 protonmail-desktop = final.callPackage ({ lib, diff --git a/scopedPackages/hass-components/extended-ollama-conversation/default.nix b/scopedPackages/hass-components/extended-ollama-conversation/default.nix index efb42a0b..7fd18acf 100644 --- a/scopedPackages/hass-components/extended-ollama-conversation/default.nix +++ b/scopedPackages/hass-components/extended-ollama-conversation/default.nix @@ -17,7 +17,7 @@ in prePatch = '' substituteInPlace ./custom_components/extended_ollama_conversation/manifest.json \ - --replace-warn "openai~=1.3.8" "openai>=1.3.8" + --replace-warn "ollama~=0.3.0" "ollama>=0.3.0" ''; propagatedBuildInputs = with python3Packages; [