From 5a067656df67873aa3c29f6805bdc852a6a3bd6d Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 12 Mar 2025 13:46:39 -0400 Subject: [PATCH] chore: update sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'grim-hyprland': 'github:eriedaberrie/grim-hyprland' (2024-10-02) rev: db5b1ccdf272d18224d3e5089894a6407e97d9b6 → 'github:eriedaberrie/grim-hyprland' (2025-03-11) rev: 4a3d6f5b87b01e92c404b9393b79057b85f58c60 • Updated input 'home-manager': 'github:nix-community/home-manager' (2025-03-10) rev: 7fb8678716c158642ac42f9ff7a18c0800fea551 → 'github:nix-community/home-manager' (2025-03-12) rev: 18780912345970e5b546b1b085385789b6935a83 • Updated input 'hyprland': 'github:hyprwm/Hyprland' (2025-03-10) rev: e4af4b5e2e3566a5fa95505b0d0ef5e5c9e174b8 → 'github:hyprwm/Hyprland' (2025-03-12) rev: e86d3a14e46d19d8a47f8ceb6410546715d45f10 • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS' (2025-03-10) rev: c769e6fa7ea00689254eb3f8385baec7e2f771cc → 'github:Jovian-Experiments/Jovian-NixOS' (2025-03-12) rev: 2f6342dc0cc9ffe5f9be8bd4db6ce43f2c4c1d87 • Updated input 'kompass': 'github:kotontrion/kompass' (2025-03-09) rev: ba7cd8f69ade8aade3d354d5f68b4ccec0b4284f → 'github:kotontrion/kompass' (2025-03-12) rev: cf6c8b26137adafae845f3905c11c98a197cd6cd • Updated input 'minix': 'github:matt1432/Minix' (2025-03-06) rev: 775f99b1876d0e91d448d6078b9b1beae1f26ee6 → 'github:matt1432/Minix' (2025-03-11) rev: f54246132bf10b385ed25a9d887e3d982c2c25de • Updated input 'nix-gaming': 'github:fufexan/nix-gaming' (2025-03-10) rev: f627335019cb3395c52d89c72abb353d2456ba16 → 'github:fufexan/nix-gaming' (2025-03-11) rev: 64a949349294543a48b3f946c9fca84332d1398b • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2025-03-09) rev: e3e32b642a31e6714ec1b712de8c91a3352ce7e1 → 'github:NixOS/nixpkgs' (2025-03-12) rev: 75cd88fa9bfa1cf444a62d5e713fc76bb0fbba6f • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2025-03-10) rev: 4aa87b0399b9c17aa88a7c8606d41b123bcc7f99 → 'github:nix-community/nixpkgs-wayland' (2025-03-12) rev: 120cd8e7a8c191e097b663e2cb9a1aa4c2588a31 • Updated input 'poetry2nix': 'github:nix-community/poetry2nix' (2025-03-10) rev: ac847558db725d865d44bbd77f894076c4b03ee3 → 'github:nix-community/poetry2nix' (2025-03-12) rev: f842aae3a72ef764e38eaf3e75aa435fb9861bba • Updated input 'sops-nix': 'github:Mic92/sops-nix' (2025-03-03) rev: 3f2412536eeece783f0d0ad3861417f347219f4d → 'github:Mic92/sops-nix' (2025-03-10) rev: e653d71e82575a43fe9d228def8eddb73887b866 • Updated input 'vimplugin-roslyn-nvim-src': 'github:seblj/roslyn.nvim' (2025-03-10) rev: 4fd5ab3c3c9ebb3b2c3fc7cc8d05bfb5cb1d1e97 → 'github:seblj/roslyn.nvim' (2025-03-12) rev: 0d298e68efa511df18a0bd4fd9a0c9bf70ebdbf2 Docker Images: • ghcr.io/linuxserver/bazarr latest: sha256:36f4ba69ab5bfb32c384ea84cf0036b8b6e07fb9a7ab65885f3619de2a8318f8 → sha256:0b3e1b888615cbd32cf879963d041abcf863d15160a9ace2928039a7b00590ef • ghcr.io/linuxserver/prowlarr latest: sha256:761f73534a01aec4bf72a1396e9b9fda3f01632948b3fa31985982d26120a330 → sha256:2100d2cee89da16e7ce4a1169406c7718e6508c86ddc497dfbfdb7d6be2ea0c2 • docker.io/fallenbagel/jellyseerr latest: sha256:ae1703c66b0fc12bfcc8cba339a77044246a93f86cc8ea53665e88b3218f111f → sha256:92dc0eb9ba260a11886ac52c3a82c5490769238f120e6312a2793809842021a6 Firefox Addons: sponsorblock: 5.11.5 -> 5.11.8 Node modules: eslint-plugin-jsdoc: 50.6.3 -> 50.6.6 --- apps/config/package-lock.json | 8 +- apps/config/package.json | 2 +- apps/extract-subs/default.nix | 2 +- apps/extract-subs/package-lock.json | 8 +- apps/mc-mods/default.nix | 2 +- apps/mc-mods/package-lock.json | 8 +- apps/pin-inputs/default.nix | 2 +- apps/pin-inputs/package-lock.json | 8 +- apps/update-sources/default.nix | 2 +- apps/update-sources/package-lock.json | 8 +- .../cluster/modules/caddy/plugins.nix | 2 +- .../homie/modules/music/default.nix | 1 - .../docker/media/bazarr/images/bazarr.nix | 4 +- .../docker/media/prowlarr/images/prowlarr.nix | 4 +- .../docker/media/seerr/images/jellyseerr.nix | 4 +- flake.lock | 74 +++++++++---------- flake.nix | 2 +- inputs/default.nix | 2 +- modules/ags/config/default.nix | 2 +- modules/ags/config/package-lock.json | 16 ++-- modules/ags/config/package.json | 2 +- modules/ags/default.nix | 13 ---- overlays/misc-fixes/default.nix | 44 +++-------- .../generated-firefox-addons.nix | 6 +- 24 files changed, 94 insertions(+), 132 deletions(-) diff --git a/apps/config/package-lock.json b/apps/config/package-lock.json index d83a462c..65b097e3 100644 --- a/apps/config/package-lock.json +++ b/apps/config/package-lock.json @@ -11,7 +11,7 @@ "@eslint/js": "9.22.0", "@stylistic/eslint-plugin": "4.2.0", "eslint": "9.22.0", - "eslint-plugin-jsdoc": "50.6.3", + "eslint-plugin-jsdoc": "50.6.6", "jiti": "2.4.2", "pkg-types": "2.1.0", "typescript": "5.8.2", @@ -789,9 +789,9 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "50.6.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.3.tgz", - "integrity": "sha512-NxbJyt1M5zffPcYZ8Nb53/8nnbIScmiLAMdoe0/FAszwb7lcSiX3iYBTsuF7RV84dZZJC8r3NghomrUXsmWvxQ==", + "version": "50.6.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.6.tgz", + "integrity": "sha512-4jLo9NZqHfyNtiBxAU293eX1xi6oUIBcAxJJL/hHeeNhh26l4l/Apmu0x9SarvSQ/gWNOrnFci4DSPupN4//WA==", "license": "BSD-3-Clause", "dependencies": { "@es-joy/jsdoccomment": "~0.49.0", diff --git a/apps/config/package.json b/apps/config/package.json index aa7d3113..782b90aa 100644 --- a/apps/config/package.json +++ b/apps/config/package.json @@ -7,7 +7,7 @@ "@eslint/js": "9.22.0", "@stylistic/eslint-plugin": "4.2.0", "eslint": "9.22.0", - "eslint-plugin-jsdoc": "50.6.3", + "eslint-plugin-jsdoc": "50.6.6", "jiti": "2.4.2", "pkg-types": "2.1.0", "typescript": "5.8.2", diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index 9d4061fc..fd635a24 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-EjGnAfSAPZYa/GjrmyEeo/nMdPUrNrB2OpGL7PJKyRE="; + npmDepsHash = "sha256-B9O3eG7yd9ZlF5qVu0c7/79LX86XHHd8M9bhKsnZ420="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index 4a4193a0..f3941939 100644 --- a/apps/extract-subs/package-lock.json +++ b/apps/extract-subs/package-lock.json @@ -35,7 +35,7 @@ "jiti": "2.4.2", "pkg-types": "2.1.0", "typescript": "5.8.2", - "typescript-eslint": "8.26.0" + "typescript-eslint": "8.26.1" } }, "node_modules/@esbuild/aix-ppc64": { @@ -439,9 +439,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", + "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/apps/mc-mods/default.nix b/apps/mc-mods/default.nix index 520e7caa..55c33b58 100644 --- a/apps/mc-mods/default.nix +++ b/apps/mc-mods/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-HF9hfu26UrpR4WrzwqN6ANaF9GJLLYW8w4QrhwxeMNg="; + npmDepsHash = "sha256-UvW0BD7y9m8bwNstTBmIMU6ZO/GU8W6QDrO208Q4vto="; runtimeInputs = [ nodejs_latest diff --git a/apps/mc-mods/package-lock.json b/apps/mc-mods/package-lock.json index cc30bdef..be212d8b 100644 --- a/apps/mc-mods/package-lock.json +++ b/apps/mc-mods/package-lock.json @@ -30,7 +30,7 @@ "@eslint/js": "9.22.0", "@stylistic/eslint-plugin": "4.2.0", "eslint": "9.22.0", - "eslint-plugin-jsdoc": "50.6.3", + "eslint-plugin-jsdoc": "50.6.6", "jiti": "2.4.2", "pkg-types": "2.1.0", "typescript": "5.8.2", @@ -438,9 +438,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", + "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/apps/pin-inputs/default.nix b/apps/pin-inputs/default.nix index 321b9bf0..c8b372c4 100644 --- a/apps/pin-inputs/default.nix +++ b/apps/pin-inputs/default.nix @@ -1,7 +1,7 @@ {buildApp, ...}: buildApp { src = ./.; - npmDepsHash = "sha256-zrv1gf+4ux9g+xnuHeWYt9PUYnX1AoUAxUD5e7+cyUU="; + npmDepsHash = "sha256-YD+iKEwxMZLpTi/mTyGpzGgGj3EhAxMmG2O97Q4710E="; runtimeInputs = []; diff --git a/apps/pin-inputs/package-lock.json b/apps/pin-inputs/package-lock.json index 67a47fbe..073fe7ed 100644 --- a/apps/pin-inputs/package-lock.json +++ b/apps/pin-inputs/package-lock.json @@ -30,7 +30,7 @@ "@eslint/js": "9.22.0", "@stylistic/eslint-plugin": "4.2.0", "eslint": "9.22.0", - "eslint-plugin-jsdoc": "50.6.3", + "eslint-plugin-jsdoc": "50.6.6", "jiti": "2.4.2", "pkg-types": "2.1.0", "typescript": "5.8.2", @@ -438,9 +438,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", + "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 1ab1fcab..440c2d6c 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -12,7 +12,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-Tsn3IZFbMa6kcCt70oQLh5oigJK3bOiiyIEzRXczD5Q="; + npmDepsHash = "sha256-Yga+P9xz+BySILDKJFS7zCayo0atDyzLyH/HDBkVpHc="; runtimeInputs = [ curl diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index 8f0f8937..a1a3ecc8 100644 --- a/apps/update-sources/package-lock.json +++ b/apps/update-sources/package-lock.json @@ -34,7 +34,7 @@ "jiti": "2.4.2", "pkg-types": "2.1.0", "typescript": "5.8.2", - "typescript-eslint": "8.26.0" + "typescript-eslint": "8.26.1" } }, "node_modules/@esbuild/aix-ppc64": { @@ -438,9 +438,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", + "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/configurations/cluster/modules/caddy/plugins.nix b/configurations/cluster/modules/caddy/plugins.nix index 5580b3c2..b4bc47cd 100644 --- a/configurations/cluster/modules/caddy/plugins.nix +++ b/configurations/cluster/modules/caddy/plugins.nix @@ -7,5 +7,5 @@ }; }; - hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; + hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; } diff --git a/configurations/homie/modules/music/default.nix b/configurations/homie/modules/music/default.nix index 97cd6c6b..8b5d4a5e 100644 --- a/configurations/homie/modules/music/default.nix +++ b/configurations/homie/modules/music/default.nix @@ -104,7 +104,6 @@ package = pkgs.spotifyd.override { withMpris = false; - withKeyring = false; }; settings.global = { diff --git a/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix b/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix index c1322f19..2db3ff67 100644 --- a/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:36f4ba69ab5bfb32c384ea84cf0036b8b6e07fb9a7ab65885f3619de2a8318f8"; - hash = "sha256-tfSewd30img8hQgWsjpdgNwTO6vK1lWqxyHVRkjU9Tg="; + imageDigest = "sha256:0b3e1b888615cbd32cf879963d041abcf863d15160a9ace2928039a7b00590ef"; + hash = "sha256-SmZDwml1K5GXPGo3F1t+I1KPBHEVI6mBHaXOfnFnYvY="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/configurations/nos/modules/docker/media/prowlarr/images/prowlarr.nix index e3c6b35e..1545ec98 100644 --- a/configurations/nos/modules/docker/media/prowlarr/images/prowlarr.nix +++ b/configurations/nos/modules/docker/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/prowlarr"; - imageDigest = "sha256:761f73534a01aec4bf72a1396e9b9fda3f01632948b3fa31985982d26120a330"; - hash = "sha256-XNVngLcovvO2PEZXnvi1xIL6i/f70gNzfivbJbrIkJM="; + imageDigest = "sha256:2100d2cee89da16e7ce4a1169406c7718e6508c86ddc497dfbfdb7d6be2ea0c2"; + hash = "sha256-VKlQx3BpLvs/Z6vehEdFPXDkiEcU0GIvp5kOPPKGSlM="; 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 7be00a9f..7cc0d74f 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:ae1703c66b0fc12bfcc8cba339a77044246a93f86cc8ea53665e88b3218f111f"; - hash = "sha256-X5+RsWy0fQDbarvxHloZKkIzw6VtRUL7Axrcuv6jdB0="; + imageDigest = "sha256:92dc0eb9ba260a11886ac52c3a82c5490769238f120e6312a2793809842021a6"; + hash = "sha256-eSVWRoXd5CzCRvgIfS8apt3SatF2nM3u0HEh9q52WXE="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 4d11ab3a..ee26dea7 100644 --- a/flake.lock +++ b/flake.lock @@ -425,11 +425,11 @@ ] }, "locked": { - "lastModified": 1727893131, - "narHash": "sha256-43oBTgbpAx7V9h0EKFxvzYRZSB4icg2LrFq/Xp6NQFk=", + "lastModified": 1741705247, + "narHash": "sha256-4m2QFT8mY6CM3YSebMJhd/kJWaRxTYOS/nvAs2TaIQs=", "owner": "eriedaberrie", "repo": "grim-hyprland", - "rev": "db5b1ccdf272d18224d3e5089894a6407e97d9b6", + "rev": "4a3d6f5b87b01e92c404b9393b79057b85f58c60", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "lastModified": 1741791118, + "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "18780912345970e5b546b1b085385789b6935a83", "type": "github" }, "original": { @@ -574,11 +574,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741628446, - "narHash": "sha256-fTZk3uEnkR39JWFRgrstYjAOoi/OqWEDtNB3bmzVcRQ=", + "lastModified": 1741788549, + "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e4af4b5e2e3566a5fa95505b0d0ef5e5c9e174b8", + "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", "type": "github" }, "original": { @@ -834,11 +834,11 @@ ] }, "locked": { - "lastModified": 1741588655, - "narHash": "sha256-v+bQZbis5c1uSXWCGsbMUb5oL8i8+6YbdVZYaJr4qI0=", + "lastModified": 1741762559, + "narHash": "sha256-/6baGi1+4CCPW1kB0m2nKyZnA4/43+OEGiko9BhxWY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c769e6fa7ea00689254eb3f8385baec7e2f771cc", + "rev": "2f6342dc0cc9ffe5f9be8bd4db6ce43f2c4c1d87", "type": "github" }, "original": { @@ -860,11 +860,11 @@ ] }, "locked": { - "lastModified": 1741527388, - "narHash": "sha256-fXj1OYk86ApRIh7+qAhnPjNK0jcGThN4199jQ1B/lTM=", + "lastModified": 1741774055, + "narHash": "sha256-uexSUuBFqqGg8HPAHC37vAwpjhg4Wh1/0bOpoNjAD8w=", "owner": "kotontrion", "repo": "kompass", - "rev": "ba7cd8f69ade8aade3d354d5f68b4ccec0b4284f", + "rev": "cf6c8b26137adafae845f3905c11c98a197cd6cd", "type": "github" }, "original": { @@ -937,11 +937,11 @@ ] }, "locked": { - "lastModified": 1741240192, - "narHash": "sha256-Hd5spUwD+0fs7644OdQz64uifzAk55+wH1PS76eDrtQ=", + "lastModified": 1741712469, + "narHash": "sha256-X3c7JiD4TOcOf3DpDRUQinUi8ZmPyjxqPC3iNEjJzvo=", "owner": "matt1432", "repo": "Minix", - "rev": "775f99b1876d0e91d448d6078b9b1beae1f26ee6", + "rev": "f54246132bf10b385ed25a9d887e3d982c2c25de", "type": "github" }, "original": { @@ -1158,11 +1158,11 @@ ] }, "locked": { - "lastModified": 1741569698, - "narHash": "sha256-C6ZdQTCw3Idw0zzm1VdI2H4f6j3DtcCLuoYjVzNEkpw=", + "lastModified": 1741657497, + "narHash": "sha256-2X7d94f9QcRnBKz1jJQfumATe8w4gXjwRly150ERnek=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f627335019cb3395c52d89c72abb353d2456ba16", + "rev": "64a949349294543a48b3f946c9fca84332d1398b", "type": "github" }, "original": { @@ -1319,16 +1319,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1741757609, + "narHash": "sha256-Y2PHPeePLQzYjlwzpqguHIh5Y0wGtCzl7eNEjvDVSXs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "75cd88fa9bfa1cf444a62d5e713fc76bb0fbba6f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1393,11 +1393,11 @@ ] }, "locked": { - "lastModified": 1741631802, - "narHash": "sha256-4qKCOpSRuybRrupFVWVHN/yHo1oxZVZlx9PXm8CCyQk=", + "lastModified": 1741785459, + "narHash": "sha256-1sjnoxtG7WUei1/DAOpcA1NwTRcg6wIahDD126hwp5M=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "4aa87b0399b9c17aa88a7c8606d41b123bcc7f99", + "rev": "120cd8e7a8c191e097b663e2cb9a1aa4c2588a31", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ ] }, "locked": { - "lastModified": 1741599527, - "narHash": "sha256-EBCrrWL04ANw15Gx20tomN8Tptod/maQSw+51kPj9bI=", + "lastModified": 1741790785, + "narHash": "sha256-nzgO/ZCSBzWjbMkYDxG+yl9Z2eGbCgQu06Oku3ir5D4=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "ac847558db725d865d44bbd77f894076c4b03ee3", + "rev": "f842aae3a72ef764e38eaf3e75aa435fb9861bba", "type": "github" }, "original": { @@ -1767,11 +1767,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1741644481, + "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "e653d71e82575a43fe9d228def8eddb73887b866", "type": "github" }, "original": { @@ -1914,11 +1914,11 @@ "vimplugin-roslyn-nvim-src": { "flake": false, "locked": { - "lastModified": 1741603103, - "narHash": "sha256-xglJXqN2778LSTfXL041AOGKP/myCQKYWS29GjlvWpI=", + "lastModified": 1741792635, + "narHash": "sha256-UgFY13WKxV1jhjzqZS1AHMN/dMrgt3uAkhZjAuthHMg=", "owner": "seblj", "repo": "roslyn.nvim", - "rev": "4fd5ab3c3c9ebb3b2c3fc7cc8d05bfb5cb1d1e97", + "rev": "0d298e68efa511df18a0bd4fd9a0c9bf70ebdbf2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7a33f290..81a46c54 100644 --- a/flake.nix +++ b/flake.nix @@ -350,7 +350,7 @@ }; nixpkgs = { owner = "NixOS"; - ref = "nixos-unstable"; + ref = "nixos-unstable-small"; repo = "nixpkgs"; type = "github"; }; diff --git a/inputs/default.nix b/inputs/default.nix index 0728fc56..113900d3 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -12,7 +12,7 @@ let nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable"; + ref = "nixos-unstable-small"; }; home-manager = mkInput { diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index d93cec37..d505b28a 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-s+wpBnAKfauJi5zVGFnswkcpfCekMxk7Lcn8Sx7y2hk="; + npmDepsHash = "sha256-cMBnECR2yU5FmMkjG6FWljyH3b4B2E3svBwSzlG5xr0="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index 7c2e0dcb..cc30f81e 100644 --- a/modules/ags/config/package-lock.json +++ b/modules/ags/config/package-lock.json @@ -12,7 +12,7 @@ "@stylistic/eslint-plugin": "4.2.0", "astal": "https://gitpkg.vercel.app/Aylur/astal/lang/gjs/src?main", "eslint": "9.22.0", - "eslint-plugin-jsdoc": "50.6.3", + "eslint-plugin-jsdoc": "50.6.6", "fzf": "0.5.2", "jiti": "2.4.2", "typescript-eslint": "8.26.1" @@ -33,9 +33,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", + "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" @@ -584,7 +584,7 @@ }, "node_modules/astal": { "resolved": "https://gitpkg.vercel.app/Aylur/astal/lang/gjs/src?main", - "integrity": "sha512-2cWPV5ApEYewh/BCvJ70Muv++yGpVKuDt6HqLsPEj+ASnzW/hawH2Zd1Yh5/8P/TA8JNVQ0ev++GadIjlBpXjw==", + "integrity": "sha512-PesVbhgKreig2GTZjzEYKNqSdcIEHP0VSDk1naXi2luXf72y/QivFXwIWJRqZaw0im8Tf1ASygGYh4SCOU7pog==", "license": "LGPL-2.1" }, "node_modules/balanced-match": { @@ -788,9 +788,9 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "50.6.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.3.tgz", - "integrity": "sha512-NxbJyt1M5zffPcYZ8Nb53/8nnbIScmiLAMdoe0/FAszwb7lcSiX3iYBTsuF7RV84dZZJC8r3NghomrUXsmWvxQ==", + "version": "50.6.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.6.tgz", + "integrity": "sha512-4jLo9NZqHfyNtiBxAU293eX1xi6oUIBcAxJJL/hHeeNhh26l4l/Apmu0x9SarvSQ/gWNOrnFci4DSPupN4//WA==", "license": "BSD-3-Clause", "dependencies": { "@es-joy/jsdoccomment": "~0.49.0", diff --git a/modules/ags/config/package.json b/modules/ags/config/package.json index 4899347d..a4490a8c 100644 --- a/modules/ags/config/package.json +++ b/modules/ags/config/package.json @@ -7,7 +7,7 @@ "@eslint/js": "9.22.0", "@stylistic/eslint-plugin": "4.2.0", "eslint": "9.22.0", - "eslint-plugin-jsdoc": "50.6.3", + "eslint-plugin-jsdoc": "50.6.6", "fzf": "0.5.2", "jiti": "2.4.2", "typescript-eslint": "8.26.1" diff --git a/modules/ags/default.nix b/modules/ags/default.nix index 6eb43bc1..826dfd0d 100644 --- a/modules/ags/default.nix +++ b/modules/ags/default.nix @@ -56,19 +56,6 @@ in { ags.overlays.default astal.overlays.default virtualkeyboard-adapter.overlays.default - - # FIXME: https://pr-tracker.nelim.org/?pr=388345 - (final: prev: { - gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (o: rec { - version = "1.1.0"; - src = pkgs.fetchFromGitHub { - owner = "wmww"; - repo = "gtk4-layer-shell"; - rev = "v${version}"; - hash = "sha256-UGhFeaBBIfC4ToWdyoX+oUzLlqJsjF++9U7mtszE0y0="; - }; - }); - }) ]; i18n.inputMethod = mkIf cfgDesktop.isTouchscreen { diff --git a/overlays/misc-fixes/default.nix b/overlays/misc-fixes/default.nix index 046eb8c3..f9ea6839 100644 --- a/overlays/misc-fixes/default.nix +++ b/overlays/misc-fixes/default.nix @@ -9,40 +9,16 @@ final: prev: { }; }); - # FIXME: https://pr-tracker.nelim.org/?pr=382559 - obs-studio-plugins = let - inherit (prev) lib libjpeg libimobiledevice obs-studio ffmpeg pkg-config; - in - prev.obs-studio-plugins - // { - droidcam-obs = prev.obs-studio-plugins.droidcam-obs.overrideAttrs (o: rec { - version = "2.3.4"; - src = prev.fetchFromGitHub { - owner = "dev47apps"; - repo = "droidcam-obs-plugin"; - tag = version; - sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA="; - }; - postPatch = ""; + # FIXME: automate this or make PR for nixpkgs-wayland? + fcft = prev.fcft.overrideAttrs (o: rec { + version = "3.3.0"; - nativeBuildInputs = [ - pkg-config - ]; - - # Flag reference in regard to: - # https://github.com/dev47apps/droidcam-obs-plugin/blob/master/linux/linux.mk - makeFlags = [ - "ALLOW_STATIC=no" - "JPEG_DIR=${lib.getDev libjpeg}" - "JPEG_LIB=${lib.getLib libjpeg}/lib" - "IMOBILEDEV_DIR=${lib.getLib libimobiledevice}" - "LIBOBS_INCLUDES=${obs-studio}/include/obs" - "FFMPEG_INCLUDES=${lib.getLib ffmpeg}" - "LIBUSBMUXD=libusbmuxd-2.0" - "LIBIMOBILEDEV=libimobiledevice-1.0" - ]; - - meta = o.meta // {broken = false;}; - }); + src = prev.fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "fcft"; + rev = version; + hash = "sha256-spK75cT6x0rHcJT2YxX1e39jvx4uQKL/b4CHO7bon4s="; }; + }); } diff --git a/scopedPackages/firefox-addons/generated-firefox-addons.nix b/scopedPackages/firefox-addons/generated-firefox-addons.nix index 093dd8a2..a094cfc1 100644 --- a/scopedPackages/firefox-addons/generated-firefox-addons.nix +++ b/scopedPackages/firefox-addons/generated-firefox-addons.nix @@ -255,10 +255,10 @@ }; "sponsorblock" = buildFirefoxXpiAddon { pname = "sponsorblock"; - version = "5.11.5"; + version = "5.11.8"; addonId = "sponsorBlocker@ajay.app"; - url = "https://addons.mozilla.org/firefox/downloads/file/4424639/sponsorblock-5.11.5.xpi"; - sha256 = "4cb3a7061dbeb9869477fb2f991d39ccaf650941f83abe1e0c65511e971cb555"; + url = "https://addons.mozilla.org/firefox/downloads/file/4451103/sponsorblock-5.11.8.xpi"; + sha256 = "0706b77d29ce0517c046f55427510b3718f2efef36bb7c7953387089629f7ac0"; 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";