From 250c5f2ceccbc516d93f6b560224c67277e283d8 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 3 Jul 2025 20:10:07 +0800 Subject: [PATCH] Package wallpapers and sync flake inputs and package upstream source --- flake.lock | 80 +++++++++++++++---------------- home/david/modules/wallpaper.nix | 4 +- overlays/additions/default.nix | 1 + overlays/additions/wallpapers.nix | 5 ++ pkgs/_sources/generated.json | 46 ++++++++++++++---- pkgs/_sources/generated.nix | 32 +++++++++---- pkgs/default.nix | 1 + pkgs/nvfetcher.toml | 8 ++++ pkgs/wallpapers.nix | 12 +++++ 9 files changed, 131 insertions(+), 58 deletions(-) create mode 100644 overlays/additions/wallpapers.nix create mode 100644 pkgs/wallpapers.nix diff --git a/flake.lock b/flake.lock index a5acedb..5a29e56 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751379343, - "narHash": "sha256-D+cTBd6NiLP8twrd1QAl5OPAnwur+RVQswmu4nKzq/I=", + "lastModified": 1751549328, + "narHash": "sha256-Pzh9+N0palTIX+O2NygrUmMS8omB86SnYthLwE5cu5g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5f0ef779e8f954c95f7f7ba9f5c8739c06438327", + "rev": "53209f5724858da5e3e5db3db404c325b4da5414", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1750820125, - "narHash": "sha256-WDN3/TUs9vqZVXL6jMjl+D0pNsHJ4oO4muMVxnIc5hk=", + "lastModified": 1751456395, + "narHash": "sha256-EMbGEcGdaJyOcqMC2MWT3ULxE+LHqPtP1LR1GrCqMKU=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "2eeb017f69333eea5bc348c555ebcefa0269a071", + "rev": "fff08475db6ccdfa14ac8d44aebe2eb3df47c141", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -371,16 +371,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", "type": "github" }, "original": { "owner": "GNOME", - "ref": "48.1", + "ref": "48.2", "repo": "gnome-shell", "type": "github" } @@ -393,11 +393,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1751378814, - "narHash": "sha256-pdYjEgdVYEerzxxmrM0GJAFGZ+J50NRD0rtDZ16SuTM=", + "lastModified": 1751496088, + "narHash": "sha256-KqVurHe12Z9FDCcENBq3y0mW5KAx2qek81DQsiTjGhQ=", "owner": "helix-editor", "repo": "helix", - "rev": "6a090471a800b1001bdfd2b6e0b710c1cd439a4e", + "rev": "bcb6c20a84b6ac6697bf2a4b5d0b78832bcfea62", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1751238753, - "narHash": "sha256-hJUPWfz/h+QgXKaKovPwFAdNBnALsvVMggAPgBB+Qvw=", + "lastModified": 1751513147, + "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "cab8104e9236fab1eb9a702165454ffed353c20f", + "rev": "426b405d979d893832549b95f23c13537c65d244", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1751336185, - "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=", + "lastModified": 1751580393, + "narHash": "sha256-oRipTA4/JGeDGI31GNNVGFx0uhuR7h/R9SvkR4K8Axc=", "owner": "nix-community", "repo": "home-manager", - "rev": "96354906f58464605ff81d2f6c2ea23211cbf051", + "rev": "402333d5ec2f9eed0f2584555936361f39d2f93e", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1750403547, - "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751379130, - "narHash": "sha256-TObxiGbuX/4FbOnzDRvznfMUjIgS+d71+BetT35EOB8=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8b1f894089789eb39eacf0d6891d1e17cc3a84ab", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -646,11 +646,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -768,11 +768,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1751342607, - "narHash": "sha256-p2w7cNkcIwEzKYhL1kjohU368rNqoDOwlDJZfSyZNWg=", + "lastModified": 1751515409, + "narHash": "sha256-yu+/TxHkuZ8GHKwpKTv1BpfbYD1wH1CyPsOmY72chTg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c0b09e83031df3bb3fc59cb1653035795273b222", + "rev": "2e0dcafe8c48470e036908f34a2a1413f75bd804", "type": "gitlab" }, "original": { @@ -812,11 +812,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751510438, + "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", "type": "github" }, "original": { @@ -915,11 +915,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751379237, - "narHash": "sha256-jDoLz04rgXS0jYLT017RARjcC7PoZoJ6NzH6ypi2kKM=", + "lastModified": 1751570224, + "narHash": "sha256-ZZ6BH0g6Th9OttOdHw7cDaTbbaGdrSoYJBswt5gfUiU=", "owner": "nix-community", "repo": "stylix", - "rev": "4bc15ef13c970981e37506491e18d1158af9a70c", + "rev": "9b4ecf4aca38f329fc53d35bef32479c30ea74d6", "type": "github" }, "original": { diff --git a/home/david/modules/wallpaper.nix b/home/david/modules/wallpaper.nix index bfb869f..c177011 100644 --- a/home/david/modules/wallpaper.nix +++ b/home/david/modules/wallpaper.nix @@ -1,7 +1,7 @@ { - rootPath, lib, config, + pkgs, ... }: let cfg = config.david.wallpaper; @@ -15,7 +15,7 @@ in { home.file."wallpaper" = { force = true; recursive = true; - source = rootPath + "/assets/wallpaper"; + source = toString pkgs.wallpapers; }; }; } diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix index 4bccbc2..56d7424 100644 --- a/overlays/additions/default.nix +++ b/overlays/additions/default.nix @@ -6,6 +6,7 @@ in ./OuterWildsTextAdventure.nix ./editor-runtime.nix ./radicle-ci-broker.nix + ./wallpapers.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/additions/wallpapers.nix b/overlays/additions/wallpapers.nix new file mode 100644 index 0000000..c51f52d --- /dev/null +++ b/overlays/additions/wallpapers.nix @@ -0,0 +1,5 @@ +{outputs, ...}: _final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + inherit (outputs.packages.${system}) wallpapers; +} diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 37fbd8f..aefd66d 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-06-30", + "date": "2025-07-04", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "f2f10c1694d692df5cd88779bba2ba8692c79a87", - "sha256": "sha256-cDH/CseZ+ytO+9I0Hg663iShZt7epTrLf18oaqGimXo=", + "rev": "1d1f4e22d9cbea323bc8e397869d9f62096af0dc", + "sha256": "sha256-Coax6wd9D4nbyutEzTzrZxPsb2NEZm/HHHvlguy7bIU=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "f2f10c1694d692df5cd88779bba2ba8692c79a87" + "version": "1d1f4e22d9cbea323bc8e397869d9f62096af0dc" }, "cliphist": { "cargoLocks": null, @@ -152,7 +152,7 @@ }, "spotx": { "cargoLocks": null, - "date": "2025-06-28", + "date": "2025-07-02", "extract": null, "name": "spotx", "passthru": null, @@ -164,12 +164,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "da5fe58e1436206d2dfce270a1567c5a5805d786", - "sha256": "sha256-ZRJgptfJmLDTJbgul7jIRObtdK0ZM6Ah4/pll+k8Xwc=", + "rev": "a0df4fcaace5efc1b58acd39b2c4d1750bb81057", + "sha256": "sha256-H8AG9WOodmPFBoHGwZ8qs55bb4myyKrRLsUmepvzYtQ=", "sparseCheckout": [], "type": "github" }, - "version": "da5fe58e1436206d2dfce270a1567c5a5805d786" + "version": "a0df4fcaace5efc1b58acd39b2c4d1750bb81057" }, "tree-sitter-idris": { "cargoLocks": null, @@ -193,6 +193,36 @@ }, "version": "c56a25cf57c68ff929356db25505c1cc4c7820f6" }, + "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-NGlCqI92PFnMF/eyoCdWzJ0qDIkVhfkW46SpwV/iask=", + "type": "url", + "url": "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" + }, + "version": "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9" + }, + "wallpaper_outer-wilds.3840x2160.mp4": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "wallpaper_outer-wilds.3840x2160.mp4", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-GeDMtISD9V80EyAXGOiyukpqzREuGj57ta2RO4fF8hA=", + "type": "url", + "url": "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" + }, + "version": "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210" + }, "wshowkeys-mao": { "cargoLocks": null, "date": "2025-06-04", diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 0bb9256..de096a0 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "f2f10c1694d692df5cd88779bba2ba8692c79a87"; + version = "1d1f4e22d9cbea323bc8e397869d9f62096af0dc"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "f2f10c1694d692df5cd88779bba2ba8692c79a87"; + rev = "1d1f4e22d9cbea323bc8e397869d9f62096af0dc"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-cDH/CseZ+ytO+9I0Hg663iShZt7epTrLf18oaqGimXo="; + sha256 = "sha256-Coax6wd9D4nbyutEzTzrZxPsb2NEZm/HHHvlguy7bIU="; }; - date = "2025-06-30"; + date = "2025-07-04"; }; cliphist = { pname = "cliphist"; @@ -98,15 +98,15 @@ }; spotx = { pname = "spotx"; - version = "da5fe58e1436206d2dfce270a1567c5a5805d786"; + version = "a0df4fcaace5efc1b58acd39b2c4d1750bb81057"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "da5fe58e1436206d2dfce270a1567c5a5805d786"; + rev = "a0df4fcaace5efc1b58acd39b2c4d1750bb81057"; fetchSubmodules = false; - sha256 = "sha256-ZRJgptfJmLDTJbgul7jIRObtdK0ZM6Ah4/pll+k8Xwc="; + sha256 = "sha256-H8AG9WOodmPFBoHGwZ8qs55bb4myyKrRLsUmepvzYtQ="; }; - date = "2025-06-28"; + date = "2025-07-02"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; @@ -123,6 +123,22 @@ name = "idris"; date = "2024-11-05"; }; + "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4" = { + pname = "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"; + version = "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9"; + src = fetchurl { + url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4"; + sha256 = "sha256-NGlCqI92PFnMF/eyoCdWzJ0qDIkVhfkW46SpwV/iask="; + }; + }; + "wallpaper_outer-wilds.3840x2160.mp4" = { + pname = "wallpaper_outer-wilds.3840x2160.mp4"; + version = "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210"; + src = fetchurl { + url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4"; + sha256 = "sha256-GeDMtISD9V80EyAXGOiyukpqzREuGj57ta2RO4fF8hA="; + }; + }; wshowkeys-mao = { pname = "wshowkeys-mao"; version = "bf18fba01eafd7659e242066abca0fd4938bf417"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 54bf3e0..68a31d0 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -25,6 +25,7 @@ in noto-serif-cjk = callPackage ./noto-serif-cjk.nix {}; noto-sans-cjk = callPackage ./noto-sans-cjk.nix {}; + wallpapers = callPackage ./wallpapers.nix {}; } // ( let diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml index fa0debf..6d97a42 100644 --- a/pkgs/nvfetcher.toml +++ b/pkgs/nvfetcher.toml @@ -41,3 +41,11 @@ fetch.github = "sentriz/cliphist" [radicle-ci-broker] src.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" fetch.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" + +["wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"] +src.cmd = "curl -sL http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4 | sha256sum | cut -d ' ' -f 1" +fetch.url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" + +["wallpaper_outer-wilds.3840x2160.mp4"] +src.cmd = "curl -sL http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" +fetch.url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" diff --git a/pkgs/wallpapers.nix b/pkgs/wallpapers.nix new file mode 100644 index 0000000..5d0e37e --- /dev/null +++ b/pkgs/wallpapers.nix @@ -0,0 +1,12 @@ +{ + srcs, + runCommandNoCCLocal, + rootPath, +}: +runCommandNoCCLocal "wallpapers" {} '' + mkdir -p $out + + ln -s ${srcs."wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4".src} $out/wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4 + ln -s ${srcs."wallpaper_outer-wilds.3840x2160.mp4".src} $out/wallpaper_outer-wilds.3840x2160.mp4 + ln -s ${rootPath + "/assets/wallpaper/01.png"} $out/01.png +''