fix(blog): readd contact

4 files changed, 52 insertions, 66 deletions

diff --git a/content-org/blog-extra.org b/content-org/blog-extra.org
index 71afc50..0782df5 100644
--- a/content-org/blog-extra.org
+++ b/content-org/blog-extra.org
@@ -15,6 +15,28 @@
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(/toc/)
 :END:
 
+
+* More pages
+:PROPERTIES:
+:EXPORT_HUGO_SECTION: blog/more
+:EXPORT_FILE_NAME: _index
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Other things on this blog
+:END:
+
+** Pages
+
+- [[/blog/now][Now]] - What am I doing now?
+- [[/blog/uses][Uses]] - What hardware and software I use?
+- [[/blog/about/][About]] - General info
+- [[/blog/contact/][Contact]] - How to contact me?
+  
+** My other sites
+
+- [[/][Homepage]] - the hub
+- [[/unix-history/][Unix History]] - how Unix came to be?
+- [[/cool-emacs/][Cool Emacs]] - cool things to do with Emacs
+- [[/brain-rot/][Brain Rots]] - reviews, mostly SciFi
+
 * About
 :PROPERTIES:
 :EXPORT_HUGO_SECTION: blog/about
@@ -23,8 +45,6 @@
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(/about/)
 :EXPORT_HUGO_PAIRED_SHORTCODES: causes
 :END:
-
-
 Hey, my name is Michał Sapka.
 I am a computer geek from Kraków, Poland.
 I am into niche and old things, like anime, BSD, or Emacs.
@@ -62,32 +82,12 @@ I model some of my sites on [[https://cyber.dabamos.de/][The Cyber Vanguard]], b
 I want to thank anyone who emailed me about this site. It's always a blast to read your mail!
 
 
-* More pages
-:PROPERTIES:
-:EXPORT_HUGO_SECTION: blog/more
-:EXPORT_FILE_NAME: _index
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Other things on this blog
-:END:
-
-** Pages
-
-- [[/blog/now][Now]] - What am I doing now?
-- [[/blog/uses][Uses]] - What hardware and software I use?
-- [[/blog/about/][About]] - General info
-- [[/blog/contact/][Contact]] - How to contact me?
-  
-** My other sites
-
-- [[/][Homepage]] - the hub
-- [[/unix-history/][Unix History]] - how Unix came to be?
-- [[/cool-emacs/][Cool Emacs]] - cool things to do with Emacs
-- [[/brain-rot/][Brain Rots]] - reviews, mostly SciFi
 
 * Now
 :PROPERTIES:
 :EXPORT_HUGO_SECTION: blog/now
 :EXPORT_FILE_NAME: _index
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract How to contact me
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract How What I'm up to?
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(/now/ /me/now/)
 :END:
 
@@ -137,6 +137,33 @@ This is list of hardware and software I use.
 Note, that I have two PCs (work MacBook and personal ThinkPad).
 I try to address this when applicable.
 
+* Contact
+:PROPERTIES:
+:EXPORT_HUGO_SECTION: blog/contact
+:EXPORT_FILE_NAME: _index
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract How to contact me
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(/contact/ /me/contact/)
+:END:
+
+** Contact
+
+I try not use social media except for YouTube and Mastodon. Therefore, you won't find me on Twitter, TikTok.
+**Email**: [[mailto:contact@michal.sapka.me][contact@michal.sapka.me]]
+**Mastodon**: [[https://emacs.ch/@ms][@mms@emacs.ch]]
+
+** GPG keys
+
+If you want, you can use my GPG key to validate signature (all emails from me should be signed) or to encrypt a message.
+You can find the key [here](/mms.gpg).
+
+Or you can import it directly
+
+#+begin_src shell
+curl -sL https://michal.sapka.me/mms.gpg | gpg --import
+#+end_src
+
+Log:
+- 2023-11-30: key *72AC6E152B4D98DE4CEF2CDA7E97D88147ED66E7* created
 
 * Uses
 :PROPERTIES:
diff --git a/content/blog/contact/_index.md b/content/blog/contact/_index.md
index a525e99..ce4d5e3 100644
--- a/content/blog/contact/_index.md
+++ b/content/blog/contact/_index.md
@@ -2,15 +2,14 @@
 title = "Contact"
 author = ["Michał Sapka"]
 draft = false
-weight = 1003
+weight = 1005
 abstract = "How to contact me"
-aliases = ["/contact/"]
+aliases = ["/contact/", "/me/contact/"]
 +++
 
 ## Contact {#contact}
 
 I try not use social media except for YouTube and Mastodon. Therefore, you won't find me on Twitter, TikTok.
-
 ****Email****: [contact@michal.sapka.me](mailto:contact@michal.sapka.me)
 ****Mastodon****: [@mms@emacs.ch](https://emacs.ch/@ms)
 
diff --git a/content/contact/about/_index.md b/content/contact/about/_index.md
deleted file mode 100644
index c2ccd53..0000000
--- a/content/contact/about/_index.md
+++ /dev/null
@@ -1,31 +0,0 @@
-+++
-title = "Contact"
-author = ["Michał Sapka"]
-draft = false
-weight = 1003
-abstract = "How to contact me"
-aliases = ["/contact/"]
-+++
-
-## Contact {#contact}
-
-I try not use social media except for YouTube. Therefore, you won't find me on Twitter, TikTok.
-
-****Email****: [contact@michal.sapka.me](mailto:contact@michal.sapka.me)
-****Mastodon****: [@mms@emacs.ch](https://emacs.ch/@ms)
-
-
-## GPG keys {#gpg-keys}
-
-If you want, you can use my GPG key to validate signature (all emails from me should be signed) or to encrypt a message.
-You can find the key [here](/mms.gpg).
-
-Or you can import it directly
-
-```shell
-curl -sL https://michal.sapka.me/mms.gpg | gpg --import
-```
-
-Log:
-
--   2023-11-30: key **72AC6E152B4D98DE4CEF2CDA7E97D88147ED66E7** created
diff --git a/content/more/contact/_index.md b/content/more/contact/_index.md
deleted file mode 100644
index 8b43361..0000000
--- a/content/more/contact/_index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-+++
-title = "More pages"
-author = ["Michał Sapka"]
-draft = false
-weight = 1003
-abstract = "Other things on this blog"
-+++
-
-a