meow

19 files changed, 126 insertions, 72 deletions

diff --git a/_layouts/algebra.html b/_layouts/algebra.html
index b8f4703..3cadce3 100644
--- a/_layouts/algebra.html
+++ b/_layouts/algebra.html
@@ -7,20 +7,20 @@ layout: default
 </h1>
 <div>
   <nav>
-    <b><a href="/mathematics">mathematics</a></b>
-    <a href="/linguistics">linguistics</a>
-    <a href="/computation">computation</a>
-    <a href="/ctf">ctf</a>
+    <b><a href="/wiki/mathematics">mathematics</a></b>
+    <a href="/wiki/linguistics">linguistics</a>
+    <a href="/wiki/computation">computation</a>
+    <a href="/wiki/ctf">ctf</a>
   </nav>
   <nav>
-    <a href="/foundations">foundations</a>
-    <b><a href="/algebra">algebra</a></b>
-    <a href="/analysis">analysis</a>
+    <a href="/wiki/mathematics/foundations">foundations</a>
+    <b><a href="/wiki/mathematics/algebra">algebra</a></b>
+    <a href="/wiki/mathematics/analysis">analysis</a>
   </nav>
   <nav>
-    <a href="/algebra/linear-algebra">linear algebra</a>
-    <a href="/algebra/coding-theory">coding theory</a>
-    <a href="/algebra/abstract-algebra">abstract algebra</a>
+    <a href="/wiki/mathematics/linear-algebra">linear algebra</a>
+    <a href="/wiki/mathematics/coding-theory">coding theory</a>
+    <a href="/wiki/mathematics/abstract-algebra">abstract algebra</a>
   </nav>
 </div>
 </header>
diff --git a/_layouts/analysis.html b/_layouts/analysis.html
index 5faa293..0c0b920 100644
--- a/_layouts/analysis.html
+++ b/_layouts/analysis.html
@@ -7,20 +7,20 @@ layout: default
 </h1>
 <div>
   <nav>
-    <b><a href="/mathematics">mathematics</a></b>
-    <a href="/linguistics">linguistics</a>
-    <a href="/computation">computation</a>
-    <a href="/ctf">ctf</a>
+    <b><a href="/wiki/mathematics">mathematics</a></b>
+    <a href="/wiki/linguistics">linguistics</a>
+    <a href="/wiki/computation">computation</a>
+    <a href="/wiki/ctf">ctf</a>
   </nav>
   <nav>
-    <a href="/foundations">foundations</a>
-    <a href="/algebra">algebra</a>
-    <b><a href="/analysis">analysis</a></b>
+    <a href="/wiki/mathematics/foundations">foundations</a>
+    <a href="/wiki/mathematics/algebra">algebra</a>
+    <b><a href="/wiki/mathematics/analysis">analysis</a></b>
   </nav>
   <nav>
-    <a href="/analysis/calculus">calculus</a>
-    <a href="/analysis/real-analysis">real analysis</a>
-    <a href="/analysis/complex-analysis">complex analysis</a>
+    <a href="/wiki/mathematics/calculus">calculus</a>
+    <a href="/wiki/mathematics/real-analysis">real analysis</a>
+    <a href="/wiki/mathematics/complex-analysis">complex analysis</a>
   </nav>
 </div>
 </header>
diff --git a/_layouts/computation.html b/_layouts/computation.html
index ec3328d..c95b07b 100644
--- a/_layouts/computation.html
+++ b/_layouts/computation.html
@@ -7,26 +7,26 @@ layout: default
 </h1>
 <div>
   <nav>
-    <a href="/mathematics">mathematics</a>
-    <a href="/linguistics">linguistics</a>
-    <b><a href="/computation">computation</a></b>
-    <a href="/ctf">ctf</a>
+    <a href="/wiki/mathematics">mathematics</a>
+    <a href="/wiki/linguistics">linguistics</a>
+    <b><a href="/wiki/computation">computation</a></b>
+    <a href="/wiki/ctf">ctf</a>
   </nav>
   <nav>
-    <a href="/syntax">syntax</a>
-    <a href="/semantics">semantics</a>
-    <a href="/compilers">compilers</a>
+    <a href="/wiki/computation/syntax">syntax</a>
+    <a href="/wiki/computation/semantics">semantics</a>
+    <a href="/wiki/computation/compilers">compilers</a>
     <br>
-    <a href="/types">types</a>
-    <a href="/modules">modules</a>
-    <a href="/monads">monads</a>
-    <a href="/effects">effects</a>
-    <a href="/continuations">continuations</a>
+    <a href="/wiki/computation/types">types</a>
+    <a href="/wiki/computation/modules">modules</a>
+    <a href="/wiki/computation/monads">monads</a>
+    <a href="/wiki/computation/effects">effects</a>
+    <a href="/wiki/computation/continuations">continuations</a>
     <br>
