diff --git a/devices/nos/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix index 2ad2dea..8f1b3af 100644 --- a/devices/nos/modules/arion/forgejo/images/act_runner.nix +++ b/devices/nos/modules/arion/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:7ea2b97aeb277559240781b5f4d774fa53422affd1e0e9c1bef7dd2520bbdf23"; - sha256 = "1x66sh1jz6jnjj5xkx0lgs81zm4ilm8hh9yiimc4z7gj1k89b2cx"; + imageDigest = "sha256:d9fc651a23753d162efbea320990cae5c605062843a8845a4a8449d5efe100ae"; + sha256 = "10xwjwif09zl9c1dim5q9vzn7lkzxbfp0w2yqijm6w4p8pgaqgfz"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix index 9ab8c2f..22567df 100644 --- a/devices/nos/modules/arion/media/calibre/images/calibre.nix +++ b/devices/nos/modules/arion/media/calibre/images/calibre.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/calibre"; - imageDigest = "sha256:ebfeb487977b5ffa7698b424b83002868521b65734d149aa4bf36e268709de2a"; - sha256 = "0lvf6jf48anryrw6ns76g7xgvaab9bwh2d9xplaq6522dkz958vg"; + imageDigest = "sha256:4a1f1f9adcee133b374dc9ea783b6b735844313f99c65fb62cb15cc0089d1948"; + sha256 = "0wffb24wirkkf43zalif72f155byccqmsgna7rrjln25jpdpnz5a"; finalImageName = "ghcr.io/linuxserver/calibre"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix index e9c7337..337f274 100644 --- a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:4fb40ea724abc25cf9496cdbc8e528aa0882132737e49c5e712c264284fa7b94"; - sha256 = "0nwi79hryq8w5iq94ypyp5iywq94sa8cprnxiy67d7i6fs2a3mdd"; + imageDigest = "sha256:36bdeef099e87a0da24e5b87d88abde93cd188a24511a4bfb214372824201f00"; + sha256 = "0n8d1rnc9d4yccgh65hxxp4mfpadhhgsqf5jg4lm4zng03yrnr0x"; finalImageName = "ghcr.io/linuxserver/sabnzbd"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix index 9aacd20..493d099 100644 --- a/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix +++ b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/fallenbagel/jellyseerr"; - imageDigest = "sha256:056117f4bef8b89788f42c6ed6d3ea21509b027e2b505eff2c7450dba1c88f1a"; - sha256 = "0a7pgfpy1wv177w53dv43hs7ll8gzb09klmdpszfjpa8hpa7r8wp"; + imageDigest = "sha256:08691ea0069c30e106048199d65af0df3aecb5baa17c682b98fa4d73f41de43b"; + sha256 = "1kch5dn3idrv6ci0dq95f09lc60s7rrfnwyz9dcpd7vi56kxh5w3"; finalImageName = "ghcr.io/fallenbagel/jellyseerr"; finalImageTag = "develop"; } diff --git a/flake.lock b/flake.lock index 1a456e0..23d140b 100644 --- a/flake.lock +++ b/flake.lock @@ -682,11 +682,11 @@ "gtk-theme-src": { "flake": false, "locked": { - "lastModified": 1718826758, - "narHash": "sha256-WQsPn5s8xZ/wdVJUJb1aCTAjOskj/qthZ48HHDVIcNk=", + "lastModified": 1719525014, + "narHash": "sha256-QaMrcUuvHRisa58XaiNos6jpclp0jotFQJ3b375gKMU=", "owner": "dracula", "repo": "gtk", - "rev": "91b9c8572d7cfa06b24eee72d415cc8931c04934", + "rev": "bc1414a938652d04b9305b1300f5ceefcf3a3d72", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1719385710, - "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719350558, - "narHash": "sha256-oACeKBS762XSJbN/rz5Y2xPYGzWQHhwDqn+CeODuWsM=", + "lastModified": 1719526850, + "narHash": "sha256-GPqjH+P9PPmln5KQbyCKm3kfL1NCykIPLejhUel//w4=", "ref": "refs/heads/main", - "rev": "e4d09aa3a9de9a9e71c10bf4b6800585b3db9a4c", - "revCount": 4891, + "rev": "b7f42a1e88a5b6c9d2dbdba31e0f35f6a02461e7", + "revCount": 4893, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1199,11 +1199,11 @@ ] }, "locked": { - "lastModified": 1719410911, - "narHash": "sha256-jnL8LSx1wJvJTBBRwjaggFUzc9q0/KXbvPmP3tyeyag=", + "lastModified": 1719467057, + "narHash": "sha256-8gQ0txwuLoBpBeIhTAkl+/7Hi/AD4KE5m4YhOn1OA3E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "86c00892c3ae4869eb99b677b48ee111409a93f1", + "rev": "bb6bea003dc464a4248a173e71a007d368691092", "type": "github" }, "original": { @@ -1215,11 +1215,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719349695, - "narHash": "sha256-rnBC/8Y0CECztfoMKBxxo4hzd4TBu1bu9CnwpWDaB1U=", + "lastModified": 1719414226, + "narHash": "sha256-h/qJ+1R+BtY+mX02UsqYW82hEl78mrHTGAs9yjpFEzU=", "owner": "neovim", "repo": "neovim", - "rev": "9dc09a4cdde9fad4e7861b9467276260bd9b82a9", + "rev": "fc9b70826ec88ca2e6c0624c522b872e87aa7ac1", "type": "github" }, "original": { @@ -1301,11 +1301,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1719305207, - "narHash": "sha256-gxJ1xgkXe/iHpyYBtx96D7AKccQYqutC6R7cKv2uBNY=", + "lastModified": 1719475157, + "narHash": "sha256-8zW6eWvE9T03cMpo/hY8RRZIsSCfs1zmsJOkEZzuYwM=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "02c50df6881266f5425f06f475d504e90e491767", + "rev": "030e586195c97424844965d2ce680140f6565c02", "type": "github" }, "original": { @@ -1651,11 +1651,11 @@ ] }, "locked": { - "lastModified": 1719411360, - "narHash": "sha256-NZEBJpj5SBmadOgX/fnW5RkMqABgHTcI1D51LaqrA9c=", + "lastModified": 1719512506, + "narHash": "sha256-l4wUyErpqiSHULMFn5sDagzJyrGT9aQe9x6EQDDSo8Q=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "13affa25a29661ddbac978f8c707ec437ddd83ca", + "rev": "21540f997b42a858975c64bb822f692a60563085", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9d46e39..31fe2be 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,4 @@ # Do not modify! This file is generated. - { inputs = { Hyprspace = { @@ -342,4 +341,4 @@ }; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; -} \ No newline at end of file +} diff --git a/modules/nvidia.nix b/modules/nvidia.nix index 7d1c8c9..99d012f 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -66,12 +66,12 @@ in { else # Get newest beta driver version for better Wayland support config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.52.04"; - sha256_64bit = "sha256-nVOubb7zKulXhux9AruUTVBQwccFFuYGWrU1ZiakRAI="; - sha256_aarch64 = "sha256-Kt60kTTO3mli66De2d1CAoE3wr0yUbBe7eqCIrYHcWk="; - openSha256 = "sha256-wDimW8/rJlmwr1zQz8+b1uvxxxbOf3Bpk060lfLKuy0="; - settingsSha256 = "sha256-PMh5efbSEq7iqEMBr2+VGQYkBG73TGUh6FuDHZhmwHk="; - persistencedSha256 = "sha256-KAYIvPjUVilQQcD04h163MHmKcQrn2a8oaXujL2Bxro="; + version = "555.58"; + sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew="; + sha256_aarch64 = "sha256-7XswQwW1iFP4ji5mbRQ6PVEhD4SGWpjUJe1o8zoXYRE="; + openSha256 = "sha256-hEAmFISMuXm8tbsrB+WiUcEFuSGRNZ37aKWvf0WJ2/c="; + settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M="; + persistencedSha256 = "sha256-lyYxDuGDTMdGxX3CaiWUh1IQuQlkI2hPEs5LI20vEVw="; }; }; diff --git a/pkgs/firefox-addons/default.nix b/pkgs/firefox-addons/default.nix index 96fdebd..f3655cb 100644 --- a/pkgs/firefox-addons/default.nix +++ b/pkgs/firefox-addons/default.nix @@ -39,23 +39,24 @@ inherit buildFirefoxXpiAddon fetchurl lib stdenv; }; in - lib.makeScope pkgs.newScope (_: - packages - // { - inherit buildFirefoxXpiAddon; + lib.makeScope pkgs.newScope ( + _: + packages + // { + inherit buildFirefoxXpiAddon; - seventv = buildFirefoxXpiAddon { - pname = "frankerfacez"; - version = "4.0"; - addonId = "frankerfacez@frankerfacez.com"; - url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; - sha256 = "sha256-U/yAra2c+RlGSaQtHfBz9XYsoDaJ67gmPJBsFrpqoE8="; - meta = with lib; { - homepage = "https://www.frankerfacez.com/"; - description = "The Twitch Enhancement Suite. Get custom emotes and tons of new features you'll never want to go without."; - license = licenses.asl20; - platforms = platforms.all; + seventv = buildFirefoxXpiAddon { + pname = "frankerfacez"; + version = "4.0"; + addonId = "frankerfacez@frankerfacez.com"; + url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; + sha256 = "sha256-U/yAra2c+RlGSaQtHfBz9XYsoDaJ67gmPJBsFrpqoE8="; + meta = with lib; { + homepage = "https://www.frankerfacez.com/"; + description = "The Twitch Enhancement Suite. Get custom emotes and tons of new features you'll never want to go without."; + license = licenses.asl20; + platforms = platforms.all; + }; }; - }; - } + } ) diff --git a/pkgs/firefox-addons/generated-firefox-addons.nix b/pkgs/firefox-addons/generated-firefox-addons.nix index 04338d2..f556246 100644 --- a/pkgs/firefox-addons/generated-firefox-addons.nix +++ b/pkgs/firefox-addons/generated-firefox-addons.nix @@ -6,10 +6,10 @@ }: { "bitwarden" = buildFirefoxXpiAddon { pname = "bitwarden"; - version = "2024.6.2"; + version = "2024.6.3"; addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4305759/bitwarden_password_manager-2024.6.2.xpi"; - sha256 = "c064e2d6601cb921ecd154e0d3bfd54d71af43da1947aa51666877ef0afd1436"; + url = "https://addons.mozilla.org/firefox/downloads/file/4307738/bitwarden_password_manager-2024.6.3.xpi"; + sha256 = "d3c052e66a9daa390707c4481ec50c09bc3b6253cb222792c9a55aa4b5f4045a"; meta = with lib; { homepage = "https://bitwarden.com"; description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information."; @@ -180,10 +180,10 @@ }; "return-youtube-dislikes" = buildFirefoxXpiAddon { pname = "return-youtube-dislikes"; - version = "3.0.0.14"; + version = "3.0.0.16"; addonId = "{762f9885-5a13-4abd-9c77-433dcd38b8fd}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi"; - sha256 = "a31ab23549846b7eab92a094e92df8349047b48bbd807f069d128083c3b27f61"; + url = "https://addons.mozilla.org/firefox/downloads/file/4308076/return_youtube_dislikes-3.0.0.16.xpi"; + sha256 = "46356bf30f6a06fee3497133c0b69a39ab09f393fa7d4c0e4d1c89cee1d020e4"; meta = with lib; { description = "Returns ability to see dislike statistics on youtube"; license = licenses.gpl3; @@ -219,18 +219,18 @@ }; "sponsorblock" = buildFirefoxXpiAddon { pname = "sponsorblock"; - version = "5.6.1"; + version = "5.7"; addonId = "sponsorBlocker@ajay.app"; - url = "https://addons.mozilla.org/firefox/downloads/file/4299073/sponsorblock-5.6.1.xpi"; - sha256 = "4ccae0ebc1aa26d61c446956da425bf16daffd5704ea216735e0a57e482fe9ba"; + url = "https://addons.mozilla.org/firefox/downloads/file/4308094/sponsorblock-5.7.xpi"; + sha256 = "05b7fadde5718cd44520a86e6b38b10816762df763767ef4bb879112ed77caae"; 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"; license = licenses.lgpl3; mozPermissions = [ "storage" - "https://sponsor.ajay.app/*" "scripting" + "https://sponsor.ajay.app/*" "https://*.youtube.com/*" "https://www.youtube-nocookie.com/embed/*" ]; diff --git a/updateSha.sh b/updateSha.sh index fde868b..5df38db 100755 --- a/updateSha.sh +++ b/updateSha.sh @@ -27,7 +27,7 @@ updateDocker() { } updateFFZ() { - FILE="$FLAKE/home/firefox/addons/default.nix" + FILE="$FLAKE/pkgs/firefox-addons/default.nix" URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi" parseFetchurl "$URL" "$FILE" @@ -37,7 +37,7 @@ updateFirefoxAddons() { echo "Updating firefox addons using mozilla-addons-to-nix" ( - cd "$FLAKE/home/firefox/addons" || return; + cd "$FLAKE/pkgs/firefox-addons" || return; file=generated-firefox-addons.nix if [[ -f $file ]]; then