From ed9aa18e8778ee02ab782baf0586cb05648c130d Mon Sep 17 00:00:00 2001
From: curben <curben@users.noreply.gitlab.com>
Date: Thu, 27 Sep 2018 21:40:16 +0930
Subject: [PATCH] Merge theme's to site's config

https://hexo.io/docs/configuration.html#Overriding-Theme-Config
---
 _config.yml               | 38 ++++++++++++++++++++++++++++++++++++++
 themes/typing/_config.yml | 35 -----------------------------------
 2 files changed, 38 insertions(+), 35 deletions(-)
 delete mode 100644 themes/typing/_config.yml

diff --git a/_config.yml b/_config.yml
index 4941ab6..254c87b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -78,3 +78,41 @@ neat_enable: true
 ## Docs: https://hexo.io/docs/deployment.html
 deploy:
   type:
+
+# theme config
+theme_config:
+  # Lang
+  language: en
+
+  # Dark Mode
+  dark: true
+
+  # Header
+  menu:
+    Home: /
+    About: /about
+    GitLab: https://gitlab.com/curben/curben.gitlab.io
+
+  # Your Feed Location
+  #rss: /atom.xml
+
+  # Content
+  fancybox: true
+
+  # Profile
+  nickname: curben's blog
+  description: Troubleshooting, tips & tricks, etc.
+
+  # Load fontawesome icons? Also see the links option
+  icons: false
+
+  # Footer area links
+  # If you set "icons: false" link names will be clear text
+  # If "icons: true" link names will interpreted as fontawesome icon names
+  # Use only the brand icon names (https://fontawesome.com/cheatsheet#brands)
+  links:
+    Home: /
+    GitLab: https://gitlab.com/curben/curben.gitlab.io
+
+  # nav position (top, left. top is default)
+  nav: left
diff --git a/themes/typing/_config.yml b/themes/typing/_config.yml
deleted file mode 100644
index a9042bf..0000000
--- a/themes/typing/_config.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Lang
-language: en
-
-# Dark Mode
-dark: true
-
-# Header
-menu:
-  Home: /
-  About: /about
-  GitLab: https://gitlab.com/curben/curben.gitlab.io
-
-# Your Feed Location
-#rss: /atom.xml
-
-# Content
-fancybox: true
-
-# Profile
-nickname: curben's blog
-description: Troubleshooting, tips & tricks, etc.
-
-# Load fontawesome icons? Also see the links option
-icons: false
-
-# Footer area links
-# If you set "icons: false" link names will be clear text
-# If "icons: true" link names will interpreted as fontawesome icon names
-# Use only the brand icon names (https://fontawesome.com/cheatsheet#brands)
-links:
-  Home: /
-  GitLab: https://gitlab.com/curben/curben.gitlab.io
-
-# nav position (top, left. top is default)
-nav: left