13 files changed, 78 insertions, 28 deletions

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 808b831..2fc142c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,6 @@
 {
-    "git.enableCommitSigning": false
+    "git.enableCommitSigning": false,
+    "Lua.diagnostics.globals": [
+        "pandoc"
+    ]
 }
diff --git a/assets/css/_basics.scss b/assets/css/_basics.scss
index 14c0391..9ce6b61 100644
--- a/assets/css/_basics.scss
+++ b/assets/css/_basics.scss
@@ -97,6 +97,10 @@ ol {
     }
 }
 
+ul ul {
+    margin-top: 0;
+}
+
 dl {
     margin: ($line-height * 1em) 0 0;
     padding: 0;
diff --git a/content/blog/index.md b/content/blog/index.md
deleted file mode 100644
index 6668eba..0000000
--- a/content/blog/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Blog
-layout: dated_list
-create_feed: true
----
diff --git a/content/index.md b/content/index.md
index 169a791..ebd3ff4 100644
--- a/content/index.md
+++ b/content/index.md
@@ -14,5 +14,9 @@ Here's a complete list of my profiles on other platforms:
 - **Email:** me@volpeon.ink
 - **Fediverse:** @volpeon@fedi.vulpes.one
 - **GitHub:** [volpeon](https://github.com/volpeon)
+- **IRC - Furnet:** volpeon
+- **IRC - Freenode:** volpeon
+- **Steam:** [volpeon](https://steamcommunity.com/id/volpeon/)
+- **XMPP:** <available>
 
 If you see someone with my username, you'll know it's me if their profile is listed here. I'll make sure to keep this list up-to-date.
diff --git a/content/notebook/index.md b/content/notebook/index.md
new file mode 100644
index 0000000..1175625
--- /dev/null
+++ b/content/notebook/index.md
@@ -0,0 +1,5 @@
+---
+title: Notebook
+layout: categorized_list
+create_feed: true
+---
diff --git a/content/pers_notebook/index.md b/content/pers_notebook/index.md
new file mode 100644
index 0000000..235ae57
--- /dev/null
+++ b/content/pers_notebook/index.md
@@ -0,0 +1,5 @@
+---
+title: Personal Notebook
+layout: categorized_list
+create_feed: true
+---
diff --git a/content/personal_blog/2021-01-09-infinite-skyscrapers.md b/content/pers_notebook/infinite-skyscrapers.md
index 909ecce..909ecce 100644
--- a/content/personal_blog/2021-01-09-infinite-skyscrapers.md
+++ b/content/pers_notebook/infinite-skyscrapers.md
diff --git a/content/personal_blog/index.md b/content/personal_blog/index.md
deleted file mode 100644
index 8f4484b..0000000
--- a/content/personal_blog/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Personal Blog
-layout: dated_list
-create_feed: true
----
diff --git a/metadata/metadata.yaml b/metadata/metadata.yaml
index 05150ea..522896d 100644
--- a/metadata/metadata.yaml
+++ b/metadata/metadata.yaml
@@ -11,25 +11,25 @@ menus:
     - id: index
       label: Home
       url: /
-    - id: blog
-      label: Blog
-      url: /blog/
+    - id: notebook
+      label: Notebook
+      url: /notebook/
       hidden: true
-    - id: personal_blog
+    - id: pers_notebook
       label: Personal
-      label_long: Personal Blog
-      url: /personal_blog/
+      label_long: Personal Notebook
+      url: /pers_notebook/
       hidden: true
 
 feeds:
-  - title: Blog
-    url: /blog/index.xml
+  - title: Notebook
+    url: /notebook/index.xml
 
 categories:
-  personal_blog:
+  pers_notebook:
     dre: Dream Journal
 
 rewrites:
   path:
-    - from: ^/personal_blog
+    - from: ^/pers_notebook
       to: /9thPK7O3xn
diff --git a/scripts/metadata_filter.lua b/scripts/metadata_filter.lua
index d7116dc..cd0c2f7 100644
--- a/scripts/metadata_filter.lua
+++ b/scripts/metadata_filter.lua
@@ -183,20 +183,28 @@ function organize_subpages(site_url, output_dir, ref_file, pages)
                                pandoc.utils.stringify(page.file_out))
     end
 
-    local grouped_pages = group_by(pages, function(p) return not p.date end)
+    local pages_grouped_date =
+        group_by(pages, function(p) return not p.date end)
 
-    local pages_undated = grouped_pages[true] or pandoc.MetaList({})
+    local pages_undated = pages_grouped_date[true] or pandoc.MetaList({})
     pages_undated:sort(function(p1, p2)
         return pandoc.utils.stringify(p1.title) <
                    pandoc.utils.stringify(p2.title)
     end)
 
-    local pages_dated = grouped_pages[false] or pandoc.MetaList({})
+    local pages_dated = pages_grouped_date[false] or pandoc.MetaList({})
     pages_dated:sort(function(p1, p2)
         return pandoc.utils.stringify(p1.date.yyyy_mm_dd) >
                    pandoc.utils.stringify(p2.date.yyyy_mm_dd)
     end)
 
+    local pages_categorized = pages:filter(
+                                  function(p) return p.category ~= nil end)
+    pages_categorized:sort(function(p1, p2)
+        return pandoc.utils.stringify(p1.title) >
+                   pandoc.utils.stringify(p2.title)
+    end)
+
     local pages_by_year = group_by(pages_dated, function(p)
         return pandoc.utils.stringify(p.date.yyyy)
     end)
@@ -205,14 +213,23 @@ function organize_subpages(site_url, output_dir, ref_file, pages)
         return i1.key > i2.key
     end))
 
