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 edcec0ad..aea96c7d 100644 Binary files a/apps/extract-subs/package-lock.json and b/apps/extract-subs/package-lock.json differ 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 fd4f924c..3cf8a4b6 100644 Binary files a/apps/update-sources/package-lock.json and b/apps/update-sources/package-lock.json differ diff --git a/apps/update-sources/package.json b/apps/update-sources/package.json index 381356bf..37623e34 100644 --- a/apps/update-sources/package.json +++ b/apps/update-sources/package.json @@ -8,7 +8,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/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix index 32bd0daf..841503c8 100644 --- a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:4115e5d74af0ff37e5b993ae736a070737c478978701853ddb1431b71839ab49"; - hash = "sha256-ibJT7GcH1NBac5Suurk4jx2+dhdtTDXZsMFwcBsNWWQ="; + imageDigest = "sha256:c72b284fe82f6c2bf676d55a3e5354e53108095a8d698ac1c9211b5b854c79d4"; + hash = "sha256-L80CePRKz+zFCAPinQKSgM6m3M0ADAbkhawfL7Yzh8w="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/media/seerr/images/jellyseerr.nix b/configurations/nos/modules/docker/media/seerr/images/jellyseerr.nix index cdf7371e..3c1d30a6 100644 --- a/configurations/nos/modules/docker/media/seerr/images/jellyseerr.nix +++ b/configurations/nos/modules/docker/media/seerr/images/jellyseerr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "docker.io/fallenbagel/jellyseerr"; - imageDigest = "sha256:fe72f4b341fa5c3275826a39aebfff23cbd552c956b0ab2d51dfba6a49b528f8"; - hash = "sha256-gwkU2gNM8/V5b/z8I5k7Jo25ydLknUj4GF3MCuY+XS0="; + imageDigest = "sha256:a324fa4d81cce73116801bee3c50b632f3457c0ca0ad31aa692c640e22f50dea"; + hash = "sha256-AmmNSrpzNQ1bb2Jh5dSBFZhBpuc5lOzoJiVEkLZpvGY="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix b/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix index 6c6b8a23..76643fd8 100644 --- a/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix +++ b/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sonarr"; - imageDigest = "sha256:ca4ad72f07e532d1d414435eb43193d1dc407255e46c21c2694653ca8af4fd81"; - hash = "sha256-TdsBz8lkZSjBrcHB2QVxa9sWKoI66HhjstGss2FkVZU="; + imageDigest = "sha256:6221d75e172247220c320bb340ce0ff96a09339216de52b8d861424bfc501cef"; + hash = "sha256-+fnvtqiXa/xxUiNp14eLjjd699zSBhx4G47iF401EGU="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 792122f4..04be6ccd 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index d0766546..e01d18e8 100644 Binary files a/flake.nix and b/flake.nix differ 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; [