diff --git a/apps/config/package.json b/apps/config/package.json index 907e6863..0c12cd6a 100644 --- a/apps/config/package.json +++ b/apps/config/package.json @@ -4,9 +4,9 @@ "type": "module", "exports": "./index.ts", "devDependencies": { - "@eslint/js": "9.17.0", + "@eslint/js": "9.18.0", "@stylistic/eslint-plugin": "2.12.1", - "eslint": "9.17.0", + "eslint": "9.18.0", "eslint-plugin-jsdoc": "50.6.1", "jiti": "2.4.2", "pkg-types": "1.3.0", diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index 88f68f5c..c2308d31 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-VPvEbpLIuPx7Oax5UNEIf8/Gd34UMZkuQGt4bCnUwQQ="; + npmDepsHash = "sha256-x4xfn5NiIfNwL0NSHX5j4hj3g1N/Lv5qhgaKMCcu7x0="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index 3a94e884..1b7b7bab 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 4aef5749..e3f1fa95 100644 --- a/apps/extract-subs/package.json +++ b/apps/extract-subs/package.json @@ -14,7 +14,7 @@ "eslint-conf": "file:../config", "@types/node": "22.10.5", "esbuild": "0.24.2", - "eslint": "9.17.0", + "eslint": "9.18.0", "jiti": "2.4.2", "typescript": "5.7.3" } diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 88aa02de..3791ee10 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -9,7 +9,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-nAMu7riJm/6w+ixjzHm4W4YlqOkAwCapM3PHPW2BnnA="; + npmDepsHash = "sha256-jriJB5WgUtrXG1X4W0Gp/vF2bH4d1ZkU5LUBWJ1o46Y="; runtimeInputs = [ go diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index 95ef40e2..d2caae9e 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 c04599bc..71dca3a0 100644 --- a/apps/update-sources/package.json +++ b/apps/update-sources/package.json @@ -10,7 +10,7 @@ "eslint-conf": "file:../config", "@types/node": "22.10.5", "esbuild": "0.24.2", - "eslint": "9.17.0", + "eslint": "9.18.0", "jiti": "2.4.2", "pkg-types": "1.3.0", "typescript": "5.7.3" diff --git a/configurations/homie/modules/home-assistant/assist.nix b/configurations/homie/modules/home-assistant/assist.nix index 811c639f..76dab35c 100644 --- a/configurations/homie/modules/home-assistant/assist.nix +++ b/configurations/homie/modules/home-assistant/assist.nix @@ -13,6 +13,17 @@ home-assistant = { package = pkgs.home-assistant.override { packageOverrides = final: prev: { + # FIXME: https://pr-tracker.nelim.org/?pr=370782 + gevent = prev.gevent.overridePythonAttrs rec { + pname = "gevent"; + version = "24.11.1"; + + src = pkgs.fetchPypi { + inherit pname version; + hash = "sha256-i9FBkRTp5KPtM6W612av/5o892XLRApYKhs6m8gMGso="; + }; + }; + # HassTimer has way too many collisions with my custom timer sentences home-assistant-intents = prev.home-assistant-intents.overrideAttrs (o: { nativeBuildInputs = o.nativeBuildInputs ++ [pkgs.findutils]; diff --git a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix index 16d8bd65..9e84b5fb 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:10c4e470397dffb67322e7c66b679c9ebf618858b0f435f1095ff035a2881fe6"; - hash = "sha256-FwchGPgbyHbvxFbA6+edhRLclWLwxcR/xhFnURklXro="; + imageDigest = "sha256:2f94bc58b926a9ae2efb62c2bd08723b22adceb47d5590be00b56dc05ba2a0e3"; + hash = "sha256-h1vq77Z+zH1eYb8HfEaOFP/DmzlNgZfnEkoKjITug4Y="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/immich/images/machine-learning.nix b/configurations/nos/modules/docker/immich/images/machine-learning.nix index 6c07d0c2..f1105d5d 100644 --- a/configurations/nos/modules/docker/immich/images/machine-learning.nix +++ b/configurations/nos/modules/docker/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-machine-learning"; - imageDigest = "sha256:db61408634e608dde65ecda5b9d9cc8c20948d0e7b78b660bf33b3c526b6c1fd"; - hash = "sha256-c+yZWyrCcdQNc8tjEQZrgCVUulvgrg+4al8qPhBYqNs="; + imageDigest = "sha256:a134652b47278edfdac3187d61558e78679be39c810536193a41e9e0d894c5f4"; + hash = "sha256-GJXMjY1/wiXldnUB8iNZ0YzQoyqTNPSRqDq7CpsCwiQ="; finalImageName = imageName; finalImageTag = "release"; } diff --git a/configurations/nos/modules/docker/immich/images/server.nix b/configurations/nos/modules/docker/immich/images/server.nix index ae7df27c..ba10d38c 100644 --- a/configurations/nos/modules/docker/immich/images/server.nix +++ b/configurations/nos/modules/docker/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-server"; - imageDigest = "sha256:f86bb84d16bfa3364cad05529b903844c3c4da6f558a8fe4fe97ef6f152ca422"; - hash = "sha256-rnoBOzFTsXcjhHFe0rsQ5rOfZurBtTm4llngpR1fWTg="; + imageDigest = "sha256:c14dccad0611635668abf98f17ce87c3badcc17bb979c53ef96dc49e934ebbc8"; + hash = "sha256-9q84+Ueybv5jXRASWfBiQv62+gzHk8TDFjO5FsTxmSE="; finalImageName = imageName; finalImageTag = "release"; } diff --git a/configurations/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix b/configurations/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix index d4678976..f1007cef 100644 --- a/configurations/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix +++ b/configurations/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:80242140e786c1c73d867e8c84bba16c0ebd20cd27a5c6cf69196168b3fe5e35"; - hash = "sha256-Ur7RVoZylK7O8kqBd83FGmSO/lkspCsFrQ8rnmIqOYM="; + imageDigest = "sha256:a7fb5bd7208bfd5915c2527cef57dd8b00bdf684b68e5c9ec4326f10b6cf94b3"; + hash = "sha256-jAY/vxGsOSoCQKuLqzkgpasdCg/tOD2rxhUQwHKzcXE="; 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 05991889..699a6508 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:23f6911b2b81cb69aa03166b53c15081d5c3a5ed58f5b183c5900c2d8fc9759a"; - hash = "sha256-VUDLCXGaVXX/gQC9vsFeAPJmf1b0c/QRVYdSRfEK3FA="; + imageDigest = "sha256:ca71add37a9cdbb914c7bd5b06f98bf5d2062848c8de6ac3ee09e69a4c170b27"; + hash = "sha256-07eTk1vecDzqjgUw7XCR7tAgYbT8HC10FwdPAvV7iDg="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/resume/images/postgres.nix b/configurations/nos/modules/docker/resume/images/postgres.nix index 9b3e99aa..580b6093 100644 --- a/configurations/nos/modules/docker/resume/images/postgres.nix +++ b/configurations/nos/modules/docker/resume/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "postgres"; - imageDigest = "sha256:f85dd74a714c67792c72fc609becff10e0b0eaffca7b40aa1c6251d09c02b5d4"; - hash = "sha256-UOvKUq2TqVLk/KUgugUWWl568ikgj0ck9WV7YWlUqWI="; + imageDigest = "sha256:93a6166360be8f1d116b7ea97ebb8dea9e2c9c746349e952738bbba72a961d7c"; + hash = "sha256-jcjDWwm0HST3HSlmNxPXsewsaikvW3DA9+IAfVCpL2I="; finalImageName = imageName; finalImageTag = "15-alpine"; } diff --git a/flake.lock b/flake.lock index 971752bd..f0204004 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 93e9aaf3..61b16179 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs/default.nix b/inputs/default.nix index 0dd2260e..466c48e1 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -115,7 +115,7 @@ let owner = "hyprwm"; repo = "Hyprland"; - # FIXME: animation stuff is broken + # FIXME: hypr stuff not really working rev = "b9f110ef8726fcba2b4ee69856027731e73003a5"; inputs.hyprutils.follows = "hyprutils"; @@ -125,13 +125,16 @@ let owner = "hyprwm"; repo = "hyprland-plugins"; - # FIXME: animation stuff is broken + # FIXME: hypr stuff not really working rev = "b6b31113ce84419c69ed575c22194e4023d2952a"; }; hyprgrass = mkHyprDep { owner = "horriblename"; repo = "hyprgrass"; + + # FIXME: hypr stuff not really working + rev = "bdfa960b97ac98ad9d05c908ee20e053e2942928"; }; hyprpaper = mkDep { diff --git a/lib/pkgs/mk-types/default.nix b/lib/pkgs/mk-types/default.nix index 6e789b98..1f805c94 100644 --- a/lib/pkgs/mk-types/default.nix +++ b/lib/pkgs/mk-types/default.nix @@ -21,7 +21,7 @@ in pname = "${pname}-types"; version = "0.0.0"; - npmDepsHash = "sha256-g1vuaK/dX1A8Ip//oP03mKw/K9ap0RhfgHhH3Ti/AUs="; + npmDepsHash = "sha256-P59Y6QRGcPIIvTN36NLwxlLM+Gxw2rx8t7Tyc+vKqr4="; src = ./.; dontNpmBuild = true; diff --git a/lib/pkgs/mk-types/package-lock.json b/lib/pkgs/mk-types/package-lock.json index 92f9a5ae..a9e8fdab 100644 Binary files a/lib/pkgs/mk-types/package-lock.json and b/lib/pkgs/mk-types/package-lock.json differ diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index 4febee66..422df170 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-LP69kqHyQE/JLg8qZyQRyOQUSw5XgCIXeNbn3aKaAME="; + npmDepsHash = "sha256-AYc9Rl2PIO1f3JRTO8jHKUsuufrg2cZ02NMHvwl4FY4="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index 93ae9891..71d3fbbb 100644 Binary files a/modules/ags/config/package-lock.json and b/modules/ags/config/package-lock.json differ diff --git a/modules/ags/config/package.json b/modules/ags/config/package.json index a3a7a980..c9a7e6fe 100644 --- a/modules/ags/config/package.json +++ b/modules/ags/config/package.json @@ -4,9 +4,9 @@ "main": "app.ts", "dependencies": { "astal": "https://gitpkg.vercel.app/Aylur/astal/lang/gjs/src?main", - "@eslint/js": "9.17.0", + "@eslint/js": "9.18.0", "@stylistic/eslint-plugin": "2.12.1", - "eslint": "9.17.0", + "eslint": "9.18.0", "eslint-plugin-jsdoc": "50.6.1", "fzf": "0.5.2", "jiti": "2.4.2", diff --git a/scopedPackages/firefox-addons/generated-firefox-addons.nix b/scopedPackages/firefox-addons/generated-firefox-addons.nix index 995a2441..cc579774 100644 --- a/scopedPackages/firefox-addons/generated-firefox-addons.nix +++ b/scopedPackages/firefox-addons/generated-firefox-addons.nix @@ -235,10 +235,10 @@ }; "sound-volume" = buildFirefoxXpiAddon { pname = "sound-volume"; - version = "1.5.6"; + version = "1.5.8"; addonId = "{c4b582ec-4343-438c-bda2-2f691c16c262}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4396669/600_sound_volume-1.5.6.xpi"; - sha256 = "6327d5f27460406f8a91ac7c987247ac89d71c5215483f39b9b9e2345d04ba6a"; + url = "https://addons.mozilla.org/firefox/downloads/file/4409489/600_sound_volume-1.5.8.xpi"; + sha256 = "a23950c48ba15cc59906c20298194c7c762951990b545e038af8f6bfd58f8178"; meta = with lib; { description = "Up to 600% volume boost"; license = licenses.mpl20; @@ -255,10 +255,10 @@ }; "sponsorblock" = buildFirefoxXpiAddon { pname = "sponsorblock"; - version = "5.10.3"; + version = "5.10.5"; addonId = "sponsorBlocker@ajay.app"; - url = "https://addons.mozilla.org/firefox/downloads/file/4404647/sponsorblock-5.10.3.xpi"; - sha256 = "8d670559ae17adc808ed061188822e5112728ba70eda0a3133dcc4abc3857bdc"; + url = "https://addons.mozilla.org/firefox/downloads/file/4410322/sponsorblock-5.10.5.xpi"; + sha256 = "219e58141efd775fe0c549e3a225d7897616de5880cacc1b21e460f81042b1cb"; meta = with lib; { homepage = "https://sponsor.ajay.app"; description = "Easily skip YouTube video sponsors. When you visit a YouTube video, the extension will check the database for reported sponsors and automatically skip known sponsors. You can also report sponsors in videos. Other browsers: https://sponsor.ajay.app"; diff --git a/scopedPackages/hass-components/default.nix b/scopedPackages/hass-components/default.nix index a4906c2a..f494f47f 100644 --- a/scopedPackages/hass-components/default.nix +++ b/scopedPackages/hass-components/default.nix @@ -7,7 +7,7 @@ lib.makeScope pkgs.newScope (hass: let inherit (self.lib) mergeAttrsList; - python3Packages = pkgs.python312Packages.override { + python3Packages = pkgs.python313Packages.override { overrides = final: prev: (mergeAttrsList (map (x: x python3Packages final prev) [ (import ./spotifyplus/overrides.nix ({inherit pkgs;} // inputs)) (import ./tuya-local/overrides.nix {inherit pkgs;})