unbreak css, minor updates to about

5 files changed, 49 insertions, 23 deletions

diff --git a/_templates/footer.html b/_templates/footer.html
index 93b3dd7..cdb0912 100644
--- a/_templates/footer.html
+++ b/_templates/footer.html
@@ -1,3 +1,3 @@
 <footer>
-	<span><img src="/assets/copyleft.svg" width="12" height="12" title="https://en.wikipedia.org/wiki/Criticism_of_copyright" /> 2020-2024 </span>
+	<span title="https://en.wikipedia.org/wiki/Criticism_of_copyright"><img src="/assets/copyleft.svg" width="12" height="12"/> 2020-2024 </span>
 </footer>
diff --git a/about.html b/about.html
deleted file mode 100644
index 6e0526d..0000000
--- a/about.html
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: main
-title: About
----
-<h2>About</h2>
-<p> Hello again. I'm JJ, but you may know me by apropos or omentic (among other names). </p>
-<p> I'm passionate about <a href="https://linguistics.ubc.ca/">linguistics</a>, <a href="https://maplebacon.org/">computer security</a>, <a href="https://www.pluggabletransports.info/">decentralized and resilient systems</a>, and <a href="https://www.math.ubc.ca/">general mathematics</a>. I'm also broadly interested in <a href="https://en.wikipedia.org/wiki/Programming_language_theory">programming language theory</a>, and have grown particularly interested in <a href="https://ncatlab.org/nlab/show/type+theory">type theory</a>: finding it to be a nice intersection between a good number of my interests. In my spare time, I enjoy skating, playing ultimate frisbee, folding origami, reading books, capturing flags, and (occasionally) rock climbing. </p>
-<!-- the <a href="">solarpunk</a> and <a href="">indieweb</a> movements,  -->
-<p> I'm also a hobbyist programmer, skilled at <a href="https://nim-lang.org/">Nim</a>, <a href="https://www.rust-lang.org/">Rust</a>, and <a href="https://www.java.com/en/">Java</a>, sufficiently proficient in <a href="https://racket-lang.org/">Racket</a>, <a href="https://www.python.org/">Python</a>, and <a href="https://en.wikipedia.org/wiki/C_(programming_language)">C</a>, and currently learning <a href="https://www.haskell.org/">Haskell</a>, <a href="https://wiki.portal.chalmers.se/agda/pmwiki.php">Agda</a>, and <a href="https://www.typescriptlang.org/">TypeScript</a>. Most of my projects are created in one or more of those languages. If you're interested, several projects are available <a href="https://git.toki.la">here on my website</a>, with the rest having taken up residence in <a href="https://github.com/omentic">the depths of my GitHub profile</a>. </p>
-<p> If you're looking to contact me, feel free to reach out over email / XMPP to jj [at] toki.la. </p>
-<p> If you're looking to hire me, you may be interested in <a href="/resume">my resume</a> (also available as a <a href="/resume/resume.pdf">PDF</a>).</p>
-<h2>Credits</h2>
-<p> This website is based off of the websites of <a href="https://web.archive.org/web/20200113180710/https://czeng.org/">Cat Zeng</a>, <a href="https://web.archive.org/web/20201101025228/https://nora.codes/">Leonora Tindall</a>, and <a href="https://hojberg.xyz">Simon Højberg</a>. </p>
diff --git a/about.md b/about.md
new file mode 100644
index 0000000..d4a633a
--- /dev/null
+++ b/about.md
@@ -0,0 +1,39 @@
+---
+layout: main
+title: About
+---
+
+# About
+
+Hello again. I'm JJ, but you may know me by apropos or omentic (among other names).
+
+I'm passionate about [linguistics], [computer security], [decentralized and resilient systems], and [general mathematics](). I'm also broadly interested in [programming language theory], and have grown particularly interested in [type theory]: finding it to be a nice intersection between a good number of my interests. In my spare time, I enjoy roller skating, playing ultimate frisbee, folding origami, reading books, capturing flags, and (occasionally) rock climbing.
+
+I'm also a hobbyist programmer, skilled at [Nim], [Rust], [Lean], and [Java], sufficiently proficient in [Python] and [Racket], and currently learning [HTMX] and [TypeScript]. Most of my projects are created in one or more of those languages. If you're interested, several are available [here on my website], with the rest having taken up residence in [the depths of my GitHub profile].
+
+If you're looking to contact me, feel free to reach out over email / XMPP to jj [at] toki.la.
+
+If you're looking to hire me, you may be interested in [my resume](/resume) (also available as a [PDF](/resume/resume.pdf)).
+
+## Credits
+
+This website is based off of the websites of [Cat Zeng](https://web.archive.org/web/20200113180710/https://czeng.org/), [Leonora Tindall](https://web.archive.org/web/20201101025228/https://nora.codes/), and [Simon Højberg](https://hojberg.xyz).<br>
+It is generated by [Hakyll](https://jaspervdj.be/hakyll/). The script is available [here](/site.hs).
+
+
+[linguistics]: https://linguistics.ubc.ca/
+[computer security]: https://maplebacon.org/
+[decentralized and resilient systems]: https://www.pluggabletransports.info/
+[general mathematics]: https://www.math.ubc.ca/
+[programming language theory]: https://en.wikipedia.org/wiki/Programming_language_theory
+[type theory]: https://ncatlab.org/nlab/show/type+theory
+[Nim]: https://nim-lang.org/
+[Rust]: https://rust-lang.org/
+[Lean]: https://lean-lang.org/
+[Java]: https://www.java.com/en/
+[Python]: https://www.python.org/
+[Racket]: https://racket-lang.org/
+[HTMX]: https://htmx.org/
+[TypeScript]: https://www.typescriptlang.org/
+[here on my website]: https://git.toki.la
+[the depths of my GitHub profile]: https://github.com/omentic
diff --git a/css/style.css b/css/style.css
index 17ba99a..4f891f2 100644
--- a/css/style.css
+++ b/css/style.css
@@ -68,14 +68,6 @@ nav a:hover {
 	font-size: 1.15em;
 }
 
-p {
-	margin-bottom: 0;
-}
-
-p + ol, p + ul {
-	margin-top: 0
-}
-
 ul {
 	list-style: square;
 }
diff --git a/css/wiki.css b/css/wiki.css
index 8e94534..ea1a1c9 100644
--- a/css/wiki.css
+++ b/css/wiki.css
@@ -1,3 +1,11 @@
+p {
+	margin-bottom: 0;
+}
+
+p + ol, p + ul {
+	margin-top: 0
+}
+
 a[href*="//"]:not([href*="toki.la"]):after {
-    content: url("/assets/external.svg");
+	content: url("/assets/external.svg");
 }