From 2ff295f7623d960594068ad5299c197e1df5f1c2 Mon Sep 17 00:00:00 2001 From: Avery Winters Date: Wed, 15 Jan 2025 13:50:07 -0600 Subject: [PATCH] Switch to terminimal theme --- config.toml | 47 ++++++++++--------- content/2023-09-14-security-infrastructure.md | 3 +- content/2023-10-04-wireguard-public-ip.md | 3 +- content/2024-01-15-tls-mitm-protection.md | 2 + content/_index.md | 4 +- default.nix | 4 +- flake.lock | 41 ++++++++-------- flake.nix | 15 +++--- templates/index.html | 9 ++-- templates/robots.txt | 4 -- 10 files changed, 62 insertions(+), 70 deletions(-) delete mode 100644 templates/robots.txt diff --git a/config.toml b/config.toml index 75f5836..442bd1a 100644 --- a/config.toml +++ b/config.toml @@ -4,49 +4,50 @@ # SPDX-License-Identifier: MPL-2.0 base_url = "/" title = "Avery Winters" -author = "Avery Winters" description = "Avery Winters' personal site and blog." default_language = "en" -theme = "zerm" +theme = "terminimal" compile_sass = true minify_html = false -generate_feed = true +generate_feeds = true +feed_filenames = ["atom.xml"] +feed_limit = 20 +author = "Avery Winters" taxonomies = [{ name = "tags" }] -build_search_index = true +build_search_index = false +generate_sitemap = true +generate_robots_txt = true [markdown] highlight_code = true -highlight_theme = "gruvbox-dark" +highlight_theme = "nord" external_links_no_follow = true external_links_no_referrer = true smart_punctuation = false [extra] +accent_color = "blue" +background_color = "blue" +logo_text = "Avery Winters" author = "Avery Winters" -show_author = false -show_categories = false -show_tags = true -theme_color = "blue" -show_menu_items = 7 -full_width = false -center = true -copyright = ''' - -CC0 1.0 :: Built with Zola :: Themed with zerm +copyright_html = ''' +CC0 1.0 + + :: + Theme: Terminimal by pawroman ''' -logo_text = "Avery Winters" -main_menu = [ +menu_items = [ { name = "about", url = "/about/" }, + { name = "tags", url = "/tags/" }, + { name = "rss", url = "/atom.xml" }, { name = "mastodon", url = "https://floss.social/@averywinters", external = true }, { name = "codeberg", url = "https://codeberg.org/averywinters", external = true }, { name = "github", url = "https://github.com/averywinters", external = true }, - { name = "rss", url = "/atom.xml" }, { name = "blogroll", url = "/blogroll.xml" }, { name = "podroll", url = "/podroll.xml" } ] -menu_more = "show more" -read_more = "read more" -read_other_posts = "read other posts" -enable_katex = true -disques = { enabled = false, short_name = "" } +enable_post_view_navigation = true +favicon = "/img/favicon.ico" +favicon_mimetype = "image/x-icon" +page_titles = "combined" diff --git a/content/2023-09-14-security-infrastructure.md b/content/2023-09-14-security-infrastructure.md index 28206ef..57300c8 100644 --- a/content/2023-09-14-security-infrastructure.md +++ b/content/2023-09-14-security-infrastructure.md @@ -5,9 +5,10 @@ An overview of all the infrastructure and services I host, and the security \ mindset behind it. \ """ date = 2023-09-14 -updated = 2024-01-25 [taxonomies] tags = [ "selfhosting", "nix", "privacy", "security", "networks" ] +[extra] +show_only_description = true +++ **Note: This post is out of date, but I am leaving it here for its diff --git a/content/2023-10-04-wireguard-public-ip.md b/content/2023-10-04-wireguard-public-ip.md index 30cb9c1..e6cd61c 100644 --- a/content/2023-10-04-wireguard-public-ip.md +++ b/content/2023-10-04-wireguard-public-ip.md @@ -4,9 +4,10 @@ description = """\ A technique to assign static public IP addresses to a remote machine using WireGuard. \ """ date = 2023-10-04 -updated = 2024-01-15 [taxonomies] tags = [ "selfhosting", "nix", "privacy", "security", "networks" ] +[extra] +show_only_description = true +++ **NOTE: My setup has drifted from this post, but I still find historical value in this diff --git a/content/2024-01-15-tls-mitm-protection.md b/content/2024-01-15-tls-mitm-protection.md index 604ce37..f3eac5b 100644 --- a/content/2024-01-15-tls-mitm-protection.md +++ b/content/2024-01-15-tls-mitm-protection.md @@ -7,6 +7,8 @@ you host against MITM attacks. \ date = 2024-01-15 [taxonomies] tags = [ "selfhosting", "privacy", "security", "networks" ] +[extra] +show_only_description = true +++ A few months ago, a Russian XMPP server had their TLS connections with users diff --git a/content/_index.md b/content/_index.md index 8ad3ed8..fee03d9 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,6 +1,4 @@ +++ sort_by = "date" -transparent = true -paginate_by = 6 -insert_anchor_links = "right" +paginate_by = 10 +++ diff --git a/default.nix b/default.nix index 2e2c842..2e01659 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ { stdenv, zola, - zerm, + terminimal, }: stdenv.mkDerivation { pname = "averywinters.org"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [zola]; configurePhase = '' mkdir -p themes - ln -snf "${zerm}" "themes/zerm" + ln -snf "${terminimal}" "themes/terminimal" ''; buildPhase = "zola build"; installPhase = "cp -r public $out"; diff --git a/flake.lock b/flake.lock index 52512ed..3b4d423 100644 --- a/flake.lock +++ b/flake.lock @@ -2,19 +2,16 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -28,11 +25,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -43,16 +40,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712192574, - "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=", + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f480f9d09e4b4cf87ee6151eba068197125714de", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -62,7 +59,7 @@ "devshell": "devshell", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", - "zerm": "zerm" + "terminimal": "terminimal" } }, "systems": { @@ -80,19 +77,19 @@ "type": "github" } }, - "zerm": { + "terminimal": { "flake": false, "locked": { - "lastModified": 1655175694, - "narHash": "sha256-FhcBVJtRuQp59hI8vRnobp2vXCXbtE0l8t7EDGeXyyA=", - "owner": "ejmg", - "repo": "zerm", - "rev": "c9c3524cbd0cb90f91158cd33a113da464d32e6b", + "lastModified": 1723909769, + "narHash": "sha256-/9waid7Hpl7NfGXoUj4fVkM4mSJ/MJytoiIKCdxZuTI=", + "owner": "pawroman", + "repo": "zola-theme-terminimal", + "rev": "7f630a4e319c089f27b6704e622b38d874406381", "type": "github" }, "original": { - "owner": "ejmg", - "repo": "zerm", + "owner": "pawroman", + "repo": "zola-theme-terminimal", "type": "github" } } diff --git a/flake.nix b/flake.nix index 5869ca9..54edcc4 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,11 @@ devshell = { url = "github:numtide/devshell"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - zerm = { - url = "github:ejmg/zerm"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + terminimal = { + url = "github:pawroman/zola-theme-terminimal"; flake = false; }; }; @@ -20,7 +19,7 @@ devshell, flake-utils, nixpkgs, - zerm, + terminimal, ... }: (flake-utils.lib.eachDefaultSystem (system: let @@ -38,18 +37,18 @@ ]; startupScript = '' mkdir -p themes - ln -snf "${zerm}" "themes/zerm" + ln -snf "${terminimal}" "themes/terminimal" ''; in pkgs.devshell.mkShell { inherit commands; devshell.startup.themes.text = startupScript; }; - packages.default = pkgs.callPackage ./default.nix {inherit zerm;}; + packages.default = pkgs.callPackage ./default.nix {inherit terminimal;}; })) // { overlays.default = final: prev: { - www = prev.callPackage ./default.nix {inherit zerm;}; + www = prev.callPackage ./default.nix {inherit terminimal;}; }; }; } diff --git a/templates/index.html b/templates/index.html index 7e0d36b..c179f5a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,10 +1,7 @@ -{% extends "zerm/templates/index.html" %} -{%- block general_meta -%} - {{ head::general_meta() }} - +{% extends "terminimal/templates/index.html" %} +{% block extra_head %} - @@ -28,4 +25,4 @@ -{%- endblock general_meta -%} +{%- endblock extra_head -%} diff --git a/templates/robots.txt b/templates/robots.txt deleted file mode 100644 index 5a05f53..0000000 --- a/templates/robots.txt +++ /dev/null @@ -1,4 +0,0 @@ -User-agent: * -Disallow: -Allow: / -Sitemap: {{ get_url(path="sitemap.xml") }} \ No newline at end of file