From ac15f698b0c1eb5043aed1829e75a1f0457c2454 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 3 Jul 2024 13:24:53 -0400 Subject: [PATCH] chore: update flake.lock and add discord overlay --- .../modules/arion/forgejo/images/postgres.nix | 2 +- .../arion/freshrss/images/postgres.nix | 2 +- .../arion/immich/images/machine-learning.nix | 6 +- .../modules/arion/immich/images/server.nix | 6 +- .../arion/media/bazarr/images/bazarr.nix | 4 +- .../arion/media/calibre/images/calibre.nix | 4 +- .../arion/media/prowlarr/images/prowlarr.nix | 4 +- .../arion/nextcloud/images/nextcloud.nix | 2 +- .../modules/arion/nextcloud/images/nginx.nix | 2 +- flake.lock | 100 ++++++++++++------ flake.nix | 6 ++ inputs.nix | 5 + lib.nix | 1 + .../generated-firefox-addons.nix | 12 +-- 14 files changed, 103 insertions(+), 53 deletions(-) diff --git a/devices/nos/modules/arion/forgejo/images/postgres.nix b/devices/nos/modules/arion/forgejo/images/postgres.nix index c7487cfc..6cc17c21 100644 --- a/devices/nos/modules/arion/forgejo/images/postgres.nix +++ b/devices/nos/modules/arion/forgejo/images/postgres.nix @@ -1,7 +1,7 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "postgres"; - imageDigest = "sha256:21a1b037ebe0d3b7edefe4bc4352634883d4ba4fa7b7641bf86afa3219a47547"; + imageDigest = "sha256:2f7365d1f574dba34f6332978169afe60af9de9608fffbbfecb7d04cc5233698"; sha256 = "07v1r0ijag2kyr9nk5l7kphgvrb6lk71zyab4i31rkl1k27vfhwg"; finalImageName = "postgres"; finalImageTag = "14"; diff --git a/devices/nos/modules/arion/freshrss/images/postgres.nix b/devices/nos/modules/arion/freshrss/images/postgres.nix index c7487cfc..6cc17c21 100644 --- a/devices/nos/modules/arion/freshrss/images/postgres.nix +++ b/devices/nos/modules/arion/freshrss/images/postgres.nix @@ -1,7 +1,7 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "postgres"; - imageDigest = "sha256:21a1b037ebe0d3b7edefe4bc4352634883d4ba4fa7b7641bf86afa3219a47547"; + imageDigest = "sha256:2f7365d1f574dba34f6332978169afe60af9de9608fffbbfecb7d04cc5233698"; sha256 = "07v1r0ijag2kyr9nk5l7kphgvrb6lk71zyab4i31rkl1k27vfhwg"; finalImageName = "postgres"; finalImageTag = "14"; diff --git a/devices/nos/modules/arion/immich/images/machine-learning.nix b/devices/nos/modules/arion/immich/images/machine-learning.nix index 34103f15..c06e5c21 100644 --- a/devices/nos/modules/arion/immich/images/machine-learning.nix +++ b/devices/nos/modules/arion/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/immich-app/immich-machine-learning"; - imageDigest = "sha256:28401be15060af7f51cf8ee43002dd827899e9f4abd38e44dd59d7a7ae04dca6"; - sha256 = "1gp7yyy7rv80jcnlp5kbn55ijmbrbhcymrg5gsqnv1r70fa1pbab"; + imageDigest = "sha256:f22d949f5f3e16d1c3dcf0aa3ca5f7a73f053b51d2883ac864f9742d3053576b"; + sha256 = "03zcw95lhpdd0pp4zh49zpga5ir44qbq75barqgcsn8003rlzmzd"; finalImageName = "ghcr.io/immich-app/immich-machine-learning"; - finalImageTag = "v1.107.0"; + finalImageTag = "v1.107.2"; } diff --git a/devices/nos/modules/arion/immich/images/server.nix b/devices/nos/modules/arion/immich/images/server.nix index 0de42391..e5932c49 100644 --- a/devices/nos/modules/arion/immich/images/server.nix +++ b/devices/nos/modules/arion/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/immich-app/immich-server"; - imageDigest = "sha256:2b9c87617e55e3471a1239b0fa00041361517dd8f65c7db46abc7392c0fb561a"; - sha256 = "1w87knckw19hr32g7ck6zc2nq7m1bpfisihw66bzixp67f2qw0gm"; + imageDigest = "sha256:75746006b35a7bc61408cd4d124dc73344f0a087c2d9769c4715ca84a1d87591"; + sha256 = "066j9ihn8kwznq8m0hpdayki2sc4ijwry5bc47vg4lif4dbxsdg3"; finalImageName = "ghcr.io/immich-app/immich-server"; - finalImageTag = "v1.107.0"; + finalImageTag = "v1.107.2"; } diff --git a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix index 1ce08455..6c4c7a83 100644 --- a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:6fb83511c0dca70a400fde79cb45ed59c4f66ea30dcba8c6f9274f01d77e5aef"; - sha256 = "05vyjlbrmcsrdz0gjqaxd8wgkch3hrq7dq740qzyqi8xlfxbiq62"; + imageDigest = "sha256:a113dca480a1e223c1ea62261650ebb56d659a8af5455e50ab5ac1f13ef21707"; + sha256 = "1bh3xganlay5pzv9sjkd72j9s13x2p3v6l3gmz7vinrm5n3pinbx"; finalImageName = "ghcr.io/linuxserver/bazarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix index 22567dfd..34a0fefd 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:4a1f1f9adcee133b374dc9ea783b6b735844313f99c65fb62cb15cc0089d1948"; - sha256 = "0wffb24wirkkf43zalif72f155byccqmsgna7rrjln25jpdpnz5a"; + imageDigest = "sha256:ab3c6fb537e1b3085963c7407a4971e7e535812341eb65b10b42691389697292"; + sha256 = "0x35v68bjwjkfnrjqvisg4gv7dwaz5qsb9y3xl2rdrbjbm30yvg4"; finalImageName = "ghcr.io/linuxserver/calibre"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix index 41e3bd57..df9bdd0b 100644 --- a/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix +++ b/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/prowlarr"; - imageDigest = "sha256:3061e68afda543202ee7382cbfe3bfa94a1ab7d03ebaa242c732ffe2f73088f0"; - sha256 = "035jk818vg9znnjhx1qfaj2ay6h4d2snzbli7pa96l7ccyf2r8j4"; + imageDigest = "sha256:211cfc5b99e14dee7d49190b6ac8cceee3183a58240d522fb1937847ee4518e4"; + sha256 = "0i9kd2syyq2y91aw8d6d8q6a44811a498bl25m1h3cx3j25m4vd4"; finalImageName = "ghcr.io/linuxserver/prowlarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nextcloud.nix b/devices/nos/modules/arion/nextcloud/images/nextcloud.nix index fa1cf4d0..6de584f5 100644 --- a/devices/nos/modules/arion/nextcloud/images/nextcloud.nix +++ b/devices/nos/modules/arion/nextcloud/images/nextcloud.nix @@ -1,7 +1,7 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "nextcloud"; - imageDigest = "sha256:43c6307906f65f17d6b22d01d25f7024700f2affa774ae7128c882f0276bf772"; + imageDigest = "sha256:48d1331618f781b65d2577c8f954993995c93d02201e5a32d5da2871920bc7c4"; sha256 = "0lmhq6bw730jcz1gv1wn5zcfqi3vr3zlvnfpqqwv5zl6fg9kppl4"; finalImageName = "nextcloud"; finalImageTag = "29.0.3-fpm"; diff --git a/devices/nos/modules/arion/nextcloud/images/nginx.nix b/devices/nos/modules/arion/nextcloud/images/nginx.nix index 949e55e6..fc6aff36 100644 --- a/devices/nos/modules/arion/nextcloud/images/nginx.nix +++ b/devices/nos/modules/arion/nextcloud/images/nginx.nix @@ -1,7 +1,7 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "nginx"; - imageDigest = "sha256:1aaa8180df68200fd41f9066cf62155e3b71183c04b2895a7388d5fd84ef3c8b"; + imageDigest = "sha256:67682bda769fae1ccf5183192b8daf37b64cae99c6c3302650f6f8bf5f0f95df"; sha256 = "17l0zpn8f8s25dwqkbm9ak9xbkz5czpfsnwvhdm7ykq52kxpxs5x"; finalImageName = "nginx"; finalImageTag = "latest"; diff --git a/flake.lock b/flake.lock index ec937b54..64a390a3 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,22 @@ "type": "github" } }, + "Vencord-src": { + "flake": false, + "locked": { + "lastModified": 1719685620, + "narHash": "sha256-dtskvmrDOhOWBh6TLDxM22ArAaCj8wXdhBvyexkS4Qs=", + "owner": "Vendicated", + "repo": "vencord", + "rev": "5c05443f454dd04288108330875f437889dc6812", + "type": "github" + }, + "original": { + "owner": "Vendicated", + "repo": "vencord", + "type": "github" + } + }, "ags": { "inputs": { "nixpkgs": [ @@ -177,6 +193,27 @@ "type": "github" } }, + "discord-overlay": { + "inputs": { + "Vencord-src": "Vencord-src", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720025180, + "narHash": "sha256-YqbLbkuy8KgMdjJED5e+BPbtmNiPWWHHVReb0R9dLeY=", + "owner": "matt1432", + "repo": "discord-nightly-overlay", + "rev": "8bbf82967d5f685b93f4128a17516b32824a829f", + "type": "github" + }, + "original": { + "owner": "matt1432", + "repo": "discord-nightly-overlay", + "type": "github" + } + }, "dracula-plymouth-src": { "flake": false, "locked": { @@ -334,11 +371,11 @@ ] }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -897,11 +934,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1719992360, + "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b", "type": "github" }, "original": { @@ -993,11 +1030,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719915468, - "narHash": "sha256-vSutSKzLH63dCwvyrLg1wJmbgjH351/++9RQY3S3TYo=", + "lastModified": 1719949580, + "narHash": "sha256-HDZpI+/LR4fh6TCqByoZrP5/cN3iSiDO0JqG/yKWDWQ=", "ref": "refs/heads/main", - "rev": "2fa57f2dc4909be697d003a22ce6870039e4db9b", - "revCount": 4902, + "rev": "8bb75a223db3ea9471d05d74fbed3328334a9f78", + "revCount": 4904, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1188,11 +1225,11 @@ ] }, "locked": { - "lastModified": 1719631702, - "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", + "lastModified": 1720025282, + "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", + "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d", "type": "github" }, "original": { @@ -1334,11 +1371,11 @@ ] }, "locked": { - "lastModified": 1719913883, - "narHash": "sha256-GHB5lizmXGlglKYAKIvY9bkPcXvbrmEzh4d264omYYo=", + "lastModified": 1719971132, + "narHash": "sha256-/u/dRd43l8WHW8WIEAtMf4KnayefCLpB3VpLF2FBEno=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0289cf03e294270c84f20bc09cd527fd7f3d4b72", + "rev": "97bbe0cc1dc3d8962a9d15404a3c41da0ad2a3b3", "type": "github" }, "original": { @@ -1350,11 +1387,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719827289, - "narHash": "sha256-0IcxmkzmNY4el9yx7wGjZ+VDLGV+3XlI6AW9WfCbzAM=", + "lastModified": 1719963642, + "narHash": "sha256-2+K/i8t4FkGCHEanISE8Q/SbLmWKp1dtpGlf44/x4m0=", "owner": "neovim", "repo": "neovim", - "rev": "8f5e90811025bcc652146168d5116f8d73fe8f81", + "rev": "d413038b4fd71b7a335b6653aa64d2cb6daeac7b", "type": "github" }, "original": { @@ -1824,11 +1861,11 @@ ] }, "locked": { - "lastModified": 1719918908, - "narHash": "sha256-GJHzx9LUG2P6hnNvQ+nqWXrQMZDttYaH7RA66ad3mhU=", + "lastModified": 1720023756, + "narHash": "sha256-FzsYBfW04D+jUzORiSqQKTYrNpkSn1LbCz30hVTt7TI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "64553807b64c630f57d6a3a09afc1e9fbc33995e", + "rev": "38c8401633bea97ba1047e3ad54eb6e620d1c29f", "type": "github" }, "original": { @@ -1986,11 +2023,11 @@ ] }, "locked": { - "lastModified": 1719903879, - "narHash": "sha256-4b/t2hSDU89dzivLOnjaU48SBGRh0Q3TkOZLpbxukhM=", + "lastModified": 1719990335, + "narHash": "sha256-nGX7dPhesdm89CD28m9KGoGQK7ab0vryBDg25GMTzeU=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "08cc72e4699da7f1f2580d9c75d61835f6367ee7", + "rev": "121c248d881568e779c386921df763d26d2849b7", "type": "github" }, "original": { @@ -2110,6 +2147,7 @@ "bazarr-bulk": "bazarr-bulk", "caddy-plugins": "caddy-plugins", "curseforge-server-downloader-src": "curseforge-server-downloader-src", + "discord-overlay": "discord-overlay", "dracula-plymouth-src": "dracula-plymouth-src", "eisa-scripts-src": "eisa-scripts-src", "firefox-gx-src": "firefox-gx-src", @@ -2310,11 +2348,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1719882360, - "narHash": "sha256-vmMqin2swEIYWZ0+WYQ+HYKglsafl+YOB6MfMCHxBDQ=", + "lastModified": 1719989577, + "narHash": "sha256-e274clgG6fLiv6iko+qfHfjPAMtmbEXFncA/fsubOFg=", "owner": "matt1432", "repo": "nix-steam-servers", - "rev": "2791caa3a0504bb4a822ea64598f8f156d8f4257", + "rev": "acfa5b03f338a460bec7509794aad2be8002f37b", "type": "github" }, "original": { @@ -2574,11 +2612,11 @@ ] }, "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b9c89c17..5c4f9e58 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,12 @@ repo = "curseforge-server-downloader"; type = "github"; }; + discord-overlay = { + inputs.nixpkgs.follows = "nixpkgs"; + owner = "matt1432"; + repo = "discord-nightly-overlay"; + type = "github"; + }; dracula-plymouth-src = { flake = false; owner = "matt1432"; diff --git a/inputs.nix b/inputs.nix index 5e62fb9d..e9f8a194 100644 --- a/inputs.nix +++ b/inputs.nix @@ -168,6 +168,11 @@ let # FIXME: latest breaks rev = "d4a9cd8b751bed47bf57a93a7ee63054ba43e63b"; }; + + discord-overlay = mkDep { + owner = "matt1432"; + repo = "discord-nightly-overlay"; + }; }; agsInputs = { diff --git a/lib.nix b/lib.nix index 79473c72..92bd7e76 100644 --- a/lib.nix +++ b/lib.nix @@ -13,6 +13,7 @@ inherit system; config.allowUnfree = true; overlays = [ + inputs.discord-overlay.overlays.default inputs.grim-hyprland.overlays.default inputs.jovian.overlays.default inputs.nixpkgs-wayland.overlays.default diff --git a/pkgs/firefox-addons/generated-firefox-addons.nix b/pkgs/firefox-addons/generated-firefox-addons.nix index fe25f5a2..57a16085 100644 --- a/pkgs/firefox-addons/generated-firefox-addons.nix +++ b/pkgs/firefox-addons/generated-firefox-addons.nix @@ -81,10 +81,10 @@ }; "darkreader" = buildFirefoxXpiAddon { pname = "darkreader"; - version = "4.9.86"; + version = "4.9.87"; addonId = "addon@darkreader.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4295557/darkreader-4.9.86.xpi"; - sha256 = "dde9896751858d0179f3d724a59f2bd4a0d61e599cb8822dc8ed2de320510714"; + url = "https://addons.mozilla.org/firefox/downloads/file/4310627/darkreader-4.9.87.xpi"; + sha256 = "0327d42e507979b0a0443b6aad24d011fea50dd020bcfd07b326bd3df285c79b"; meta = with lib; { homepage = "https://darkreader.org/"; description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing."; @@ -102,10 +102,10 @@ }; "floccus" = buildFirefoxXpiAddon { pname = "floccus"; - version = "5.2.3"; + version = "5.2.4"; addonId = "floccus@handmadeideas.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4307321/floccus-5.2.3.xpi"; - sha256 = "87fddf96f0aa0b77f0e00630e661ff40cfd487414a1f7bd8b0b864e67388d700"; + url = "https://addons.mozilla.org/firefox/downloads/file/4313094/floccus-5.2.4.xpi"; + sha256 = "bb0c57a8b2d866a5996d9f8abd41829e54cc1b01f867a8c2196cbb3f1e231398"; meta = with lib; { homepage = "https://floccus.org"; description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive.";