commit b2bd69e034f5356ec0d1bad2cbaf1f22e5deb523
parent f6881522222f751f5ddfcd80d31e78399b793b3b
Author: Shimmy Xu <shimmy.xu@shimmy1996.com>
Date: Fri, 29 Nov 2019 15:20:03 -0500
Rewrite about page, add contact information
Diffstat:
6 files changed, 30 insertions(+), 101 deletions(-)
diff --git a/config.toml b/config.toml
@@ -29,8 +29,8 @@ serie = "series"
[Languages]
[Languages.en]
- languageName = "EN"
- copyright = "© 2014-2019 [Shimmy Xu](/en/contact/) | <a rel=\"me\" href=\"https://github.com/shimmy1996\">GitHub</a> | <a rel=\"me\" href=\"https://mstdn.shimmy1996.com/@shimmy1996\">Mastodon</a> | [Subscribe](/en/index.xml)"
+ languageName = "English"
+ copyright = "© 2014-2019 [Shimmy Xu](/en/about/) | <a rel=\"me\" href=\"https://github.com/shimmy1996\">GitHub</a> | <a rel=\"me\" href=\"https://mstdn.shimmy1996.com/@shimmy1996\">Mastodon</a> | [Subscribe](/en/index.xml)"
title = "Library of Trantor"
[[Languages.en.menu.main]]
@@ -42,17 +42,13 @@ serie = "series"
url = "/en/posts/"
weight = 2
[[Languages.en.menu.main]]
- name = "About"
- url = "/en/about/"
- weight = 3
- [[Languages.en.menu.main]]
name = "Friends"
url = "/en/friends/"
- weight = 4
+ weight = 3
[Languages.zh]
languageName = "中文"
- copyright = "© 2014-2019 [Shimmy Xu](/zh/contact/) | <a rel=\"me\" href=\"https://github.com/shimmy1996\">GitHub</a> | <a rel=\"me\" href=\"https://mstdn.shimmy1996.com/@shimmy1996\">Mastodon</a> | [订阅](/zh/index.xml)"
+ copyright = "© 2014-2019 [Shimmy Xu](/zh/about/) | <a rel=\"me\" href=\"https://github.com/shimmy1996\">GitHub</a> | <a rel=\"me\" href=\"https://mstdn.shimmy1996.com/@shimmy1996\">Mastodon</a> | [订阅](/zh/index.xml)"
title = "川陀大学图书室"
[[Languages.zh.menu.main]]
@@ -64,13 +60,9 @@ serie = "series"
url = "/zh/posts/"
weight = 2
[[Languages.zh.menu.main]]
- name = "关于"
- url = "/zh/about/"
- weight = 3
- [[Languages.zh.menu.main]]
name = "朋友们"
url = "/zh/friends/"
- weight = 4
+ weight = 3
[Languages.zh.Blackfriday]
extensions = ["joinLines"]
diff --git a/content/about.en.md b/content/about.en.md
@@ -4,18 +4,14 @@ draft = false
slug = "about"
+++
-## About Me {#about-me}
+Welcome, wanderer of the Internet. You have stumbled upon the scribbles of one commonly referred to by the fellows as `shimmy1996`, or rather, my blog.
-I frequently show up on social networks as `shimmy1996`.
+Feel free to shoot me an email, and here's my [GPG key](https://www.shimmy1996.com/gpg.txt):
+```nil
+5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
+```
-## About This Site {#about-this-site}
-
-This is my blog, up and running since July 12th, 2014. No longer a fan of the slow and clunky Wordpress, I migrated to Hugo on September 1st, 2017.
+This site has been running since 2014-07-12, originally on Wordpress, and on Hugo since 2017-09-01.
All contents of this site are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-nc-sa/4.0/) (CC BY-NC-SA 4.0).
-
-
-## About Trantor Network {#about-trantor-network}
-
-Trantor Network refers to a series of website I host and maintain, including mainly this blog, a [Mastodon instance](https://mstdn.shimmy1996.com/), and a [Gitea instance](https://git.shimmy1996.com/).
diff --git a/content/about.zh.md b/content/about.zh.md
@@ -4,18 +4,14 @@ draft = false
slug = "about"
+++
-## 关于博主 {#关于博主}
+欢迎，互联网的游荡者。您偶然发现的这些手记，也就是我的博客，属于传闻中常被称做 `shimmy1996` 的个体。
-EE 狗，目前在德州放牛；技术渣，~~WP~~ Hugo新手；ACG相关；喜欢硬件但是没有小钱钱；足迹可能遍布各大社交网站，通常名字为 `shimmy1996` ；求友链XDD。
+联系我的最佳方式是电子邮件，这是我的 [PGP 密匙](https://www.shimmy1996.com/gpg.txt)：
+```nil
+5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
+```
-## 关于本站 {#关于本站}
+本站从 2014-7-12 开始运行，原本使用 Wordpress，后于 2017-09-01 迁至 Hugo 。
-本站是我的博客，建于2014年7月12日，用来放各种奇怪的东西。由于受不了笨重的Wordpress，我在2017年9月1日把博客迁移到了Hugo上。
-
-本站所有内容使用 [Creative Commons署名-非商业性-相同方式共享4.0国际许可协议](http://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh)（CC BY-NC-SA 4.0）。
-
-
-## 关于川陀网络 {#关于川陀网络}
-
-川陀网络指的是一系列我自己架设并维护的网站，主要包括本站，一个[Mastodon实例](https://mstdn.shimmy1996.com/)和一个[Gitea实例](https://git.shimmy1996.com/)。
+本站所有内容使用 [Creative Commons 署名-非商业性-相同方式共享 4.0 国际许可协议](http://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh)（CC BY-NC-SA 4.0）。
diff --git a/content/contact.en.md b/content/contact.en.md
@@ -1,12 +0,0 @@
-+++
-title = "Contact"
-draft = false
-slug = "contact"
-+++
-
-Feel free to shoot me an email.
-If you feel like it, encrypt your message with my [GPG key](https://www.shimmy1996.com/gpg.txt):
-
-```nil
-5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
-```
diff --git a/content/contact.zh.md b/content/contact.zh.md
@@ -1,12 +0,0 @@
-+++
-title = "联系方式"
-draft = false
-slug = "contact"
-+++
-
-联系我的最佳方式是电子邮件。
-你可以使用我的[ PGP 密匙](https://www.shimmy1996.com/gpg.txt)来对邮件进行加密：
-
-```nil
-5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
-```
diff --git a/org/fixed.org b/org/fixed.org
@@ -67,17 +67,16 @@
:EXPORT_FILE_NAME: about.en.md
:END:
-*** About Me
-The fear of death drives me to pursue world domination as my side hobby. I like running.
-I frequently show up on social networks as =shimmy1996=.
+Welcome, wanderer of the Internet. You have stumbled upon the scribbles of one commonly referred to by the fellows as =shimmy1996=, or rather, my blog.
-*** About This Site
-This is my blog, up and running since July 12th, 2014. No longer a fan of the slow and clunky Wordpress, I migrated to Hugo on September 1st, 2017.
+Feel free to shoot me an email, and here's my [[https://www.shimmy1996.com/gpg.txt][GPG key]]:
+#+BEGIN_SRC
+5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
+#+END_SRC
-All contents of this site are licensed under a [[http://creativecommons.org/licenses/by-nc-sa/4.0/][Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License]] (CC BY-NC-SA 4.0).
+This site has been running since 2014-07-12, originally on Wordpress, and on Hugo since 2017-09-01.
-*** About Trantor Network
-Trantor Network refers to a series of website I host and maintain, including mainly this blog, a [[https://mstdn.shimmy1996.com/][Mastodon instance]], and a [[https://git.shimmy1996.com/][Gitea instance]].
+All contents of this site are licensed under a [[http://creativecommons.org/licenses/by-nc-sa/4.0/][Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License]] (CC BY-NC-SA 4.0).
** zh
:PROPERTIES:
@@ -85,46 +84,16 @@ Trantor Network refers to a series of website I host and maintain, including mai
:EXPORT_FILE_NAME: about.zh.md
:END:
-*** 关于博主
-EE 狗，目前在德州放牛；技术渣，+WP+ Hugo新手；ACG相关；喜欢硬件但是没有小钱钱；
-足迹可能遍布各大社交网站，通常名字为 =shimmy1996= 。
-
-*** 关于本站
-本站是我的博客，建于2014年7月12日，用来放各种奇怪的东西。由于受不了笨重的Wordpress，我在2017年9月1日把博客迁移到了Hugo上。
+欢迎，互联网的游荡者。您偶然发现的这些手记，也就是我的博客，属于传闻中常被称做 =shimmy1996= 的个体。
-本站所有内容使用 [[http://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh][Creative Commons署名-非商业性-相同方式共享4.0国际许可协议]]（CC BY-NC-SA 4.0）。
-
-*** 关于川陀网络
-川陀网络指的是一系列我自己架设并维护的网站，主要包括本站，一个[[https://mstdn.shimmy1996.com/][Mastodon实例]]和一个[[https://git.shimmy1996.com/][Gitea实例]]。
-
-* Contact
-:PROPERTIES:
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER: :slug contact
-:END:
-
-** en
-:PROPERTIES:
-:EXPORT_TITLE: Contact
-:EXPORT_FILE_NAME: contact.en.md
-:END:
-
-Feel free to shoot me an email.
-If you feel like it, encrypt your message with my [[https://www.shimmy1996.com/gpg.txt][GPG key]]:
+联系我的最佳方式是电子邮件，这是我的 [[https://www.shimmy1996.com/gpg.txt][PGP 密匙]]：
#+BEGIN_SRC
-5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
+5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
#+END_SRC
-** zh
-:PROPERTIES:
-:EXPORT_TITLE: 联系方式
-:EXPORT_FILE_NAME: contact.zh.md
-:END:
+本站从 2014-7-12 开始运行，原本使用 Wordpress，后于 2017-09-01 迁至 Hugo 。
-联系我的最佳方式是电子邮件。
-你可以使用我的[[https://www.shimmy1996.com/gpg.txt][ PGP 密匙]]来对邮件进行加密：
-#+BEGIN_SRC
-5672 AC27 2669 A07A BD28 0896 ACC6 C791 312C F84D
-#+END_SRC
+本站所有内容使用 [[http://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh][Creative Commons 署名-非商业性-相同方式共享 4.0 国际许可协议]]（CC BY-NC-SA 4.0）。
* Friends
:PROPERTIES: