diff --git a/.gitignore b/.gitignore index 656a0a4..bb17779 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ # Dependency directories (remove the comment below to include it) # vendor/ +# Documentation notebook marker +docs/.zk diff --git a/README.md b/README.md index 1589abc..4061beb 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ * [Made with automation in mind](docs/automation.md) * [Notebook housekeeping](docs/notebook-housekeeping.md) * [Future-proof, thanks to Markdown](docs/future-proof.md) +* Supports most Markdown syntax flavors + * Links: regular Markdown links, `[[Wikilinks]]` and Neuron's `[[Folgezettel links]]#`. + * Tags: `#hashtags`, `:colon:separated:tags:`, Bear's `#multi-word tags#`. + * [YAML frontmatter](docs/note-frontmatter.md) [See the changelog](CHANGELOG.md) for the list of upcoming features waiting to be released. diff --git a/docs/.zk/config.toml b/docs/.zk/config.toml deleted file mode 100644 index 3bed872..0000000 --- a/docs/.zk/config.toml +++ /dev/null @@ -1,11 +0,0 @@ -[note] -filename = "{{slug title}}" -template = "default.md" - -[tool] -editor = "vim" - -[alias] -neuron = 'neuron gen $@' -wc = "zk list --format '{{word-count}}\t{{title}}' --sort word-count -x log $@" - diff --git a/docs/.zk/notebook.db b/docs/.zk/notebook.db deleted file mode 100644 index 3dac8dc..0000000 --- a/docs/.zk/notebook.db +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41e8b104003fba2e5076276d9b4929912391bbd163edd97d6598f654039c82e8 -size 331776 diff --git a/docs/.zk/templates/default.md b/docs/.zk/templates/default.md deleted file mode 100644 index cb44174..0000000 --- a/docs/.zk/templates/default.md +++ /dev/null @@ -1,3 +0,0 @@ -# {{title}} - -{{content}} diff --git a/go b/go index d284d06..a82e300 100755 --- a/go +++ b/go @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=`git describe --tags 2> /dev/null` +VERSION=`git describe --tags --match v[0-9]* 2> /dev/null` BUILD=`git rev-parse --short HEAD` CGO_ENABLED=1 go $1 -tags "fts5 icu" -ldflags "-X=main.Version=$VERSION -X=main.Build=$BUILD" ${@:2} diff --git a/main.go b/main.go index e88d0b4..ef9deba 100644 --- a/main.go +++ b/main.go @@ -78,7 +78,7 @@ func options(container *cmd.Container) []kong.Option { FlagsLast: true, }, kong.Vars{ - "version": Version, + "version": "zk " + strings.TrimPrefix(Version, "v"), }, kong.Groups(map[string]string{ "filter": "Filtering",