update netflux.io with new theme and content

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "themes/etch"]
+[submodule "themes/minimal-bootstrap-hugo"]
-	path = themes/etch
+	path = themes/minimal-bootstrap-hugo
-	url = https://github.com/LukasJoswiak/etch.git
+	url = https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme.git

config.toml

@@ -1,19 +1,81 @@
-baseURL = "https://netflux.io/blog/"
+baseURL = "https://netflux.io/"
 languageCode = "en-gb"
 title = "netflux.io"
-theme = "etch"
+theme = "minimal-bootstrap-hugo"
+staticDir = ["static"]
 
-enableInlineShortcodes = true
+[taxonomies]
-pygmentsCodeFences = true
+  tag = "tags"
-pygmentsUseClasses = true
-
-[params]
-  dark = "off"
-  highlight = true
 
 [permalinks]
-  "/post" = "/:year/:month/:slug"
+  post = "/:year/:month/:slug"
 
+[params]
+  description = "netflux.io - the personal website of Rob Watson"
+  contentBackgroundColor = "#fff"
+  contentTextColor = "#212529"
+  contentLinkColor = "#007bff"
+  contentLinkHoverColor = "#0056b3"
+  navbarBackgroundColor = "#212529"
+  navbarLinkColor = "rgba(255, 255, 255, 0.75)"
+  navbarLinkHoverColor = "rgba(255, 255, 255, 1)"
+  wrapperMaxWidth = "800px"
+  customDateFormat = "Jan 2, 2006"
+  customCodeStyle = true
+  customBlockquoteStyle = true
+  showPostSummary = false
+  googleAnalytics = "UA-123456789-1"
+  cookieConsent = false
+  includeBootstrapJs = false
+  faviconSafariPinnedTabColor = "#5bbad5"
+  faviconMsApplicationTileColor = "#da532c"
+  faviconThemeColor = "#ffffff"
+
+[menu]
+  [[menu.nav]]
+  name = "Posts"
+  url = "/"
+  weight = 1
+  [[menu.nav]]
+  name = "Books"
+  url = "/books/"
+  weight = 2
+  [[menu.nav]]
+  name = "About me"
+  url = "/about/"
+  weight = 3
+  [[menu.nav]]
+  name = "RSS"
+  url = "/index.xml"
+  weight = 4
+
+[markup]
+  defaultMarkdownHandler = "goldmark"
+  [markup.goldmark]
+    [markup.goldmark.extensions]
+      definitionList = true
+      footnote = true
+      linkify = true
+      strikethrough = true
+      table = true
+      taskList = true
+      typographer = true
+    [markup.goldmark.parser]
+      attribute = true
+      autoHeadingID = true
     [markup.goldmark.renderer]
-  # Allows HTML in Markdown
+      hardWraps = false
       unsafe = true
+      xHTML = false
+  [markup.highlight]
+    codeFences = true
+    hl_Lines = ""
+    lineNoStart = 1
+    lineNos = false
+    lineNumbersInTable = true
+    noClasses = true
+    style = "solarized-light"
+    tabWidth = 4
+  [markup.tableOfContents]
+    endLevel = 6
+    startLevel = 2

content/about/index.md

@@ -1,12 +1,14 @@
 ---
-title: "About"
+title: "About me"
-type: page
+url: "/about/"
 draft: false
 ---
 
-This is the personal blog of Rob Watson. I build internet and audio software, am passionate about music and try hard to speak Spanish, amongst other things.
+Netflux.io is the personal website of Rob Watson. I build internet and audio software, amongst other things.
 
