From 7617e3ea2d82de5cad0a0ab77510a6c063281012 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 13 Mar 2025 22:50:02 -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-09) rev: 2f653a66ca72251668a774a1fedc77d66ffa5d19 → 'github:elchininet/custom-sidebar' (2025-03-12) rev: 82f40bbaa1bf833290de84efbdc576362cc75905 • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-03-07) rev: f23308444a94b96cf943fedc669bf2b7bc505a16 → 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2025-03-13) rev: bab9a0560d15e7e1621469cf8db3e70bc29833b6 • Updated input 'gtk-theme-src': 'github:dracula/gtk' (2025-03-04) rev: 285ff8f10084b5fdae045a8e8d09352be9af4452 → 'github:dracula/gtk' (2025-03-13) rev: fc59294cf67110f6487f5fd06d3c845ffffdf1a9 • Updated input 'home-manager': 'github:nix-community/home-manager' (2025-03-12) rev: 18780912345970e5b546b1b085385789b6935a83 → 'github:nix-community/home-manager' (2025-03-14) rev: 30cce6848a5aa41ceb5fb33185b84868cc3e9bef • Updated input 'hyprgrass': 'github:horriblename/hyprgrass' (2025-03-03) rev: e59bc280b71be8c45638806f3123fc36834435bc → 'github:horriblename/hyprgrass' (2025-03-13) rev: ce0dcda79e0b24c9dfee2d80df50940669554f9d • Added input 'hyprgrass/nixpkgs': follows 'nixpkgs' • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS' (2025-03-12) rev: 2f6342dc0cc9ffe5f9be8bd4db6ce43f2c4c1d87 → 'github:Jovian-Experiments/Jovian-NixOS' (2025-03-13) rev: 662d117ac0ffc81f3e91b5f0fb800c3effd904a1 • Updated input 'kompass': 'github:kotontrion/kompass' (2025-03-12) rev: cf6c8b26137adafae845f3905c11c98a197cd6cd → 'github:kotontrion/kompass' (2025-03-13) rev: 1a4bc3593d10512a468a9f7c02b18f7455fcb1c2 • Updated input 'nix-fast-build': 'github:Mic92/nix-fast-build' (2025-01-11) rev: 906af17fcd50c84615a4660d9c08cf89c01cef7d → 'github:Mic92/nix-fast-build' (2025-03-13) rev: 0ef0c6065345426fb4872c9ee75a58c11f62d3f8 • Updated input 'nixcord': 'github:kaylorben/nixcord' (2025-03-07) rev: 269b69665a78f57f2bc1b62e05e823815f41cea9 → 'github:kaylorben/nixcord' (2025-03-13) rev: 91abbf5736459beeacb1c3163a2236241cfc6c71 • Updated input 'nixos-jellyfin': 'github:matt1432/nixos-jellyfin' (2025-03-06) rev: d4bd900cd1792f939b6a2650537ebee6e2130802 → 'github:matt1432/nixos-jellyfin' (2025-03-12) rev: f3e37d6173969c2d7bec41a3888d96acde88bc5a • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2025-03-12) rev: 75cd88fa9bfa1cf444a62d5e713fc76bb0fbba6f → 'github:NixOS/nixpkgs' (2025-03-13) rev: 01f44b8389188522fba255168c70eda093867746 • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2025-03-12) rev: 120cd8e7a8c191e097b663e2cb9a1aa4c2588a31 → 'github:nix-community/nixpkgs-wayland' (2025-03-13) rev: 35d3b8403711ab0b38c4554703c283900cfeeb7a • Updated input 'pcsd': 'github:matt1432/nixos-pcsd' (2025-02-01) rev: 1b27f1f60ae18e240269601ac09d9d5a096498b7 → 'github:matt1432/nixos-pcsd' (2025-03-12) rev: 978c9a1d7aed8b0c94357f4173b60f46945d118b • Updated input 'sops-nix': 'github:Mic92/sops-nix' (2025-03-10) rev: e653d71e82575a43fe9d228def8eddb73887b866 → 'github:Mic92/sops-nix' (2025-03-13) rev: d016ce0365b87d848a57c12ffcfdc71da7a2b55f • Updated input 'spotifyplus-src': 'github:thlucas1/homeassistantcomponent_spotifyplus' (2025-03-09) rev: 9850db38e136a885dc147e1ab00cb53957e77513 → 'github:thlucas1/homeassistantcomponent_spotifyplus' (2025-03-13) rev: cf1acfa270b14bdaae8ca4f36cf7099f65824554 • Updated input 'spotifywebapi-src': 'github:thlucas1/SpotifyWebApiPython' (2025-03-09) rev: 0a005a5e30fbf0afd840f9978b9386df7accb8b6 → 'github:thlucas1/SpotifyWebApiPython' (2025-03-13) rev: e6c5bfe0c5621bf0e24d61060a7c181a6226c6c4 Docker Images: • vegardit/gitea-act-runner dind-latest: sha256:a1c106a18b1fa02736064a18f9d31d18253347b7625673a58d5cfd98cc64bc2f → sha256:6190e52b6df100a1ca6be7e2e8331c60422440f98dfd286cc49c6be54d6783b5 • freshrss/freshrss latest: sha256:d18055cc1c2fa807f118accb4ba74f435d381daf96130f87b17d9d9d1d169341 → sha256:bca4407f1f3ecb2e02bd57f704593c64f89bbf3fad53f03ebcf4baecb0122de6 nix-update executions: fcft: 3.3.0 -> 3.3.1 --- 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 | 6 +- apps/pin-inputs/default.nix | 2 +- apps/pin-inputs/package-lock.json | 6 +- apps/update-sources/default.nix | 2 +- apps/update-sources/package-lock.json | 8 +- .../docker/freshrss/images/freshrss.nix | 4 +- flake.lock | 102 +++++++++--------- flake.nix | 6 +- inputs/default.nix | 3 + modules/ags/config/default.nix | 2 +- modules/ags/config/package-lock.json | 8 +- modules/desktop/default.nix | 22 ++-- .../desktop/environment/home/hyprgrass.nix | 3 +- packages/fcft/default.nix | 4 +- 17 files changed, 105 insertions(+), 85 deletions(-) diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index fd635a24..a1e89883 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-B9O3eG7yd9ZlF5qVu0c7/79LX86XHHd8M9bhKsnZ420="; + npmDepsHash = "sha256-8/6EyjZv/9AwaVMjoE9hQUBc0VysOdxbgaG5sKC/sdw="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index f3941939..483cffe7 100644 --- a/apps/extract-subs/package-lock.json +++ b/apps/extract-subs/package-lock.json @@ -31,7 +31,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", @@ -439,9 +439,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", - "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/apps/mc-mods/default.nix b/apps/mc-mods/default.nix index 55c33b58..5d1e064d 100644 --- a/apps/mc-mods/default.nix +++ b/apps/mc-mods/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-UvW0BD7y9m8bwNstTBmIMU6ZO/GU8W6QDrO208Q4vto="; + npmDepsHash = "sha256-DUeMirFhlNsBIQsfAAepPmarHSFlsy4XVK3VWPPbh7E="; runtimeInputs = [ nodejs_latest diff --git a/apps/mc-mods/package-lock.json b/apps/mc-mods/package-lock.json index be212d8b..ddc60642 100644 --- a/apps/mc-mods/package-lock.json +++ b/apps/mc-mods/package-lock.json @@ -438,9 +438,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", - "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/apps/pin-inputs/default.nix b/apps/pin-inputs/default.nix index c8b372c4..2805377f 100644 --- a/apps/pin-inputs/default.nix +++ b/apps/pin-inputs/default.nix @@ -1,7 +1,7 @@ {buildApp, ...}: buildApp { src = ./.; - npmDepsHash = "sha256-YD+iKEwxMZLpTi/mTyGpzGgGj3EhAxMmG2O97Q4710E="; + npmDepsHash = "sha256-fk5yVpbPyJ5xOvYEKTG4EDFh4Ba7WwDjsyv2PmXz2eM="; runtimeInputs = []; diff --git a/apps/pin-inputs/package-lock.json b/apps/pin-inputs/package-lock.json index 073fe7ed..c583bb47 100644 --- a/apps/pin-inputs/package-lock.json +++ b/apps/pin-inputs/package-lock.json @@ -438,9 +438,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", - "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 440c2d6c..e70e2918 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -12,7 +12,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-Yga+P9xz+BySILDKJFS7zCayo0atDyzLyH/HDBkVpHc="; + npmDepsHash = "sha256-GqOwMThKSC2hjrmqR14fA+kmmAwkrulA81BcpyT+DsA="; runtimeInputs = [ curl diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index a1a3ecc8..6975ed4b 100644 --- a/apps/update-sources/package-lock.json +++ b/apps/update-sources/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.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", - "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" diff --git a/configurations/nos/modules/docker/freshrss/images/freshrss.nix b/configurations/nos/modules/docker/freshrss/images/freshrss.nix index b4c3edf6..ab9f9042 100644 --- a/configurations/nos/modules/docker/freshrss/images/freshrss.nix +++ b/configurations/nos/modules/docker/freshrss/images/freshrss.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "freshrss/freshrss"; - imageDigest = "sha256:d18055cc1c2fa807f118accb4ba74f435d381daf96130f87b17d9d9d1d169341"; - hash = "sha256-cYea9mHZhUFyEUNUBnvWnl265thohzlsAiz9aaXeMno="; + imageDigest = "sha256:bca4407f1f3ecb2e02bd57f704593c64f89bbf3fad53f03ebcf4baecb0122de6"; + hash = "sha256-aZQT5bBjfrAH93z3YV/203LrAdrItI0hPI+/dmvvOZU="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index ee26dea7..4fc61fd3 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ "custom-sidebar-src": { "flake": false, "locked": { - "lastModified": 1741541405, - "narHash": "sha256-o7GRq7ddM3mQz6tEcnXN3nYf90Nu5GzBOFO8fmzmiHU=", + "lastModified": 1741812120, + "narHash": "sha256-Hbh6I9DsEdjDDC1X3/0EXOy+CCzBT2XmaKZWMwe6bkY=", "owner": "elchininet", "repo": "custom-sidebar", - "rev": "2f653a66ca72251668a774a1fedc77d66ffa5d19", + "rev": "82f40bbaa1bf833290de84efbdc576362cc75905", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1741375453, - "narHash": "sha256-sgN3ZPbD1K+C21CQG7NZ6Oi1eC2as1Waw40oVWvWTcU=", + "lastModified": 1741907872, + "narHash": "sha256-K2R28bipgKMgLcYXIJYT6B04daIR2xS+21BcC8bVEPU=", "ref": "refs/heads/master", - "rev": "f23308444a94b96cf943fedc669bf2b7bc505a16", - "revCount": 1008, + "rev": "bab9a0560d15e7e1621469cf8db3e70bc29833b6", + "revCount": 1014, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -441,11 +441,11 @@ "gtk-theme-src": { "flake": false, "locked": { - "lastModified": 1741119703, - "narHash": "sha256-DGUEHKlQqJ3yt6Anm+LIhSgaUjE+CvdIQZyrrPGV8HQ=", + "lastModified": 1741892283, + "narHash": "sha256-hFiYb1KqYvH66OIhmIUP3DfkSkuYgE78ihjkEaAY7LM=", "owner": "dracula", "repo": "gtk", - "rev": "285ff8f10084b5fdae045a8e8d09352be9af4452", + "rev": "fc59294cf67110f6487f5fd06d3c845ffffdf1a9", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1741791118, - "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", + "lastModified": 1741914680, + "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "18780912345970e5b546b1b085385789b6935a83", + "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", "type": "github" }, "original": { @@ -536,14 +536,17 @@ "inputs": { "hyprland": [ "hyprland" + ], + "nixpkgs": [ + "nixpkgs" ] }, "locked": { - "lastModified": 1741008259, - "narHash": "sha256-gXZ4CvL1cpkSA1/dJSjfeyTspRF8B+n1IPbs1LzVQAw=", + "lastModified": 1741875624, + "narHash": "sha256-rSFV5teddhNt23QHTru379DGFyxlyW2/9qK/VMXJrIM=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "e59bc280b71be8c45638806f3123fc36834435bc", + "rev": "ce0dcda79e0b24c9dfee2d80df50940669554f9d", "type": "github" }, "original": { @@ -584,6 +587,7 @@ "original": { "owner": "hyprwm", "repo": "Hyprland", + "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", "type": "github" } }, @@ -834,11 +838,11 @@ ] }, "locked": { - "lastModified": 1741762559, - "narHash": "sha256-/6baGi1+4CCPW1kB0m2nKyZnA4/43+OEGiko9BhxWY8=", + "lastModified": 1741874414, + "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2f6342dc0cc9ffe5f9be8bd4db6ce43f2c4c1d87", + "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1", "type": "github" }, "original": { @@ -860,11 +864,11 @@ ] }, "locked": { - "lastModified": 1741774055, - "narHash": "sha256-uexSUuBFqqGg8HPAHC37vAwpjhg4Wh1/0bOpoNjAD8w=", + "lastModified": 1741860499, + "narHash": "sha256-lepjOHnkBKT9u2PN4tIrMP/mV13GiE5S3k6vfUhjCP4=", "owner": "kotontrion", "repo": "kompass", - "rev": "cf6c8b26137adafae845f3905c11c98a197cd6cd", + "rev": "1a4bc3593d10512a468a9f7c02b18f7455fcb1c2", "type": "github" }, "original": { @@ -1109,11 +1113,11 @@ ] }, "locked": { - "lastModified": 1736592044, - "narHash": "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=", + "lastModified": 1741859942, + "narHash": "sha256-lOMeXwNYIiX+/8unr+6blKkeWBJ2TRfJ2xGJ1Xo/qFw=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "906af17fcd50c84615a4660d9c08cf89c01cef7d", + "rev": "0ef0c6065345426fb4872c9ee75a58c11f62d3f8", "type": "github" }, "original": { @@ -1254,11 +1258,11 @@ ] }, "locked": { - "lastModified": 1741307969, - "narHash": "sha256-JxWxScHu0g/ltTas3ZvwPX/J6xhHm540+FY8ZfTigDg=", + "lastModified": 1741826393, + "narHash": "sha256-deaIXY9Q5OpcSqWEaX5cB4pw0711q9+hRiiq6arqqoU=", "owner": "kaylorben", "repo": "nixcord", - "rev": "269b69665a78f57f2bc1b62e05e823815f41cea9", + "rev": "91abbf5736459beeacb1c3163a2236241cfc6c71", "type": "github" }, "original": { @@ -1304,11 +1308,11 @@ ] }, "locked": { - "lastModified": 1741237837, - "narHash": "sha256-YbxjieouhSGNIAC4n/UyTKzQrNhLjRyU7BfVTQUMHZs=", + "lastModified": 1741815142, + "narHash": "sha256-TFnTSujBOQly2QGsq7wl9wYx7cIGHPy3YcgZ7qQK/jY=", "owner": "matt1432", "repo": "nixos-jellyfin", - "rev": "d4bd900cd1792f939b6a2650537ebee6e2130802", + "rev": "f3e37d6173969c2d7bec41a3888d96acde88bc5a", "type": "github" }, "original": { @@ -1319,11 +1323,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741757609, - "narHash": "sha256-Y2PHPeePLQzYjlwzpqguHIh5Y0wGtCzl7eNEjvDVSXs=", + "lastModified": 1741874442, + "narHash": "sha256-NBj9G0yQ7FVqC8Pi61+D6Jv2EfJ9TRpHI301fgVzQn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75cd88fa9bfa1cf444a62d5e713fc76bb0fbba6f", + "rev": "01f44b8389188522fba255168c70eda093867746", "type": "github" }, "original": { @@ -1393,11 +1397,11 @@ ] }, "locked": { - "lastModified": 1741785459, - "narHash": "sha256-1sjnoxtG7WUei1/DAOpcA1NwTRcg6wIahDD126hwp5M=", + "lastModified": 1741903779, + "narHash": "sha256-QqBJeYqzifGOsVv32BJxNnh2AaVXB51eMMHQCY9FFL8=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "120cd8e7a8c191e097b663e2cb9a1aa4c2588a31", + "rev": "35d3b8403711ab0b38c4554703c283900cfeeb7a", "type": "github" }, "original": { @@ -1490,11 +1494,11 @@ ] }, "locked": { - "lastModified": 1738432629, - "narHash": "sha256-GBTP/tlqYDd+Whl+Df3YReKCgaHL0+n67FDsz43fB6s=", + "lastModified": 1741815923, + "narHash": "sha256-3H0gpltZdzYn4Iqay9EWmyrR3VR8nKAcLUB4iNVgaZg=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "1b27f1f60ae18e240269601ac09d9d5a096498b7", + "rev": "978c9a1d7aed8b0c94357f4173b60f46945d118b", "type": "github" }, "original": { @@ -1767,11 +1771,11 @@ ] }, "locked": { - "lastModified": 1741644481, - "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", + "lastModified": 1741861888, + "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e653d71e82575a43fe9d228def8eddb73887b866", + "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f", "type": "github" }, "original": { @@ -1783,11 +1787,11 @@ "spotifyplus-src": { "flake": false, "locked": { - "lastModified": 1741552349, - "narHash": "sha256-tvrUqfY7o3cUrrDCPRaFE23JDhDQAwNWh7UCeAe5+b8=", + "lastModified": 1741895093, + "narHash": "sha256-VotJSDRkNMVxVfvpjf57BLzmr1cpzBZfV887w4aXulk=", "owner": "thlucas1", "repo": "homeassistantcomponent_spotifyplus", - "rev": "9850db38e136a885dc147e1ab00cb53957e77513", + "rev": "cf1acfa270b14bdaae8ca4f36cf7099f65824554", "type": "github" }, "original": { @@ -1799,11 +1803,11 @@ "spotifywebapi-src": { "flake": false, "locked": { - "lastModified": 1741550999, - "narHash": "sha256-9VNNiWp5Mg/2ssuDveFgH+4Euyzb8GAYUlUHaUDVma8=", + "lastModified": 1741894246, + "narHash": "sha256-F4cpcQH9cEfkhQmDKa8NQEEtXAj085PnGWP7ZkQLX2A=", "owner": "thlucas1", "repo": "SpotifyWebApiPython", - "rev": "0a005a5e30fbf0afd840f9978b9386df7accb8b6", + "rev": "e6c5bfe0c5621bf0e24d61060a7c181a6226c6c4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 81a46c54..91f84b79 100644 --- a/flake.nix +++ b/flake.nix @@ -140,7 +140,10 @@ type = "github"; }; hyprgrass = { - inputs.hyprland.follows = "hyprland"; + inputs = { + hyprland.follows = "hyprland"; + nixpkgs.follows = "nixpkgs"; + }; owner = "horriblename"; repo = "hyprgrass"; type = "github"; @@ -153,6 +156,7 @@ }; owner = "hyprwm"; repo = "Hyprland"; + rev = "e86d3a14e46d19d8a47f8ceb6410546715d45f10"; type = "github"; }; hyprland-plugins = { diff --git a/inputs/default.nix b/inputs/default.nix index 113900d3..b3f89d2f 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -165,6 +165,9 @@ let hyprland = mkInput { owner = "hyprwm"; repo = "Hyprland"; + + # FIXME: breaks hypgrass, too lazy to fix + rev = "e86d3a14e46d19d8a47f8ceb6410546715d45f10"; }; hyprland-plugins = mkHyprDep { diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index d505b28a..2b6ef420 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-cMBnECR2yU5FmMkjG6FWljyH3b4B2E3svBwSzlG5xr0="; + npmDepsHash = "sha256-wnii50pin2kJLcVtSOIBKvoK/5afoyd4j+IHz2DqjhA="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index cc30f81e..ee4c2775 100644 --- a/modules/ags/config/package-lock.json +++ b/modules/ags/config/package-lock.json @@ -33,9 +33,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz", - "integrity": "sha512-RoV8Xs9eNwiDvhv7M+xcL4PWyRyIXRY/FLp3buU4h1EYfdF7unWUy3dOjPqb3C7rMUewIcqwW850PgS8h1o1yg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "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-PesVbhgKreig2GTZjzEYKNqSdcIEHP0VSDk1naXi2luXf72y/QivFXwIWJRqZaw0im8Tf1ASygGYh4SCOU7pog==", + "integrity": "sha512-XoEDCYgw/ZpmXuss8OtAt85giNklhwtRGpRf2DGrfV0Ig7N6+0u43dLhcn79CJDOTf/AP6MEAH/S/plhcjejbg==", "license": "LGPL-2.1" }, "node_modules/balanced-match": { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index c176fd12..6b915f52 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -29,12 +29,22 @@ in { } ]; - nixpkgs.overlays = map (i: self.inputs.${i}.overlays.default) [ - "hyprland" - "hyprland-plugins" - "hyprpaper" - "nixpkgs-wayland" - ]; + 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;}; + }) + ]; }; options.roles.desktop = { diff --git a/modules/desktop/environment/home/hyprgrass.nix b/modules/desktop/environment/home/hyprgrass.nix index 68c226c4..48d830bf 100644 --- a/modules/desktop/environment/home/hyprgrass.nix +++ b/modules/desktop/environment/home/hyprgrass.nix @@ -12,8 +12,7 @@ self: { in { config = mkIf (cfg.enable && cfg.isTouchscreen) { wayland.windowManager.hyprland = { - # TODO: https://github.com/horriblename/hyprgrass/pull/222 - plugins = [self.inputs.hyprgrass.packages.${pkgs.system}.default]; + plugins = [pkgs.hyprlandPlugins.hyprgrass]; settings = { plugin.touch_gestures = { diff --git a/packages/fcft/default.nix b/packages/fcft/default.nix index 0cc5cd8e..64e712f8 100644 --- a/packages/fcft/default.nix +++ b/packages/fcft/default.nix @@ -4,13 +4,13 @@ ... }: fcft.overrideAttrs (o: rec { - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = o.pname; rev = version; - hash = "sha256-spK75cT6x0rHcJT2YxX1e39jvx4uQKL/b4CHO7bon4s="; + hash = "sha256-qgNNowWQhiu6pr9bmWbBo3mHgdkmNpDHDBeTidk32SE="; }; })