From 1e72637a33ce43b7904fd974d39b9988a55ba5d1 Mon Sep 17 00:00:00 2001
From: BBaoVanC <bbaovanc@bbaovanc.com>
Date: Fri, 12 Nov 2021 00:08:31 -0600
Subject: [PATCH] Use config merging

---
 config.toml             | 24 ++++++++++++++++++++++++
 exampleSite/config.yaml | 40 ++++++++++++++++------------------------
 2 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 config.toml

diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000..65ab791
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,24 @@
+[markup]
+  [markup.highlight]
+    noClasses = false
+    lineNos = true
+
+[params]
+  readingtime = false
+
+[taxonomies]
+  tag = "tags"
+  author = "authors"
+
+[privacy]
+  [privacy.googleAnalytics]
+    disable = true
+
+  [privacy.twitter]
+    enableDNT = true
+
+  [privacy.vimeo]
+    enableDNT = true
+
+  [privacy.youtube]
+    privacyEnhanced = true
diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index cd0d4d0..d633853 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -7,42 +7,34 @@ enableRobotsTXT: true
 paginate: 5
 enableGitInfo: true
 
+taxonomies:
+  _merge: deep
+
 author:
   name: bbaovanc
 
-markup:
-  highlight:
-    noClasses: false
-    lineNos: true
+markup: # this just keeps the bobatheme markup styling
+  _merge: deep
 
 params:
   # these are for the OpenGraph/Twitter embeds in Hugo
   description: Example website for bobatheme
 
-  # these are for favicons in bobatheme
-  faviconICO: favicon.ico
-  faviconPNG: favicon.png
+  # these are for favicons in bobatheme (unset by default)
+  # faviconICO: /favicon.ico
+  # faviconPNG: /favicon.png
 
-  # show word count and/or reading time (enabled by default)
-  wordcount: true
-  readingtime: true
+  # show reading time (enabled by default)
+  # readingtime: true
 
-  # used for "View source"
-  gitFileURL: https://github.com/BBaoVanC/bobatheme/blob/master
-  gitFileIcon: github-circle
+  # used for "View source" (unset by default)
+  # gitFileURL: https://github.com/BBaoVanC/bobatheme/blob/master
+  # gitFileIcon: github-circle
 
+# see https://gohugo.io/about/hugo-and-gdpr/#all-privacy-settings
+# you probably want to keep this default
 privacy:
-  googleAnalytics:
-    disable: true
-
-  twitter:
-    enableDNT: true
-
-  vimeo:
-    enableDNT: true
-
-  youtube:
-    privacyEnhanced: true
+  _merge: deep
 
 languages:
   en: