diff options
| author | Nicholas Johnson <nick@nicksphere.ch> | 2022-11-10 00:00:00 +0000 |
|---|---|---|
| committer | Nicholas Johnson <nick@nicksphere.ch> | 2022-11-10 00:00:00 +0000 |
| commit | 3e450519ffef45bc3105bc74f2949e25accec2b6acc694ff912075094f554a6e (patch) | |
| tree | caed74cc33d3729859a819ba6c60c0328b94835e5c7e9d19c94a6406719dd009 | |
| parent | 39c045f3aac31d4e29e929c0aabf24134b3216c60350e569e9e1dda1516cd315 (diff) | |
| download | journal-3e450519ffef45bc3105bc74f2949e25accec2b6acc694ff912075094f554a6e.tar.gz journal-3e450519ffef45bc3105bc74f2949e25accec2b6acc694ff912075094f554a6e.zip | |
Merge in default config settings from theme
| -rw-r--r-- | config/_default/config.toml | 31 | ||||
| -rw-r--r-- | config/_default/params.toml | 5 | ||||
| m--------- | themes/journal | 0 |
3 files changed, 7 insertions, 29 deletions
diff --git a/config/_default/config.toml b/config/_default/config.toml index 3a70d87..34747bc 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -5,21 +5,14 @@ copyright = "CC BY-SA 4.0" languageCode = "en-us" disablePathToLower = true rssLimit = 20 -ignoreFiles = ['content/templates/logo\.txt$'] enableEmoji = true cleanDestinationDir = true +ignoreFiles = ['content/templates/logo\.txt$'] [author] name = "Nicholas Johnson" email = "nick@nicksphere.ch" -[params] - description = "Online journal about computing, philosophy, spirituality, privacy, and society." - keywords = "computing, computers, philosophy, spirituality, privacy, surveillance, mass surveillance, free software, libre software, technology, society, politics, opinion, education, educational, blog, blogging, gemini, geminispace, gemini capsule" - indexTitle = "Welcome To My Online Journal!" - indexIntro = "I write about computing, philosophy, privacy, society, spirituality, and more." - beginCopyrightYear = 2019 - [permalinks] entry = "/:year/:month/:day/:filename" @@ -42,24 +35,4 @@ cleanDestinationDir = true weight = 4 [markup] - [markup.goldmark] - [markup.goldmark.renderer] - hardWraps = true - [markup.goldmark.extensions] - linkify = false - -[mediaTypes] - [mediaTypes."application/atom"] - suffixes = ["xml"] - [mediaTypes."text/gemini"] - suffixes = ["gmi"] - -[outputFormats] - [outputFormats.Atom] - mediaType = "application/atom" - baseName = "atom" - [outputFormats.Gemini] - mediaType = "text/gemini" - [outputFormats.Gemini_Atom] - mediaType = "application/atom" - baseName = "atom" + _merge = "deep" diff --git a/config/_default/params.toml b/config/_default/params.toml new file mode 100644 index 0000000..10678c2 --- /dev/null +++ b/config/_default/params.toml @@ -0,0 +1,5 @@ +description = "Online journal about computing, philosophy, spirituality, privacy, and society." +keywords = "computing, computers, philosophy, spirituality, privacy, surveillance, mass surveillance, free software, libre software, technology, society, politics, opinion, education, educational, blog, blogging, gemini, geminispace, gemini capsule" +indexTitle = "Welcome To My Online Journal!" +indexIntro = "I write about computing, philosophy, privacy, society, spirituality, and more." +beginCopyrightYear = 2019 diff --git a/themes/journal b/themes/journal -Subproject 90f6e85f8689f09644b3a060541d0d5b3defa2e +Subproject 3123c9eb98359ca972c797dbd7561c97fadac9d |