-Some other places that you'll find me on the internet:
+Previously I have been the co-founder of the live audio streaming platform Mixlr.
+
+This website is pretty minimal right now, but you'll find me elsewhere on the internet:
 
 * ActivityPub: [@rob@status.netflux.io](https://status.netflux.io/@rob)
 * Twitter: [@rfwatson](https://twitter.com/rfwatson)

content/book/index.md

@@ -0,0 +1,16 @@
+---
+title: Currently reading
+url: /books
+---
+
+I'm working on sharing books that I'm currently reading, or have read in the past.
+
+#### 2020
+
+Title | Author | Year | Status | Rating
+---|---|---|---|---
+Stamped from the Beginning | Ibram X Kendi | 2016 | Currently reading | |
+IBM and the Holocaust | Edwin Black | 2001 | On hold | |
+Columbine | Dave Cullen | 2009 | Completed | 4/5* |
+Kochland | Christopher Leonard | 2019 | Completed | 5/5* |
+A Very Stable Genius | Carol D Leonnig, Philip Rucker | 2020 | Completed | 3/5* |

content/post/hello-world.md

@@ -1,8 +1,11 @@
 ---
 title: "Hello World"
-type: post
+slug: "hello-world"
+description: Hello, world!
 date: 2020-06-04T13:43:51+02:00
 draft: false
+tags:
+- "hello world"
 ---
 
 Hello world!

content/post/remotedebug-webkit-ios-13.md

@@ -1,9 +1,12 @@
 ---
 title: "Remote-debugging iOS devices in Webkit and Firefox on Linux"
 slug: "linux-chrome-devtools-firefox-ios"
-type: post
 date: 2020-06-07T18:54:08+02:00
 draft: false
+tags:
+- coding
+- webkit
+- linux
 ---
 
 I choose Linux for my desktop computing environment but frequently have to debug web pages in iOS devices using Chrome or Safari.

layouts/index.html

@@ -0,0 +1,28 @@
+{{- define "main" -}}
+
+{{ $homepage := "Home" }}
+{{ with .Site.Menus.nav }}
+  {{ range first 1 . }}
+    {{ $homepage = .Name }}
+  {{ end }}
+{{ end }}
+<h1>{{ $homepage }}</h1>
+
+{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
+{{ range $pages.ByPublishDate.Reverse }}
+  <p>
+    <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+    {{ $customDateFormat := "January 2, 2006" }}
+    {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }}
+    <br>
+    <small class="text-secondary">{{ .PublishDate.Format $customDateFormat }}</small>
+    {{ partial "tags" . }}
+    {{ if eq .Site.Params.showPostSummary true }}
+    <br>
+    {{ .Summary }}
+    {{ end }}
+  </p>
+{{ end }}
+
+{{- end -}}
+

layouts/partials/head.html

@@ -0,0 +1,49 @@
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  
+  {{ hugo.Generator }}
+
+  {{ with .Site.Params.description }}
+  <meta name="description" content="{{ . }}">
+  {{ end }}
+
+  {{ $appleTouchIcon := "apple-touch-icon.png" }}
+  <link rel="apple-touch-icon" sizes="180x180" href="{{ $appleTouchIcon | absURL }}">
+
+  {{ $favicon32x32 := "favicon-32x32.png" }}
+  <link rel="icon" type="image/png" sizes="32x32" href="{{ $favicon32x32 | absURL }}">
+
+  {{ $favicon16x16 := "favicon-16x16.png" }}
+  <link rel="icon" type="image/png" sizes="16x16" href="{{ $favicon16x16 | absURL }}">
+
+  {{ $siteWebmanifest := "site.webmanifest" }}
+  <link rel="manifest" href="{{ $siteWebmanifest | absURL }}">
+
+  {{ $safariPinnedTab := "safari-pinned-tab.svg" }}
+  <link rel="mask-icon" href="{{ $safariPinnedTab | absURL }}" color="{{ .Site.Params.faviconSafariPinnedTabColor }}">
+
+  <meta name="msapplication-TileColor" content="{{ .Site.Params.faviconMsApplicationTileColor }}">
+
+  <meta name="theme-color" content="{{ .Site.Params.faviconThemeColor }}">
+
+  {{ $bootstrapCss := "css/bootstrap.min.css" }}
+  <link rel="stylesheet" href="{{ $bootstrapCss | absURL }}" />
+  <link rel="stylesheet" href="/css/main.css" />
+  
+
+  {{ if .IsHome }}
+  {{ $homepage := "Home" }}
+  {{ with .Site.Menus.nav }}
+    {{ range first 1 . }}
+      {{ $homepage = .Name }}
+    {{ end }}
+  {{ end }}
+  <title>{{ $homepage }} | {{ .Site.Title }}</title>
+  {{ else }}
+  <title>{{ .Title }} | {{ .Site.Title }}</title>
+  {{ end }}
+
+  {{ partial "style.html" . }}
+</head>
+

static/css/main.css

@@ -0,0 +1,4 @@
+table th,
+table td {
+  padding: 5px;
+}

themes/etch

@@ -1 +0,0 @@
-Subproject commit f8e5ca54ec2b566900dfb461c22425be5e3ea625

themes/minimal-bootstrap-hugo

@@ -0,0 +1 @@
+Subproject commit cba6b1861f64ec050f27c53b68b0e8f88f777414