.gitignore

@@ -9,6 +9,3 @@ site
 graph.png
 
 /preview
-
-.jj
-.direnv

Tuprules.tup

@@ -1,17 +1,16 @@
 &root = .
-&tmpl_dir = ./templates
+&build_root = build
-&gen_tmpl_dir = ./build/templates
 
 HTML_TEMPLATE = main.html
 
-!html = | &(tmpl_dir)/<tmpl_group> \
+!html = | &(root)/templates/footer.html \
 	|> ^b html %f^ \
 	pandoc --from markdown --to html \
-	--template=&(tmpl_dir)/$(HTML_TEMPLATE) \
+	--template=&(root)/templates/$(HTML_TEMPLATE) \
-	--include-in-header=&(tmpl_dir)/header.html \
-	--include-before-body=&(tmpl_dir)/nav.html \
 	--css &(root)/css/style.css \
-	--include-after-body=&(gen_tmpl_dir)/footer.html \
+	--include-in-header=&(root)/templates/header.html \
+	--include-before-body=&(root)/templates/nav.html \
+	--include-after-body=&(build_root)/templates/footer.html \
 	%f | sed 's|%%webRoot%%|&(root)|g' > %o \
 	|> %B.html
 

flake.lock

@@ -1,25 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1731890469,
-        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5083ec887760adfe12af64830a66807423a859a7",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,19 +0,0 @@
-{
-  description = "Website";
-
-  outputs = { self, nixpkgs }:
-    let pkgs = nixpkgs.legacyPackages.x86_64-linux;
-    in {
-      devShell.x86_64-linux = with pkgs;
-        mkShell {
-          nativeBuildInputs = [
-            imagemagick
-            just
-            libavif
-            libjxl
-            pandoc
-            tup
-          ];
-        };
-  };
-}

justfile

@@ -1,6 +1,9 @@
 # vim: set ft=make :
 root := `pwd`
 
+setup-ubuntu:
+    sudo apt install fuse3 pandoc
+
 # Build static website
 build:
     tup build

shell.nix

@@ -5,7 +5,6 @@ pkgs.mkShell {
     imagemagick
     just
     libavif
-    nushell
     pandoc
     tup
   ];

templates/Tupfile

@@ -1 +1 @@
-: |> ./generate_footer.sh > %o |> footer.html ./<tmpl_group>
+: |> ./generate_footer.sh > %o |> footer.html