aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortdro <tdro@noreply.example.com>2023-06-07 21:41:25 -0400
committertdro <tdro@noreply.example.com>2023-06-07 21:41:25 -0400
commitde7cc6f9a448990cbc43cf94ab32f47d1c679d08 (patch)
treeda71adbe639d14876f78dc32e0f088f9be5fa84b
parent245eb532afb79176eba9bd0dc072b5ddf56b2437 (diff)
downloadcanory-de7cc6f9a448990cbc43cf94ab32f47d1c679d08.tar.gz
canory-de7cc6f9a448990cbc43cf94ab32f47d1c679d08.tar.bz2
canory-de7cc6f9a448990cbc43cf94ab32f47d1c679d08.zip
shell: Update dependencies
Silence nu validator and disable deno update checking
-rw-r--r--Makefile10
-rw-r--r--config.toml38
-rw-r--r--shell.nix12
3 files changed, 11 insertions, 49 deletions
diff --git a/Makefile b/Makefile
index f7c39f3..1be1d01 100644
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,17 @@ test:
make test-jsonfeed
test-html:
- validatornu \
+ vnu \
+ --html \
+ --errors-only \
public/index.html \
public/default/index.html
test-css:
- validatornu --css \
- assets/css/default.css
+ vnu \
+ --css \
+ assets/css/default.css \
+ assets/css/syntax-highlight-default.css
test-xsl:
xsltproc \
diff --git a/config.toml b/config.toml
index a5deead..cd3cf4b 100644
--- a/config.toml
+++ b/config.toml
@@ -11,7 +11,6 @@ enableRobotsTXT = true
[author]
list = ["canory", "default", "nobody"]
footer = "A Micro Blog\n"
-
[author.default]
footer = "canory"
home = "canory"
@@ -69,13 +68,11 @@ enableRobotsTXT = true
weight = 8
[params]
-
[params.site]
offline = false
production = false
referrer = "no-referrer"
robots = "index,follow"
-
[params.webmanifest]
name = "Micro Blog"
shortName = "Micro"
@@ -83,7 +80,6 @@ enableRobotsTXT = true
backgroundColor = "#ffffff"
display = "standalone"
logo = "data/media/logo.png"
-
[params.csp]
block-all-mixed-content = ""
base-uri = ["'self'"]
@@ -102,9 +98,7 @@ enableRobotsTXT = true
script-src = ["'self'"]
style-src = ["'self'", "'unsafe-inline'", "http://preview.test"]
worker-src = ["'self'"]
-
[params.search]
-
[params.search.verification]
[related]
@@ -121,75 +115,58 @@ enableRobotsTXT = true
weight = 10
[mediaTypes]
-
[mediaTypes."application/xslt+xml"]
suffixes = ["xsl"]
[outputFormats]
-
[outputFormats.html]
baseName = "index"
mediaType = "text/html"
-
[outputFormats.embed]
baseName = "embed"
mediaType = "text/html"
-
[outputFormats.plain]
baseName = "index"
mediaType = "text/plain"
-
[outputFormats.json]
baseName = "index"
mediaType = "application/json"
-
[outputFormats.rss]
baseName = "rss"
mediaType = "application/rss+xml"
-
[outputFormats."xslt.rss"]
baseName = "rss"
mediaType = "application/xslt+xml"
-
[outputFormats."xslt.sitemap"]
baseName = "sitemap"
mediaType = "application/xslt+xml"
-
[outputFormats.authors]
path = "authors"
baseName = "index"
mediaType = "text/html"
-
[outputFormats."authors.section"]
baseName = "authors"
mediaType = "text/html"
-
[outputFormats.archives]
path = "archives/messages"
baseName = "index"
mediaType = "text/html"
-
[outputFormats.sources]
path = "sources"
baseName = "index"
mediaType = "text/html"
-
[outputFormats.browserconfig]
baseName = "browserconfig"
mediaType = "application/xml"
-
[outputFormats.webmanifest]
baseName = "site"
mediaType = "application/manifest+json"
-
[outputFormats.gallery]
baseName = "gallery"
mediaType = "text/html"
-
[outputFormats.following]
baseName = "following"
mediaType = "text/html"
-
[outputFormats.webring]
baseName = "webring"
mediaType = "text/html"
@@ -202,27 +179,21 @@ enableRobotsTXT = true
page = ["html", "plain", "embed"]
[caches]
-
[caches.assets]
dir = ":resourceDir/_gen"
maxAge = -1
-
[caches.images]
dir = ":resourceDir/_gen"
maxAge = -1
-
[caches.getcsv]
dir = ":resourceDir/caches"
maxAge = "12h"
-
[caches.getjson]
dir = ":resourceDir/caches"
maxAge = "12h"
-
[caches.getresource]
dir = ":resourceDir/caches"
maxAge = "12h"
-
[caches.modules]
dir = ":resourceDir/caches"
maxAge = -1
@@ -288,7 +259,6 @@ enableRobotsTXT = true
[markup]
defaultMarkdownHandler = "goldmark"
-
[markup.asciidocExt]
backend = "html5"
extensions = []
@@ -300,11 +270,8 @@ enableRobotsTXT = true
trace = false
verbose = false
workingFolderCurrent = false
-
[markup.asciidocExt.attributes]
-
[markup.goldmark]
-
[markup.goldmark.extensions]
definitionList = true
footnote = true
@@ -314,21 +281,17 @@ enableRobotsTXT = true
table = true
taskList = true
typographer = true
-
[markup.goldmark.parser]
autoHeadingID = true
autoHeadingIDType = "github"
wrapStandAloneImageWithinParagraph = true
-
[markup.goldmark.parser.attribute]
block = false
title = true
-
[markup.goldmark.renderer]
hardWraps = false
unsafe = false
xhtml = true
-
[markup.highlight]
anchorLineNos = true
codeFences = true
@@ -342,7 +305,6 @@ enableRobotsTXT = true
noClasses = false
noHl = false
tabWidth = 4
-
[markup.tableOfContents]
endLevel = 3
ordered = false
diff --git a/shell.nix b/shell.nix
index f40739a..470168e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -3,15 +3,10 @@ let
name = "nix-shell.canory";
pkgs = import (builtins.fetchTarball {
- url = "https://releases.nixos.org/nixos/22.11/nixos-22.11.466.596a8e828c5/nixexprs.tar.xz";
- sha256 = "1367bad5zz0mfm4czb6p0s0ni38f0x1ffh02z76rx4nranipqbgg";
+ url = "https://releases.nixos.org/nixos/23.05/nixos-23.05.563.70f7275b32f/nixexprs.tar.xz";
+ sha256 = "09r197c4b1asjmqyna3k0bmjv5djijcaz5k6fbakrq32kd67sl36";
}) { system = "x86_64-linux"; };
- validatornu = pkgs.callPackage (pkgs.fetchurl {
- url = "https://raw.githubusercontent.com/tdro/dotfiles/032efcf7f4b1c7304ce5f3f64f64c175ba59eb6d/.config/nixpkgs/packages/validatornu/default.nix";
- sha256 = "1ify40x9547z04hcibk76m45d02xg3dlvwc57n8vxcbax82yb9pj";
- }) { };
-
hugo = pkgs.callPackage ({ lib, buildGoModule, fetchgit }:
buildGoModule rec {
pname = "hugo";
@@ -40,9 +35,9 @@ let
pkgs.writeScript name ''
export PS1='\h (${name}) \W \$ '
export DENO_DIR=vendor
+ export DENO_NO_UPDATE_CHECK=1
export PATH=${pkgs.lib.strings.makeBinPath [
hugo
- validatornu
pkgs.busybox
pkgs.caddy
pkgs.check-jsonschema
@@ -54,6 +49,7 @@ let
pkgs.jing
pkgs.libxml2
pkgs.libxslt
+ pkgs.validator-nu
pkgs.yj
]}
/bin/sh