-    <a href="/lambda-calculus">lambda calculus</a>
-    <a href="/memory-management">memory management</a>
-    <a href="/networking">networking</a>
-    <a href="/paradigms">paradigms</a>
+    <a href="/wiki/computation/lambda-calculus">lambda calculus</a>
+    <a href="/wiki/computation/memory-management">memory management</a>
+    <a href="/wiki/computation/networking">networking</a>
+    <a href="/wiki/computation/paradigms">paradigms</a>
   </nav>
 </div>
 </header>
diff --git a/_layouts/ctf.html b/_layouts/ctf.html
index c38148a..5727de1 100644
--- a/_layouts/ctf.html
+++ b/_layouts/ctf.html
@@ -7,17 +7,16 @@ layout: default
 </h1>
 <div>
   <nav>
-    <a href="/foundations">foundations</a>
-    <a href="/computation">computation</a>
-    <a href="/mathematics">mathematics</a>
-    <a href="/linguistics">linguistics</a>
-    <b><a href="/ctf">ctf</a></b>
+    <a href="/wiki/mathematics">mathematics</a>
+    <a href="/wiki/linguistics">linguistics</a>
+    <a href="/wiki/computation">computation</a>
+    <b><a href="/wiki/ctf">ctf</a></b>
   </nav>
   <nav>
-    <a href="/rev">rev</a>
-    <a href="/pwn">pwn</a>
-    <a href="/crypto">crypto</a>
-    <a href="/web">web</a>
+    <a href="/wiki/ctf/rev">rev</a>
+    <a href="/wiki/ctf/pwn">pwn</a>
+    <a href="/wiki/ctf/crypto">crypto</a>
+    <a href="/wiki/ctf/web">web</a>
   </nav>
 </div>
 </header>
diff --git a/_layouts/foundations.html b/_layouts/foundations.html
index 77bb237..53a1899 100644
--- a/_layouts/foundations.html
+++ b/_layouts/foundations.html
@@ -7,21 +7,21 @@ layout: default
 </h1>
 <div>
   <nav>
-    <b><a href="/mathematics">mathematics</a></b>
-    <a href="/linguistics">linguistics</a>
-    <a href="/computation">computation</a>
-    <a href="/ctf">ctf</a>
+    <b><a href="/wiki/mathematics">mathematics</a></b>
+    <a href="/wiki/linguistics">linguistics</a>
+    <a href="/wiki/computation">computation</a>
+    <a href="/wiki/ctf">ctf</a>
   </nav>
   <nav>
-    <b><a href="/foundations">foundations</a></b>
-    <a href="/algebra">algebra</a>
-    <a href="/analysis">analysis</a>
+    <b><a href="/wiki/mathematics/foundations">foundations</a></b>
+    <a href="/wiki/mathematics/algebra">algebra</a>
+    <a href="/wiki/mathematics/analysis">analysis</a>
   </nav>
   <nav>
-    <a href="/foundations/logic">logic</a>
-    <a href="/foundations/proof">proof</a>
-    <a href="/foundations/types">types</a>
-    <a href="/foundations/category-theory">category theory</a>
+    <a href="/wiki/mathematics/logic">logic</a>
+    <a href="/wiki/mathematics/proof">proof</a>
+    <a href="/wiki/mathematics/types">types</a>
+    <a href="/wiki/mathematics/category-theory">category theory</a>
   </nav>
 </div>
 </header>
diff --git a/_layouts/linguistics.html b/_layouts/linguistics.html
index 95ac6c0..c2d0050 100644
--- a/_layouts/linguistics.html
+++ b/_layouts/linguistics.html
@@ -7,16 +7,16 @@ layout: default
 </h1>
 <div>
   <nav>
-    <a href="/mathematics">mathematics</a>
-    <b><a href="/linguistics">linguistics</a></b>
-    <a href="/computation">computation</a>
-    <a href="/ctf">ctf</a>
+    <a href="/wiki/mathematics">mathematics</a>
+    <b><a href="/wiki/linguistics">linguistics</a></b>
+    <a href="/wiki/computation">computation</a>
+    <a href="/wiki/ctf">ctf</a>
   </nav>
   <nav>
-    <a href="/glossary">glossary</a>
-    <a href="/syntax">syntax</a>
-    <a href="/semantics">semantics</a>
-    <a href="/types">types</a>
+    <a href="/wiki/linguistics/glossary">glossary</a>
+    <a href="/wiki/linguistics/syntax">syntax</a>
+    <a href="/wiki/linguistics/semantics">semantics</a>
+    <a href="/wiki/linguistics/types">types</a>
   </nav>
 </div>
 </header>
