diff --git a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix index 01f58dd3..5b9d8513 100644 --- a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:ffc5966ca95af2d031a5c7561d3144454898e330a68862bb0299db6349806c25"; - sha256 = "059qly0brjsh3ch6b2kmsn2rfsvlvayiaqkpiiydr6fyh85ryrvj"; + imageDigest = "sha256:a4e973ca2c1967d4dae52bfd0694aa38e547c1f3e0c52553d0789ad4d55e6423"; + sha256 = "1w6ysakdf5wvbppcx1asa7bay0y2bv0hbrszwrnwgn59ivnj4iva"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix index d2011080..eccaad30 100644 --- a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix +++ b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/prowlarr"; - imageDigest = "sha256:c93f075dc5afb74dc7a0a55e90974f81425a5d3c5d293022c5416431f4963ce9"; - sha256 = "05wlrw597wrhglqzcki4fsqq4zm7wlyw5hzsm7jdq4dibji819x5"; + imageDigest = "sha256:9dd32e2270d174b07bd33a1f54e2b79e03ad944df62ed93efa08f4a381adc9a1"; + sha256 = "1kx10is1zzwrgdz6y7i98jk3vmx7rv74dpgicimb1msdy9qm7m70"; finalImageName = "ghcr.io/linuxserver/prowlarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/radarr/images/radarr.nix b/devices/nos/modules/docker/media/radarr/images/radarr.nix index 010ddb0a..f7fd69ad 100644 --- a/devices/nos/modules/docker/media/radarr/images/radarr.nix +++ b/devices/nos/modules/docker/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/radarr"; - imageDigest = "sha256:b034531ff81d3e5e1f9fd70c969746040b40e6484c88981ea5d0dee732c10bc3"; - sha256 = "0f2xbmad25nb7l18pk1424dgv0k23m0bpv25bf7bgawb98p1jgdj"; + imageDigest = "sha256:47acec85a0d92d107096088aebe83d1d0a434def34e5bac317fff18ca28741ae"; + sha256 = "1ad420vn49kj4igl9c88bl9cdwylcqdbmc947zr1cgf8h1w3igh0"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 55c03168..966ec85b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "Vencord-src": { "flake": false, "locked": { - "lastModified": 1724914581, - "narHash": "sha256-s9xvqWBRCqdc2MXQC6a4z67G9QpiqErfZMKQoXVgm3I=", + "lastModified": 1725252856, + "narHash": "sha256-0NPKSPWgQj9wxiXw4ukc8UALqqupNAMxOeqFAoxEn40=", "owner": "Vendicated", "repo": "vencord", - "rev": "db2f5c9292ad40c5939e1023b21aed622a793a6f", + "rev": "accfc15125c5a611cb5835815a6e36d6bd4e8f89", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1725016199, - "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=", + "lastModified": 1725199881, + "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906", + "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "type": "github" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1725087993, - "narHash": "sha256-DZMhzJKruW/CWDW+OZi9DwpISUvYeQcLrv5g3SUOOF4=", + "lastModified": 1725260826, + "narHash": "sha256-K8UaszKLWjkZ6UxhT3G51TNiBZPb6j0vpGSqSN4d3O8=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "6140012164764a1f3c3cf8aafacfc2158e165680", + "rev": "a4a9f8356f2ba67e6387d378a34128fef20bbf10", "type": "github" }, "original": { @@ -272,11 +272,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725024810, + "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -580,11 +580,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1725134108, - "narHash": "sha256-OIOBT4NKPmTUXTND0IDUfhX+8YBQztSvhJ91LfEK4Sk=", + "lastModified": 1725219211, + "narHash": "sha256-17WA01XfBTuH1CJdGje3095K/7RUUL6lwQHEFq9t2Go=", "ref": "refs/heads/main", - "rev": "a6315b0af4e417cf396649d9c5792d3c5420b713", - "revCount": 5172, + "rev": "6934e7aa2b300bc4565855a4092fb34de8a9a8d2", + "revCount": 5178, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1724174162, - "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", + "lastModified": 1725188252, + "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", + "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "type": "github" }, "original": { @@ -679,6 +679,59 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprpaper", + "hyprutils" + ], + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1725188252, + "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprpaper": { + "inputs": { + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs", + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1725200438, + "narHash": "sha256-3Cqu8jz19YyWqhneac6QFfadlyxZ4s3saSLmmpYMOe4=", + "owner": "hyprwm", + "repo": "hyprpaper", + "rev": "1c18ad65032adb891b341292a1edf9e13adf4751", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpaper", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -704,6 +757,31 @@ "type": "github" } }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -729,6 +807,31 @@ "type": "github" } }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1721324119, + "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "jellyfin-flake": { "inputs": { "nixpkgs": [ @@ -757,11 +860,11 @@ ] }, "locked": { - "lastModified": 1724999205, - "narHash": "sha256-Lc9kb5hhUohcJlUye5Pu8BNYHDPIOUtejYySTvHTlio=", + "lastModified": 1725153537, + "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a14f978f74e89213a5f565f827454dd6178b2bb5", + "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", "type": "github" }, "original": { @@ -798,11 +901,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1724587851, - "narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=", + "lastModified": 1725192674, + "narHash": "sha256-xEAVzgkjtdi9b4nl1yHWtiaPqYuvB7pwU9OurXv9Lls=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f", + "rev": "3f10d853f98081feec35b736e38da91202a87c3a", "type": "github" }, "original": { @@ -919,11 +1022,11 @@ ] }, "locked": { - "lastModified": 1724689275, - "narHash": "sha256-wpxC7XiZ9maYZA4BSLKGXc+pn2fwaiq2Ybu5kNjl1ao=", + "lastModified": 1725287741, + "narHash": "sha256-ZxyB7BwxQjoMz5lUnsb+KuTWfRyPtJVqEjnlOoABSUE=", "owner": "viperML", "repo": "nh", - "rev": "a922eada049854019c5d1bbc82383f7095773e5c", + "rev": "5dd64eb04fddeac2eb08c018212cc58978934920", "type": "github" }, "original": { @@ -936,7 +1039,7 @@ "inputs": { "flake-parts": "flake-parts_4", "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1010,11 +1113,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1724549799, - "narHash": "sha256-F4lN1qmMJpJALwZ2ENb6MDSXG40om7ktZyAt7yh/DS8=", + "lastModified": 1725154929, + "narHash": "sha256-AONhBZQgiJb/teEJF7PV6EpyLLpF2ddSbY7HJNdFSxw=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "963803d3be8ed721b21326804513dec884e9d494", + "rev": "76446e879c956930a7f5f6f1d0440b3df67e0dda", "type": "github" }, "original": { @@ -1074,11 +1177,11 @@ ] }, "locked": { - "lastModified": 1724576102, - "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", + "lastModified": 1725161148, + "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", + "rev": "32058e9138248874773630c846563b1a78ee7a5b", "type": "github" }, "original": { @@ -1160,11 +1263,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -1208,11 +1311,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1724547350, - "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", + "lastModified": 1725152544, + "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", + "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", "type": "github" }, "original": { @@ -1291,11 +1394,11 @@ ] }, "locked": { - "lastModified": 1725138342, - "narHash": "sha256-mKqQHEFoQs6ovgfSbDdCIRI8PU2EBhO7yfrbzo+yUCI=", + "lastModified": 1725292436, + "narHash": "sha256-AeRcvPq2SLjpLP1cXe5SjFUmwuO5BY4bskRcrxRZtJU=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "3f77707cda31a148a5c746b4d53a380e1ca9af3c", + "rev": "52b72b12c456a5c0c87c40941ef79335e8d61104", "type": "github" }, "original": { @@ -1305,6 +1408,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1723221148, "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", @@ -1417,11 +1536,11 @@ ] }, "locked": { - "lastModified": 1724483079, - "narHash": "sha256-RdpdY+Df4bOOUd+SQAbGYPbgAF6eMq6y7Utg2W9owiY=", + "lastModified": 1725260703, + "narHash": "sha256-oBt1elQhceno6qosB1aw/BzaZPJiaguQtK2gEOvZRbE=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "724893bbd57c96c8e4f7619fc9691cd117904259", + "rev": "cd327ffb8c0202a9f417cf133fa1856fbe85547d", "type": "github" }, "original": { @@ -1538,6 +1657,7 @@ "hyprgrass": "hyprgrass", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", + "hyprpaper": "hyprpaper", "jellyfin-flake": "jellyfin-flake", "jovian": "jovian", "khepri": "khepri", @@ -1555,7 +1675,7 @@ "nix-melt": "nix-melt", "nix-on-droid": "nix-on-droid", "nixd": "nixd", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-wayland": "nixpkgs-wayland", "nurl": "nurl", "nvim-theme-src": "nvim-theme-src", @@ -1640,11 +1760,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1725201042, + "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", "type": "github" }, "original": { @@ -1864,11 +1984,11 @@ "wakewords-src": { "flake": false, "locked": { - "lastModified": 1721909332, - "narHash": "sha256-DdxK5Km4d9hQ2V27FjQNNdORd1HqBEByIwuz5RogDT8=", + "lastModified": 1725270265, + "narHash": "sha256-wZsGZW1gOpG5Ufw0mmLFhmQU/seqLPlltRYHsFt1qCs=", "owner": "fwartner", "repo": "home-assistant-wakewords-collection", - "rev": "18ba1c5d1877cd08622955f59609a53f3a2ff920", + "rev": "de66e86df3450b4f4d846f56c197891f5d586bd4", "type": "github" }, "original": { @@ -1894,11 +2014,11 @@ ] }, "locked": { - "lastModified": 1724073926, - "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", + "lastModified": 1725203932, + "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", + "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 32289e76..3c5665d0 100644 --- a/flake.nix +++ b/flake.nix @@ -141,6 +141,12 @@ repo = "hyprland-plugins"; type = "github"; }; + hyprpaper = { + inputs.systems.follows = "systems"; + owner = "hyprwm"; + repo = "hyprpaper"; + type = "github"; + }; jellyfin-flake = { inputs.nixpkgs.follows = "nixpkgs"; owner = "matt1432"; diff --git a/inputs.nix b/inputs.nix index 7bd38a81..025bd5b9 100644 --- a/inputs.nix +++ b/inputs.nix @@ -140,6 +140,12 @@ let repo = "hyprgrass"; }; + # FIXME: use mkDep when it stops breaking + hyprpaper = mkInput { + owner = "hyprwm"; + repo = "hyprpaper"; + }; + grim-hyprland = mkDep { owner = "eriedaberrie"; repo = "grim-hyprland"; diff --git a/legacyPackages/firefox-addons/generated-firefox-addons.nix b/legacyPackages/firefox-addons/generated-firefox-addons.nix index 2f123cdf..15b0446e 100644 --- a/legacyPackages/firefox-addons/generated-firefox-addons.nix +++ b/legacyPackages/firefox-addons/generated-firefox-addons.nix @@ -289,10 +289,10 @@ }; "ttv-lol-pro" = buildFirefoxXpiAddon { pname = "ttv-lol-pro"; - version = "2.3.8"; + version = "2.3.9"; addonId = "{76ef94a4-e3d0-4c6f-961a-d38a429a332b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4341329/ttv_lol_pro-2.3.8.xpi"; - sha256 = "1c091b622851abf3d98dfe97c827e30f1211d3751d92a581a9fbe77ed8916568"; + url = "https://addons.mozilla.org/firefox/downloads/file/4344061/ttv_lol_pro-2.3.9.xpi"; + sha256 = "a807d331dfd3436a5db7c0c8e9ba9c10c2d9475226a7ca47f620341a7d4c71a6"; meta = with lib; { homepage = "https://github.com/younesaassila/ttv-lol-pro"; description = "TTV LOL PRO removes most livestream ads from Twitch."; diff --git a/nixosModules/desktop/theme/hyprpaper.nix b/nixosModules/desktop/theme/hyprpaper.nix index 4bf1af71..96fdb600 100644 --- a/nixosModules/desktop/theme/hyprpaper.nix +++ b/nixosModules/desktop/theme/hyprpaper.nix @@ -4,9 +4,10 @@ self: { ... }: { config = let + hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default; wallpaper = toString self.legacyPackages.${pkgs.system}.dracula.wallpaper; in { - home.packages = [pkgs.hyprpaper]; + home.packages = [hyprpaper]; xdg.configFile."hypr/hyprpaper.conf" = { text = lib.hm.generators.toHyprconf {