10 files changed, 39 insertions, 79 deletions
diff --git a/layouts/404.html b/layouts/404.html
deleted file mode 100644
index c2e4e40..0000000
--- a/layouts/404.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ partial "header.html" . }}
-
-404 NOT FOUND
-
-{{ partial "footer.html" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
deleted file mode 100644
index 06b290a..0000000
--- a/layouts/_default/list.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{ partial "header.html" . }}
-
-{{if not .IsHome }}
-<h1>{{ .Title | markdownify }}</h1>
-{{ end }}
-
-{{ .Content }}
-
-<ul>
-  {{ $pages := .Pages }}
-  {{ if .IsHome }}{{ $pages = .Site.RegularPages }}{{ end }}
-  {{ range (where $pages "Section" "!=" "") }}
-  <li>
-    <span class="date">{{ .Date.Format "2006/01/02" }}</span>
-    <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a>
-  </li>
-  {{ end }}
-</ul>
-
-{{ partial "footer.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
deleted file mode 100644
index de3f121..0000000
--- a/layouts/_default/single.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ partial "header.html" . }}
-<div class="article-meta">
-<h1><span class="title">{{ .Title | markdownify }}</span></h1>
-{{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }}
-{{ if (gt .Params.date 0) }}<h2 class="date">{{ .Date.Format "2006/01/02" }}</h2>{{ end }}
-</div>
-
-<main>
-{{ .Content }}
-</main>
-
-{{ partial "footer.html" . }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
deleted file mode 100644
index 71f47e7..0000000
--- a/layouts/_default/terms.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ partial "header.html" . }}
-
-<h1>{{ .Title }}</h1>
-
-<ul class="terms">
-  {{ range .Data.Terms }}
-  <li>
-    <a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a> ({{ .Count }})
-  </li>
-  {{ end }}
-</ul>
-
-{{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
new file mode 100644
index 0000000..8aebc2d
--- /dev/null
+++ b/layouts/index.html
@@ -0,0 +1,37 @@
+{{ define "main" -}}
+<main>
+  <section>
+    {{ .Content }}
+  </section>
+  <section>
+    <h2>Latest Posts</h2>
+    <ul>
+      {{- range first 3 .Site.RegularPages }}
+      <li>
+        <a href="{{ .RelPermalink | strings.TrimRight "/" }}">{{ .Title }}</a>
+        <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
+      </li>
+      {{- end }}
+    </ul>
+  </section>
+  <section>
+    <h2>Elsewhere on the Internet</h2>
+    <ul>
+      {{- range .Site.Menus.contact }}
+      <li>
+        {{- if hasPrefix .URL "mailto:" }}
+        <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>
+        {{- else }}
+        <a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>
+        {{- end }}
+      </li>
+      {{- end }}
+    </ul>
+  </section>
+  <footer>
+    {{- with .Site.Params.GPG }}
+    GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>
+    {{- end }}
+  </footer>
+</main>
+{{- end }}
diff --git a/layouts/partials/foot_custom.html b/layouts/partials/foot_custom.html
deleted file mode 100644
index e69de29..0000000
--- a/layouts/partials/foot_custom.html
+++ /dev/null
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
deleted file mode 100644
index 3f46ea5..0000000
--- a/layouts/partials/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-  <footer>
-  {{ partial "foot_custom.html" . }}
-  {{ with .Site.Params.footer }}
-  <hr/>
-  {{ . | markdownify }}
-  {{ end }}
-  </footer>
-  </body>
-</html>
diff --git a/layouts/partials/head_custom.html b/layouts/partials/head_custom.html
deleted file mode 100644
index e69de29..0000000
--- a/layouts/partials/head_custom.html
+++ /dev/null
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
deleted file mode 100644
index 4f431eb..0000000
--- a/layouts/partials/header.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ .Title }} | {{ .Site.Title }}</title>
-    <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" />
-    <link rel="stylesheet" href="{{ "/css/fonts.css" | relURL }}" />
-    {{ partial "head_custom.html" . }}
-  </head>
-
-  <body>
-    <nav>
-    <ul class="menu">
-      {{ range .Site.Menus.main }}
-      <li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
-      {{ end }}
-    </ul>
-    <hr/>
-    </nav>
diff --git a/layouts/partials/hook_head_end.html b/layouts/partials/hook_head_end.html
new file mode 100644
index 0000000..13e0ec6
--- /dev/null
+++ b/layouts/partials/hook_head_end.html
@@ -0,0 +1,2 @@
+<link href="{{ if .IsPage }}{{ .Permalink | replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
+<meta name="googlebot" content="noindex">