From 4971014e1959a17ab1a941076a7b2b01715b7949 Mon Sep 17 00:00:00 2001 From: matt1432 <matt@nelim.org> Date: Fri, 14 Mar 2025 23:37:36 -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 'custom-sidebar-src': 'github:elchininet/custom-sidebar' (2025-03-12) rev: 82f40bbaa1bf833290de84efbdc576362cc75905 → 'github:elchininet/custom-sidebar' (2025-03-15) rev: c7750d7b10b01d17d9850db58a8c8ac8211eb9d5 • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-03-13) rev: bab9a0560d15e7e1621469cf8db3e70bc29833b6 → 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-03-14) rev: 190c775a08ca092ac0145ce3483a421bfdc940c6 • Updated input 'home-manager': 'github:nix-community/home-manager' (2025-03-14) rev: 30cce6848a5aa41ceb5fb33185b84868cc3e9bef → 'github:nix-community/home-manager' (2025-03-14) rev: 4e12151c9e014e2449e0beca2c0e9534b96a26b4 • Updated input 'hyprgrass': 'github:horriblename/hyprgrass' (2025-03-13) rev: ce0dcda79e0b24c9dfee2d80df50940669554f9d → 'github:horriblename/hyprgrass' (2025-03-14) rev: 94ebb595b646c9788b9d39928648deab24ece9d0 • Updated input 'hyprland': 'github:hyprwm/Hyprland' (2025-03-12) rev: e86d3a14e46d19d8a47f8ceb6410546715d45f10 → 'github:hyprwm/Hyprland' (2025-03-15) rev: e59680481d74fdfcc432bb9640ba2c979022c4c2 • Updated input 'hyprland/aquamarine': 'github:hyprwm/aquamarine' (2025-03-06) rev: 81498562d0f53e613d30368bb5b076784fa86f80 → 'github:hyprwm/aquamarine' (2025-03-14) rev: bea48d0bbe15fb3d758a8b6be865836c97056575 • Updated input 'hyprland/hyprutils': 'github:hyprwm/hyprutils' (2025-03-04) rev: 6b0154b183f9539097f13af9b5da78ca24da6df2 → 'github:hyprwm/hyprutils' (2025-03-09) rev: dd1f720cbc2dbb3c71167c9598045dd3261d27b3 • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland' (2025-01-23) rev: e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a → 'github:hyprwm/xdg-desktop-portal-hyprland' (2025-03-14) rev: 150b0b6f52bb422a1b232a53698606fe0320dde0 • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS' (2025-03-13) rev: 662d117ac0ffc81f3e91b5f0fb800c3effd904a1 → 'github:Jovian-Experiments/Jovian-NixOS' (2025-03-14) rev: 534188d0b0cbddf3f9df3f20cfbc424efb46b36c • Updated input 'material-symbols-src': 'github:beecho01/material-symbols' (2025-03-05) rev: 35cb201a18931f2096a883cf86bc08cc11ec456c → 'github:beecho01/material-symbols' (2025-03-14) rev: 376709da5aa69163ffb02deb13e9e7fac93ae53f • Updated input 'nix-gaming': 'github:fufexan/nix-gaming' (2025-03-11) rev: 64a949349294543a48b3f946c9fca84332d1398b → 'github:fufexan/nix-gaming' (2025-03-14) rev: b2a32ef80ad0cc7f3dee928771791625ff9494c1 • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2025-03-13) rev: 01f44b8389188522fba255168c70eda093867746 → 'github:NixOS/nixpkgs' (2025-03-13) rev: 6607cf789e541e7873d40d3a8f7815ea92204f32 • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2025-03-13) rev: 35d3b8403711ab0b38c4554703c283900cfeeb7a → 'github:nix-community/nixpkgs-wayland' (2025-03-15) rev: ff6a5e6d2e8ae7ffff051ea35966ae2d225f397e • Updated input 'spotifyplus-src': 'github:thlucas1/homeassistantcomponent_spotifyplus' (2025-03-13) rev: cf1acfa270b14bdaae8ca4f36cf7099f65824554 → 'github:thlucas1/homeassistantcomponent_spotifyplus' (2025-03-14) rev: 05a60bbefa09ac173ce8dab0dd5d71d23b379ac9 • Updated input 'spotifywebapi-src': 'github:thlucas1/SpotifyWebApiPython' (2025-03-13) rev: e6c5bfe0c5621bf0e24d61060a7c181a6226c6c4 → 'github:thlucas1/SpotifyWebApiPython' (2025-03-14) rev: 23e89dc0a68d10447e756ee6c0e5e9fa0fdbdc18 Docker Images: • vegardit/gitea-act-runner dind-latest: sha256:a1c106a18b1fa02736064a18f9d31d18253347b7625673a58d5cfd98cc64bc2f → sha256:6190e52b6df100a1ca6be7e2e8331c60422440f98dfd286cc49c6be54d6783b5 • nextcloud fpm: sha256:dd76149894cc80b2d55b06d9d3f79a8aacc9d5246161bdcf4e0271406af10c8e → sha256:6854c0336040c628b84bd286fa898675d00d77139b0299c6e39793da454e2115 • ghcr.io/linuxserver/sonarr latest: sha256:49a8e636fd4514b23d37c84660101fecbb632174ba0569e0f09bbd2659a2a925 → sha256:b666479159c0ffc17d5c2281737c9a88d78afcaa0aa52cb441b46336f6feba31 nix-update executions: homepage: 1.0.1 -> 1.0.2 --- .../docker/forgejo/images/act_runner.nix | 4 +- .../docker/media/sonarr/images/sonarr.nix | 4 +- .../docker/nextcloud/images/nextcloud.nix | 4 +- flake.lock | 95 +++++++++---------- flake.nix | 3 +- inputs/default.nix | 5 +- modules/desktop/default.nix | 23 ++--- .../desktop/environment/home/hyprgrass.nix | 11 ++- packages/homepage/default.nix | 4 +- 9 files changed, 74 insertions(+), 79 deletions(-) diff --git a/configurations/nos/modules/docker/forgejo/images/act_runner.nix b/configurations/nos/modules/docker/forgejo/images/act_runner.nix index ede315be..2661e31f 100644 --- a/configurations/nos/modules/docker/forgejo/images/act_runner.nix +++ b/configurations/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:a1c106a18b1fa02736064a18f9d31d18253347b7625673a58d5cfd98cc64bc2f"; - hash = "sha256-7VImcP/RRncdHzdO8ipyyFxco5e2KCp/+Wyk+gbhwZg="; + imageDigest = "sha256:6190e52b6df100a1ca6be7e2e8331c60422440f98dfd286cc49c6be54d6783b5"; + hash = "sha256-A5zDXAz/PXr7d2GnhTpla6XC3q4I6jG8dBqHN4IOujk="; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix b/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix index 3f8412a9..780e978e 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:49a8e636fd4514b23d37c84660101fecbb632174ba0569e0f09bbd2659a2a925"; - hash = "sha256-Ww7AGvfRfciiXsGswETO7E5Uv9bJ7kdkdF9VzIrIvBQ="; + imageDigest = "sha256:b666479159c0ffc17d5c2281737c9a88d78afcaa0aa52cb441b46336f6feba31"; + hash = "sha256-SXIAr0N/wu/ElvSpLcmo6xq7I5D4c+v0ZefV0aMv5Zw="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix b/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix index 56569578..7a5cfb76 100644 --- a/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix +++ b/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "nextcloud"; - imageDigest = "sha256:dd76149894cc80b2d55b06d9d3f79a8aacc9d5246161bdcf4e0271406af10c8e"; - hash = "sha256-t+rO/8wKu7lP5UCk/u8n+fw+R4J6kDtmy4h5qdFnQkE="; + imageDigest = "sha256:6854c0336040c628b84bd286fa898675d00d77139b0299c6e39793da454e2115"; + hash = "sha256-1XT0oE6i2Dhpx8PbjdjbSwo0e37KEoSQ+cJNjowECWo="; finalImageName = imageName; finalImageTag = "fpm"; } diff --git a/flake.lock b/flake.lock index 4fc61fd3..2786bb35 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1741282631, - "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", + "lastModified": 1741934125, + "narHash": "sha256-qwI47l3aKXRpDvmCKDbLV70iVfAqhpuKqT7qYHA4KJk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81498562d0f53e613d30368bb5b076784fa86f80", + "rev": "bea48d0bbe15fb3d758a8b6be865836c97056575", "type": "github" }, "original": { @@ -155,11 +155,11 @@ "custom-sidebar-src": { "flake": false, "locked": { - "lastModified": 1741812120, - "narHash": "sha256-Hbh6I9DsEdjDDC1X3/0EXOy+CCzBT2XmaKZWMwe6bkY=", + "lastModified": 1741997117, + "narHash": "sha256-TG5ZYcWoL2kMN79prznYIWb/aeIcCY29vT5BoZ46D9s=", "owner": "elchininet", "repo": "custom-sidebar", - "rev": "82f40bbaa1bf833290de84efbdc576362cc75905", + "rev": "c7750d7b10b01d17d9850db58a8c8ac8211eb9d5", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1741907872, - "narHash": "sha256-K2R28bipgKMgLcYXIJYT6B04daIR2xS+21BcC8bVEPU=", + "lastModified": 1741938852, + "narHash": "sha256-mqJUcFdYZw4Z+8hJNcw6E1j4j53mpJhlA3lemr8WXsc=", "ref": "refs/heads/master", - "rev": "bab9a0560d15e7e1621469cf8db3e70bc29833b6", - "revCount": 1014, + "rev": "190c775a08ca092ac0145ce3483a421bfdc940c6", + "revCount": 1015, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1741914680, - "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -542,11 +542,11 @@ ] }, "locked": { - "lastModified": 1741875624, - "narHash": "sha256-rSFV5teddhNt23QHTru379DGFyxlyW2/9qK/VMXJrIM=", + "lastModified": 1741947340, + "narHash": "sha256-qDt6wGw6PlpyJiZCTnvZPlhs6Qwgu3sMGSBLZXSKWb4=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "ce0dcda79e0b24c9dfee2d80df50940669554f9d", + "rev": "94ebb595b646c9788b9d39928648deab24ece9d0", "type": "github" }, "original": { @@ -577,17 +577,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741788549, - "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", + "lastModified": 1741998159, + "narHash": "sha256-mf3SzoEPxphBb5Ed5TS34BBbBKEZmQPFkrlZ8Bu4+dc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", + "rev": "e59680481d74fdfcc432bb9640ba2c979022c4c2", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", - "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", "type": "github" } }, @@ -790,11 +789,11 @@ ] }, "locked": { - "lastModified": 1741123584, - "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -838,11 +837,11 @@ ] }, "locked": { - "lastModified": 1741874414, - "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=", + "lastModified": 1741936035, + "narHash": "sha256-EzHZB9Im6weG2kkprL5w+uDaB+gEDy3zDTdX9WNAPw0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1", + "rev": "534188d0b0cbddf3f9df3f20cfbc424efb46b36c", "type": "github" }, "original": { @@ -917,11 +916,11 @@ "material-symbols-src": { "flake": false, "locked": { - "lastModified": 1741167717, - "narHash": "sha256-kxts2E/fQjsvYA0CwyaXZRxg2uRUKoOXtsfP2ar7HhQ=", + "lastModified": 1741973298, + "narHash": "sha256-pFLAt35HK5qnpylyL8P3EAeyp1xYdWDKeqEzfvnZl4A=", "owner": "beecho01", "repo": "material-symbols", - "rev": "35cb201a18931f2096a883cf86bc08cc11ec456c", + "rev": "376709da5aa69163ffb02deb13e9e7fac93ae53f", "type": "github" }, "original": { @@ -1162,11 +1161,11 @@ ] }, "locked": { - "lastModified": 1741657497, - "narHash": "sha256-2X7d94f9QcRnBKz1jJQfumATe8w4gXjwRly150ERnek=", + "lastModified": 1741916615, + "narHash": "sha256-SU6Q/IBGJ9a7u6WrVjZ+ShoIjK3To/lD3U37DgfX1Tw=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "64a949349294543a48b3f946c9fca84332d1398b", + "rev": "b2a32ef80ad0cc7f3dee928771791625ff9494c1", "type": "github" }, "original": { @@ -1323,16 +1322,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741874442, - "narHash": "sha256-NBj9G0yQ7FVqC8Pi61+D6Jv2EfJ9TRpHI301fgVzQn0=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f44b8389188522fba255168c70eda093867746", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1397,11 +1396,11 @@ ] }, "locked": { - "lastModified": 1741903779, - "narHash": "sha256-QqBJeYqzifGOsVv32BJxNnh2AaVXB51eMMHQCY9FFL8=", + "lastModified": 1742005794, + "narHash": "sha256-+aF6AWxBIyTb6AejaCEdbBgVReQKEg1tX8v8noLDBgo=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "35d3b8403711ab0b38c4554703c283900cfeeb7a", + "rev": "ff6a5e6d2e8ae7ffff051ea35966ae2d225f397e", "type": "github" }, "original": { @@ -1787,11 +1786,11 @@ "spotifyplus-src": { "flake": false, "locked": { - "lastModified": 1741895093, - "narHash": "sha256-VotJSDRkNMVxVfvpjf57BLzmr1cpzBZfV887w4aXulk=", + "lastModified": 1741961126, + "narHash": "sha256-NYM793HVxRoSB4FR564H8G/jD+8eg5hbyY1SiiaC47c=", "owner": "thlucas1", "repo": "homeassistantcomponent_spotifyplus", - "rev": "cf1acfa270b14bdaae8ca4f36cf7099f65824554", + "rev": "05a60bbefa09ac173ce8dab0dd5d71d23b379ac9", "type": "github" }, "original": { @@ -1803,11 +1802,11 @@ "spotifywebapi-src": { "flake": false, "locked": { - "lastModified": 1741894246, - "narHash": "sha256-F4cpcQH9cEfkhQmDKa8NQEEtXAj085PnGWP7ZkQLX2A=", + "lastModified": 1741958492, + "narHash": "sha256-rS4r0P+rd2RVyZW3QWi0kZi/3WoZdgZW1XZE74wPQNg=", "owner": "thlucas1", "repo": "SpotifyWebApiPython", - "rev": "e6c5bfe0c5621bf0e24d61060a7c181a6226c6c4", + "rev": "23e89dc0a68d10447e756ee6c0e5e9fa0fdbdc18", "type": "github" }, "original": { @@ -2011,11 +2010,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 91f84b79..40336bfe 100644 --- a/flake.nix +++ b/flake.nix @@ -156,7 +156,6 @@ }; owner = "hyprwm"; repo = "Hyprland"; - rev = "e86d3a14e46d19d8a47f8ceb6410546715d45f10"; type = "github"; }; hyprland-plugins = { @@ -354,7 +353,7 @@ }; nixpkgs = { owner = "NixOS"; - ref = "nixos-unstable-small"; + ref = "nixos-unstable"; repo = "nixpkgs"; type = "github"; }; diff --git a/inputs/default.nix b/inputs/default.nix index b3f89d2f..0728fc56 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -12,7 +12,7 @@ let nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable-small"; + ref = "nixos-unstable"; }; home-manager = mkInput { @@ -165,9 +165,6 @@ let hyprland = mkInput { owner = "hyprwm"; repo = "Hyprland"; - - # FIXME: breaks hypgrass, too lazy to fix - rev = "e86d3a14e46d19d8a47f8ceb6410546715d45f10"; }; hyprland-plugins = mkHyprDep { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 6b915f52..221555d7 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -29,22 +29,13 @@ in { } ]; - nixpkgs.overlays = - (map (i: self.inputs.${i}.overlays.default) [ - "hyprgrass" - "hyprland" - "hyprland-plugins" - "hyprpaper" - "nixpkgs-wayland" - ]) - ++ [ - (final: prev: { - # FIXME: wait for upstream to reach same nixpkgs rev - aquamarine = prev.aquamarine.override {mesa = final.libgbm;}; - hyprland = prev.hyprland.override {mesa = final.libgbm;}; - xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.override {mesa = final.libgbm;}; - }) - ]; + nixpkgs.overlays = map (i: self.inputs.${i}.overlays.default) [ + "hyprgrass" + "hyprland" + "hyprland-plugins" + "hyprpaper" + "nixpkgs-wayland" + ]; }; options.roles.desktop = { diff --git a/modules/desktop/environment/home/hyprgrass.nix b/modules/desktop/environment/home/hyprgrass.nix index 48d830bf..6e496267 100644 --- a/modules/desktop/environment/home/hyprgrass.nix +++ b/modules/desktop/environment/home/hyprgrass.nix @@ -12,7 +12,16 @@ self: { in { config = mkIf (cfg.enable && cfg.isTouchscreen) { wayland.windowManager.hyprland = { - plugins = [pkgs.hyprlandPlugins.hyprgrass]; + plugins = [ + # FIXME: I should prob do a PR + (pkgs.hyprlandPlugins.hyprgrass.overrideAttrs (o: { + patchPhase = '' + ${o.patchPhase or ""} + substituteInPlace ./src/TouchVisualizer.hpp --replace-fail \ + "#include <hyprland/src/render/Shaders.hpp>" "" + ''; + })) + ]; settings = { plugin.touch_gestures = { diff --git a/packages/homepage/default.nix b/packages/homepage/default.nix index ce419fd7..fa4be4ee 100644 --- a/packages/homepage/default.nix +++ b/packages/homepage/default.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "homepage-dashboard"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${finalAttrs.version}"; - hash = "sha256-cnVnNA0+UYYLyo7HgNvkWoSAJhr0T51MGItd/JIencE="; + hash = "sha256-9x0BuSl9WNiqkDH5Dtt1KqxYxQDYaDSBH8ywH/8O6VU="; }; pnpmDepsHash = "sha256-E16+JLtfoiWCXwgFGdTGuFlx/pYxhINNl6tCuF9Z6MQ=";