+    local pages_by_category = group_by(pages_categorized, function(p)
+        return pandoc.utils.stringify(p.category.id)
+    end)
+    pages_by_category = pandoc.MetaList(table_to_list(pages_by_category,
+                                                      function(i1, i2)
+        return i1.key > i2.key
+    end))
+
     local pages_data = pandoc.MetaMap({
         all_dated = pages_dated,
         all_undated = pages_undated,
         by_year = pages_by_year,
+        by_category = pages_by_category,
         last_update = #pages_dated ~= 0 and pages_dated[1].last_update
     })
 
-    local categories_data = group_by(pages_dated, function(p)
+    local categories_data = group_by(pages_categorized, function(p)
         return p.category and pandoc.utils.stringify(p.category.id)
     end, function(stats, _, p)
         if not stats then
diff --git a/templates/base.html b/templates/base.html
index 08c85bb..3afa0f0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -49,6 +49,8 @@
 ${layouts/index()}
     $elseif(layout.is_dated_list)$
 ${layouts/dated_list()}
+    $elseif(layout.is_categorized_list)$
+${layouts/categorized_list()}
     $else$
 ${layouts/page()}
     $endif$
diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html
new file mode 100644
index 0000000..d213bb8
--- /dev/null
+++ b/templates/layouts/categorized_list.html
@@ -0,0 +1,22 @@
+<main class="c-page s-page l-container l-container--content l-container--pad-v">
+    <div class="c-page__content">
+        <h1 class="c-page__prefixed c-page__prefixed--h1">$title$</h1>
+$body$
+
+        $for(pages.by_category)$
+            <h2 class="c-page__prefixed c-page__prefixed--h2">
+                $for(it.value/first)$
+                    $it.category.name$
+                $endfor$
+            </h2>
+            <ul>
+                $for(it.value)$
+                    <li class="c-page__prefixed c-page__prefixed--ref">
+                        <a href="$it.url.rel$">$it.title$</a>
+                    </li>
+                $endfor$
+            </ul>
+        $endfor$
+    </div>
+</main>
+
diff --git a/templates/layouts/page.html b/templates/layouts/page.html
index 61bcacd..640df18 100644
--- a/templates/layouts/page.html
+++ b/templates/layouts/page.html
@@ -13,9 +13,7 @@
                 </div>
             $endif$
             <h1 class="c-page__prefixed c-page__prefixed--h1 c-page__header__title">$title$</h1>
-            $if(date)$
-                <h2 class="c-page__header__meta">$date.yyyy_mm_dd$$if(category)$ in $category.name$$endif$</h2>
-            $elseif(category)$
+            $if(category)$
                 <h2 class="c-page__header__meta">in $category.name$</h2>
             $endif$
         </header>