diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix
index dea89aa34..decf632c1 100644
--- a/users/wpcarro/nixos/diogenes/default.nix
+++ b/users/wpcarro/nixos/diogenes/default.nix
@@ -109,12 +109,7 @@ in {
"wpcarro.dev" = {
addSSL = true;
enableACME = true;
- root = wpcarro.website;
- };
- "blog.wpcarro.dev" = {
- addSSL = true;
- enableACME = true;
- root = wpcarro.website.blog.rendered;
+ root = wpcarro.website.root;
};
};
};
diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix
index df5502330..0f9527edb 100644
--- a/users/wpcarro/website/blog/default.nix
+++ b/users/wpcarro/website/blog/default.nix
@@ -3,8 +3,10 @@
with depot.nix.yants;
let
- inherit (builtins) hasAttr filter;
+ inherit (builtins) hasAttr filter readFile;
inherit (depot.web.blog) post includePost renderPost;
+ inherit (depot.users) wpcarro;
+ inherit (pkgs) runCommandNoCC;
config = {
name = "wpcarro's blog";
@@ -14,7 +16,7 @@ let
posts = filter includePost (list post (import ./posts.nix));
- rendered = pkgs.runCommandNoCC "wpcarros-blog" {} ''
+ rendered = runCommandNoCC "wpcarros-blog" {} ''
mkdir -p $out
${lib.concatStringsSep "\n" (map (post:
@@ -22,6 +24,41 @@ let
) posts)}
'';
+ formatDate = date: readFile (runCommandNoCC "date" {} ''
+ date --date='@${toString date}' '+%B %e, %Y' > $out
+ '');
+
+ postsList = pkgs.writeText "index.html" ''
+
+
+ Personal blog by wpcarro.
+ > Half-baked musings lossily encoded.
+ > - misc reviewer
+
+
+
+ '';
in {
inherit posts rendered config;
+
+ root = runCommandNoCC "wpcarros-blog" {} ''
+ mkdir -p $out
+
+ cat ${wpcarro.website.header} \
+ ${postsList} \
+ ${wpcarro.website.addendum} > $out/index.html
+ '';
}
diff --git a/users/wpcarro/website/default.nix b/users/wpcarro/website/default.nix
index 9480c38e9..60d8dc19e 100644
--- a/users/wpcarro/website/default.nix
+++ b/users/wpcarro/website/default.nix
@@ -1,13 +1,27 @@
{ pkgs, depot, ... }:
-pkgs.stdenv.mkDerivation {
- name = "wpcarro.dev";
- src = builtins.path { path = ./.; name = "website"; };
- installPhase = ''
- mkdir -p $out
- cp $src/index.html $out
+rec {
+ inherit (depot.users) wpcarro;
- mkdir -p $out/habits
- cp -r ${depot.users.wpcarro.website.habit-screens} $out/habits/index.html
- '';
+ header = "${./fragments/header.html}";
+ footer = "${./fragments/footer.html}";
+ addendum = "${./fragments/addendum.html}";
+
+ root = pkgs.stdenv.mkDerivation {
+ name = "wpcarro.dev";
+ src = builtins.path { path = ./.; name = "website"; };
+ installPhase = ''
+ mkdir -p $out
+
+ cat ${header} \
+ ${./fragments/homepage.html} \
+ ${footer} \
+ ${addendum} > $out/index.html
+
+ mkdir -p $out/habits
+ cp -r ${wpcarro.website.habit-screens} $out/habits/index.html
+
+ cp -r ${wpcarro.website.blog.root} $out/blog
+ '';
+ };
}
diff --git a/users/wpcarro/website/fragments/.skip-subtree b/users/wpcarro/website/fragments/.skip-subtree
new file mode 100644
index 000000000..e69de29bb
diff --git a/users/wpcarro/website/fragments/addendum.html b/users/wpcarro/website/fragments/addendum.html
new file mode 100644
index 000000000..9623db9bf
--- /dev/null
+++ b/users/wpcarro/website/fragments/addendum.html
@@ -0,0 +1,13 @@
+
+
+