diff --git a/_layouts/mathematics.html b/_layouts/mathematics.html
index 6ad8497..27fafe4 100644
--- a/_layouts/mathematics.html
+++ b/_layouts/mathematics.html
@@ -7,15 +7,15 @@ layout: default
 </h1>
 <div>
   <nav>
-    <b><a href="/mathematics">mathematics</a></b>
-    <a href="/linguistics">linguistics</a>
-    <a href="/computation">computation</a>
-    <a href="/ctf">ctf</a>
+    <b><a href="/wiki/mathematics">mathematics</a></b>
+    <a href="/wiki/linguistics">linguistics</a>
+    <a href="/wiki/computation">computation</a>
+    <a href="/wiki/ctf">ctf</a>
   </nav>
   <nav>
-    <a href="/foundations">foundations</a>
-    <a href="/algebra">algebra</a>
-    <a href="/analysis">analysis</a>
+    <a href="/wiki/mathematics/foundations">foundations</a>
+    <a href="/wiki/mathematics/algebra">algebra</a>
+    <a href="/wiki/mathematics/analysis">analysis</a>
   </nav>
 </div>
 </header>
diff --git a/computation/continuations.md b/computation/continuations.md
index b2126f8..08017c5 100644
--- a/computation/continuations.md
+++ b/computation/continuations.md
@@ -1,6 +1,6 @@
 ---
 layout: computation
-title: computation/compilers
+title: computation/continuations
 ---
 
 # continuations
diff --git a/computation/index.md b/computation/index.md
index 9ac7e22..7c2765e 100644
--- a/computation/index.md
+++ b/computation/index.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation
+---
+
 # notes on computation and its consequences
 
 - [paradigms](paradigms)
diff --git a/computation/lambda-calculus.md b/computation/lambda-calculus.md
index 769b80d..78752db 100644
--- a/computation/lambda-calculus.md
+++ b/computation/lambda-calculus.md
@@ -1 +1,6 @@
+---
+layout: computation
+title: computation/lambda calculus
+---
+
 # the lambda calculus
diff --git a/computation/memory-management.md b/computation/memory-management.md
index b4dc8be..a2edadc 100644
--- a/computation/memory-management.md
+++ b/computation/memory-management.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/memory management
+---
+
 # memory management
 
 lobster
diff --git a/computation/modules.md b/computation/modules.md
index cde238c..be7b7e5 100644
--- a/computation/modules.md
+++ b/computation/modules.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/modules
+---
+
 # modules
 
 An overarching question I've had that I've been unable to resolve: are ML-style modules any more expressive than a system with:
diff --git a/computation/networking.md b/computation/networking.md
index 85c1b6b..e2cdccf 100644
--- a/computation/networking.md
+++ b/computation/networking.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/networking
+---
+
 # the networking layer of the internet
 
 ## routing: IP, DNS
diff --git a/computation/paradigms.md b/computation/paradigms.md
index e66a454..198a522 100644
--- a/computation/paradigms.md
+++ b/computation/paradigms.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/programming paradigms
+---
+
 # reflections on programming paradigms
 
 ## imperative programming
diff --git a/computation/semantics.md b/computation/semantics.md
index d854341..410d0ef 100644
--- a/computation/semantics.md
+++ b/computation/semantics.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/semantics
+---
+
 # formal semantics
 
 ## denotational semantics
diff --git a/computation/syntax.md b/computation/syntax.md
index 29e8c48..31b95a5 100644
--- a/computation/syntax.md
+++ b/computation/syntax.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/syntax
+---
+
 # syntax
 
 articles
@@ -11,6 +16,8 @@ books
 
 ebnf
 
+npegs
+
 ## lexing
 
 ## parsing
diff --git a/computation/types.md b/computation/types.md
index 2124175..7231f82 100644
--- a/computation/types.md
+++ b/computation/types.md
@@ -1,3 +1,8 @@
+---
+layout: computation
+title: computation/types
+---
+
 # types! ah, wonderous types!
 
 posts
diff --git a/linguistics/glossary.md b/linguistics/glossary.md
new file mode 100644
index 0000000..5bfb895
--- /dev/null
+++ b/linguistics/glossary.md
@@ -0,0 +1,4 @@
+---
+layout: linguistics
+title: linguistics/glossary
+---
diff --git a/linguistics/types.md b/linguistics/types.md
new file mode 100644
index 0000000..437ab50
--- /dev/null
+++ b/linguistics/types.md
@@ -0,0 +1,4 @@
+---
+layout: linguistics
+title: linguistics/types
+---