diff options
| -rw-r--r-- | users/tazjin/homepage/default.nix | 4 | ||||
| -rw-r--r-- | web/static/default.nix | 6 | ||||
| -rw-r--r-- | web/static/favicon.webp (renamed from web/tvl/static/favicon.webp) | bin | 18750 -> 18750 bytes | |||
| -rw-r--r-- | web/static/jetbrains-mono-bold-italic.woff2 (renamed from users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2) | bin | 53364 -> 53364 bytes | |||
| -rw-r--r-- | web/static/jetbrains-mono-bold.woff2 (renamed from users/tazjin/homepage/static/jetbrains-mono-bold.woff2) | bin | 49892 -> 49892 bytes | |||
| -rw-r--r-- | web/static/jetbrains-mono-italic.woff2 (renamed from users/tazjin/homepage/static/jetbrains-mono-italic.woff2) | bin | 50936 -> 50936 bytes | |||
| -rw-r--r-- | web/static/jetbrains-mono.woff2 (renamed from users/tazjin/homepage/static/jetbrains-mono.woff2) | bin | 48700 -> 48700 bytes | |||
| -rw-r--r-- | web/static/tvl.css (renamed from users/tazjin/homepage/static/tazjin.css) | 0 | ||||
| -rw-r--r-- | web/static/virus_lounge.webp (renamed from web/tvl/static/virus_lounge.webp) | bin | 77556 -> 77556 bytes | |||
| -rw-r--r-- | web/tvl/default.nix | 8 |
10 files changed, 11 insertions, 7 deletions
diff --git a/users/tazjin/homepage/default.nix b/users/tazjin/homepage/default.nix index 17d5d5cc87de..a8ebe7e28227 100644 --- a/users/tazjin/homepage/default.nix +++ b/users/tazjin/homepage/default.nix @@ -71,5 +71,7 @@ in runCommandNoCC "website" {} '' mkdir $out cp ${homepage} $out/index.html cp ${atomFeed} $out/feed.atom - cp -r ${./static} $out/static + mkdir $out/static + cp -r ${depot.web.static}/* $out/static + cp -rf ${./static}/* $out/static '' diff --git a/web/static/default.nix b/web/static/default.nix new file mode 100644 index 000000000000..518f21d6f91c --- /dev/null +++ b/web/static/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: + +# Needs to be a derivation ... +pkgs.runCommand "tvl-static" {} '' + cp -r ${./.} $out +'' diff --git a/web/tvl/static/favicon.webp b/web/static/favicon.webp index 741cdbc64ff2..741cdbc64ff2 100644 --- a/web/tvl/static/favicon.webp +++ b/web/static/favicon.webp Binary files differdiff --git a/users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2 b/web/static/jetbrains-mono-bold-italic.woff2 index 34b5c69ae1cf..34b5c69ae1cf 100644 --- a/users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2 +++ b/web/static/jetbrains-mono-bold-italic.woff2 Binary files differdiff --git a/users/tazjin/homepage/static/jetbrains-mono-bold.woff2 b/web/static/jetbrains-mono-bold.woff2 index 84a008af7edb..84a008af7edb 100644 --- a/users/tazjin/homepage/static/jetbrains-mono-bold.woff2 +++ b/web/static/jetbrains-mono-bold.woff2 Binary files differdiff --git a/users/tazjin/homepage/static/jetbrains-mono-italic.woff2 b/web/static/jetbrains-mono-italic.woff2 index 85fd4687891e..85fd4687891e 100644 --- a/users/tazjin/homepage/static/jetbrains-mono-italic.woff2 +++ b/web/static/jetbrains-mono-italic.woff2 Binary files differdiff --git a/users/tazjin/homepage/static/jetbrains-mono.woff2 b/web/static/jetbrains-mono.woff2 index d5b94cb9e7db..d5b94cb9e7db 100644 --- a/users/tazjin/homepage/static/jetbrains-mono.woff2 +++ b/web/static/jetbrains-mono.woff2 Binary files differdiff --git a/users/tazjin/homepage/static/tazjin.css b/web/static/tvl.css index aea4d426eac3..aea4d426eac3 100644 --- a/users/tazjin/homepage/static/tazjin.css +++ b/web/static/tvl.css diff --git a/web/tvl/static/virus_lounge.webp b/web/static/virus_lounge.webp index 1f898b6ad8a7..1f898b6ad8a7 100644 --- a/web/tvl/static/virus_lounge.webp +++ b/web/static/virus_lounge.webp Binary files differdiff --git a/web/tvl/default.nix b/web/tvl/default.nix index e79c47b53162..aa1fc225fe71 100644 --- a/web/tvl/default.nix +++ b/web/tvl/default.nix @@ -41,11 +41,7 @@ let ''; }; in runCommandNoCC "website" {} '' - mkdir -p $out/static + mkdir $out cp ${homepage} $out/index.html - cp -r ${./static}/* $out/static - - # Some assets are stolen from tazjin's blog - cp ${depot.users.tazjin.homepage}/static/jetbrains-* $out/static - cp ${depot.users.tazjin.homepage}/static/tazjin.css $out/static + cp -r ${depot.web.static} $out/static '' |
