diff --git a/.gitignore b/.gitignore index 8cfc419..d2f6c9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -src/other/** +other/** result diff --git a/flake.nix b/flake.nix index 45f59ba..f3e6707 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,24 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in rec { + packages.vid = pkgs.stdenv.mkDerivation { + name = "kyouma-www-vid"; + src = ./.; + buildInputs = [ pkgs.yt-dlp ]; + buildPhase = '' + yt-dlp -f 136+251 C4oApBlw7Gc --merge-output-format mp4 -o "media/sunnyday-avc.mp4" + yt-dlp -f 398+251 C4oApBlw7Gc --merge-output-format mp4 -o "media/sunnyday-av1.mp4" + ''; + installPhase = ''cp -r media $out''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "abrls86wyBJaZN3QM/p8fRoGQ7jVseao3F4oiMPh+84="; + }; packages.kyouma-www = pkgs.stdenv.mkDerivation { pname = "kyouma-www"; version = self.shortRev or (toString self.lastModifiedDate); src = ./.; - buildPhase = ''''; + buildPhase = ''mkdir src/assets/media; ln -s ${packages.vid}/* src/assets/media/''; installPhase = ''cp -r src $out''; }; packages.default = packages.kyouma-www; diff --git a/src/assets/media/whatwhat-av1.mp4 b/src/assets/media/whatwhat-av1.mp4 deleted file mode 100644 index 73eece0..0000000 Binary files a/src/assets/media/whatwhat-av1.mp4 and /dev/null differ diff --git a/src/assets/media/whatwhat-avc.mp4 b/src/assets/media/whatwhat-avc.mp4 deleted file mode 100644 index eca852d..0000000 Binary files a/src/assets/media/whatwhat-avc.mp4 and /dev/null differ diff --git a/src/index.html b/src/index.html index b107ab8..e5feeb0 100644 --- a/src/index.html +++ b/src/index.html @@ -9,8 +9,8 @@

K Y O U M A . N E T