From fdce68cc29f4c441ed493d767e2524ec0bb33069 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Wed, 10 Jun 2020 23:44:09 +0200 Subject: [PATCH] update netflux.io with new theme and content --- .gitmodules | 6 +- config.toml | 88 +++++++++++++++++++---- content/{about.md => about/index.md} | 10 +-- content/book/index.md | 16 +++++ content/post/hello-world.md | 5 +- content/post/remotedebug-webkit-ios-13.md | 5 +- layouts/index.html | 28 ++++++++ layouts/partials/head.html | 49 +++++++++++++ static/css/main.css | 4 ++ themes/etch | 1 - themes/minimal-bootstrap-hugo | 1 + 11 files changed, 190 insertions(+), 23 deletions(-) rename content/{about.md => about/index.md} (55%) create mode 100644 content/book/index.md create mode 100644 layouts/index.html create mode 100644 layouts/partials/head.html create mode 100644 static/css/main.css delete mode 160000 themes/etch create mode 160000 themes/minimal-bootstrap-hugo diff --git a/.gitmodules b/.gitmodules index 521161a..b415d96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "themes/etch"] - path = themes/etch - url = https://github.com/LukasJoswiak/etch.git +[submodule "themes/minimal-bootstrap-hugo"] + path = themes/minimal-bootstrap-hugo + url = https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme.git diff --git a/config.toml b/config.toml index 79cc9aa..ff96cc3 100644 --- a/config.toml +++ b/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 -pygmentsCodeFences = true -pygmentsUseClasses = true - -[params] - dark = "off" - highlight = true +[taxonomies] + tag = "tags" [permalinks] - "/post" = "/:year/:month/:slug" + post = "/:year/:month/:slug" -[markup.goldmark.renderer] - # Allows HTML in Markdown - unsafe = true +[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] + 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 diff --git a/content/about.md b/content/about/index.md similarity index 55% rename from content/about.md rename to content/about/index.md index c12de82..ea788f3 100644 --- a/content/about.md +++ b/content/about/index.md @@ -1,12 +1,14 @@ --- -title: "About" -type: page +title: "About me" +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) diff --git a/content/book/index.md b/content/book/index.md new file mode 100644 index 0000000..7e08065 --- /dev/null +++ b/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* | diff --git a/content/post/hello-world.md b/content/post/hello-world.md index 509f0a6..1a8f56d 100644 --- a/content/post/hello-world.md +++ b/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! diff --git a/content/post/remotedebug-webkit-ios-13.md b/content/post/remotedebug-webkit-ios-13.md index b8a94e2..7edc3ad 100644 --- a/content/post/remotedebug-webkit-ios-13.md +++ b/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. diff --git a/layouts/index.html b/layouts/index.html new file mode 100644 index 0000000..94ce858 --- /dev/null +++ b/layouts/index.html @@ -0,0 +1,28 @@ +{{- define "main" -}} + +{{ $homepage := "Home" }} +{{ with .Site.Menus.nav }} + {{ range first 1 . }} + {{ $homepage = .Name }} + {{ end }} +{{ end }} +

{{ $homepage }}

+ +{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} +{{ range $pages.ByPublishDate.Reverse }} +

+ {{ .Title | markdownify }} + {{ $customDateFormat := "January 2, 2006" }} + {{ with .Site.Params.customDateFormat }}{{ $customDateFormat = . }}{{ end }} +
+ {{ .PublishDate.Format $customDateFormat }} + {{ partial "tags" . }} + {{ if eq .Site.Params.showPostSummary true }} +
+ {{ .Summary }} + {{ end }} +

+{{ end }} + +{{- end -}} + diff --git a/layouts/partials/head.html b/layouts/partials/head.html new file mode 100644 index 0000000..6ad9f65 --- /dev/null +++ b/layouts/partials/head.html @@ -0,0 +1,49 @@ + + + + + {{ hugo.Generator }} + + {{ with .Site.Params.description }} + + {{ end }} + + {{ $appleTouchIcon := "apple-touch-icon.png" }} + + + {{ $favicon32x32 := "favicon-32x32.png" }} + + + {{ $favicon16x16 := "favicon-16x16.png" }} + + + {{ $siteWebmanifest := "site.webmanifest" }} + + + {{ $safariPinnedTab := "safari-pinned-tab.svg" }} + + + + + + + {{ $bootstrapCss := "css/bootstrap.min.css" }} + + + + + {{ if .IsHome }} + {{ $homepage := "Home" }} + {{ with .Site.Menus.nav }} + {{ range first 1 . }} + {{ $homepage = .Name }} + {{ end }} + {{ end }} + {{ $homepage }} | {{ .Site.Title }} + {{ else }} + {{ .Title }} | {{ .Site.Title }} + {{ end }} + + {{ partial "style.html" . }} + + diff --git a/static/css/main.css b/static/css/main.css new file mode 100644 index 0000000..ec6475e --- /dev/null +++ b/static/css/main.css @@ -0,0 +1,4 @@ +table th, +table td { + padding: 5px; +} diff --git a/themes/etch b/themes/etch deleted file mode 160000 index f8e5ca5..0000000 --- a/themes/etch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8e5ca54ec2b566900dfb461c22425be5e3ea625 diff --git a/themes/minimal-bootstrap-hugo b/themes/minimal-bootstrap-hugo new file mode 160000 index 0000000..cba6b18 --- /dev/null +++ b/themes/minimal-bootstrap-hugo @@ -0,0 +1 @@ +Subproject commit cba6b1861f64ec050f27c53b68b0e8f88f777414