Updated the front page

1 files changed, 57 insertions, 30 deletions

diff --git a/org/index.org b/org/index.org
index 16f21fa..b23191c 100644
--- a/org/index.org
+++ b/org/index.org
@@ -12,33 +12,31 @@
 #+BACKGROUND_IMAGE: images/background.jpg
 #+SHITTYWEB_HEADER: <img src="images/home-title.jpg" alt="Nathan's Shit Web" /><img src="images/under_construction.gif" alt="Under construction" />
 
+| [[file:cgi-bin/guest-book.cgi][Guest book]] | [[file:blog/index.xhtml][blog]] | [[https://git.shittyweb.org][git]] | [[https://shittyweb.org][clearnet]] | [[http://3yrbqwojymy6zhbgbt2aatxgvs6a3m5fvrpk24nfp2q3nyjz5raohoqd.onion][onion]] | [[gopher://shittyweb.org][gopherhole]] | [[file:give-me-your-dollaridoos.org][donate]] |
 *Warning: this site provides zero value to society*
-| [[https://git.shittyweb.org][Version control]]         | [[https://shittyweb.org][clearnet]]                | [[http://3yrbqwojymy6zhbgbt2aatxgvs6a3m5fvrpk24nfp2q3nyjz5raohoqd.onion][onion]]                       |
-| [[file:cgi-bin/guest-book.cgi][--> Guest book]]          | [[file:blog/index.xhtml][--> Blog]]                | [[file:linux-room.org][--> Linux room]]              |
-| [[file:music-room.org][--> Music room]]          | [[file:tv-corner.org][--> tv corner]]           | [[file:reading-corner.org][--> Reading corner]]          |
-| [[file:nathans-philosophy.org][--> Nathan's philosophy]] | [[file:truth.org][--> LEARN THE TRUTH <--]] | [[file:ttr.org][--> Tips, tricks, & reviews]] |
-| [[file:give-me-your-dollaridoos.org][--> Donate <--]]          | [[gopher://shittyweb.org][gopherhole]]              | [[file:likes-and-dislikes.org][My likes and dislikes]]       |
-| [[file:declaration.org][declaration of freedom]]  | [[file:computing.org][How I do my computing]]   |                             |
 
+* Places
+:PROPERTIES:
+:CUSTOM_ID: places
+:END:
++ [[file:linux-room.org][linux room]]
++ [[file:music-room.org][music room]]
++ [[file:tv-corner.org][tv corner]]
++ [[file:reading-corner.org][reading corner]]
++ [[file:ttr.org][tips, tricks, & reviews]]
++ [[file:xmpp-and-mumble.org][learn about xmpp and mumble]]
++ [[file:computing.org][how I do my computing]]
++ [[file:nathans-philosophy.org][Nathan's philosophy]]
++ [[file:likes-and-dislikes.org][my likes and dislikes]]
++ [[file:declaration.org][declaration of freedom]]
++ [[file:truth.org][LEARN THE TRUTH]]
 
 /durp durp durp/ *bite my shiny metal ass*
 
-* Contact/links
-   :PROPERTIES:
-   :CUSTOM_ID: contact-links
-   :END:
-+ [[file:images/email.gif]] [[mailto:nathansmith@disroot.org]]
-+ XMPP: nathan@shittyweb.org
-+ MUC: jnrel@conference.shittyweb.org
-+ [[https://codeberg.org/nathansmith][Codeberg]]
-+ [[https://gitea.com/nathansmithsmith][Gitea]]
-
-[[file:xmpp-and-mumble.org][Learn about xmpp and mumble!]]
-  
 * About me
-   :PROPERTIES:
-   :CUSTOM_ID: about-me
-   :END:
+:PROPERTIES:
+:CUSTOM_ID: about-me
+:END:
 Many people don't know their reason for existing, others think they know
 but will one day have to learn the hard way they were wrong. My reason
 for existing is to explore the world around me and continue the nonstop
@@ -57,10 +55,37 @@ Some of my interests and hobbies:
 
 [[file:images/spinning-rat.gif]]
 
+* Contact/links
+:PROPERTIES:
+:CUSTOM_ID: contact-links
+:END:
++ [[file:images/email.gif]] [[mailto:nathansmith@disroot.org][nathansmith@disroot.org]]
++ [[file:public.key][Public key]]
++ Mumble: =shittyweb.org:64738=
++ [[https://codeberg.org/nathansmith][Codeberg]]
++ [[https://gitea.com/nathansmithsmith][Gitea]]
+
+** XMPP
+:PROPERTIES:
+:CUSTOM_ID: xmpp
+:END:
++----------+-------------------------------------+-------------------------------------+
+| Accounts |     nathan@shittyweb.org (main)     |    ebichu@hot-chilli.im (backup)    |
++----------+-------------------------------------+-------------------------------------+
+|          | 72A411C6 1B69F3E5 3B144400 7AC8DB6D | E549C9A4 C3F9FD93 B5F4B10C 5F7051A6 |
+|          | 28782A26 5801B477 A8B3A55D 7FBDE47F | 462FA496 191D4460 38457FB3 1A5ADC0E |
+|  OMEMO   +-------------------------------------+-------------------------------------+
+|          | FD572C87 42008020 D3AFA4B1 B6EA32E6 | 31073ffd 577b4779 8706f211 043bf590 |
+|          | 968A49D7 4B926222 91FFD902 194AAE12 | 54197364 b4ea0cdf cf9777c0 e5f69d02 |
++----------+-------------------------------------+-------------------------------------+
+MUCs: jnrel@conference.shittyweb.org, memes@conference.shittyweb.org\\
+(org-mode publish doesn't like xmpp links)
+
+  
 * Webrings
-    :PROPERTIES:
-    :CUSTOM_ID: webrings
-    :END:
+:PROPERTIES:
+:CUSTOM_ID: webrings
+:END:
 #+begin_export html
 <!-- No ai webring -->
 <a href="https://baccyflap.com/noai/?prv&amp;s=nsw" target="_top" title="previous">&lt;--</a>
@@ -99,12 +124,13 @@ target="_blank">--&gt;</a>
 #+end_export
 
 * My buttons
-    :PROPERTIES:
-    :CUSTOM_ID: my-buttons
-    :END:
-[[file:images/nsw_banner.png]][[file:images/shit_banner.png]]
+:PROPERTIES:
+:CUSTOM_ID: my-buttons
+:END:
+[[file:images/nsw_banner.png]]
+[[file:images/shit_banner.png]]
 
-Use one and link back to me please :3\\
+Use one and link back to me please :3
 They arent standard size because fuck you (:
 
 * My dog
@@ -114,6 +140,7 @@ They arent standard size because fuck you (:
 [[file:images/small-dog.jpg]]
 [[file:images/small-dog-2.jpg]]
 [[file:images/small-dog-3.jpg]]
+
 * Buttons
 :PROPERTIES:
 :CUSTOM_ID: buttons
@@ -134,7 +161,7 @@ They arent standard size because fuck you (:
 "https://speevtheteev.neocities.org" target="_blank"><img src=
 "images/speevtheteev.gif" alt="speevtheteev" /></a> <a href=
 "https://foggybear42.neocities.org" target="_blank"><img src=
-"images/foggybear42.gif" alt="foggybear42" /></a> <a href=
+"images/foggybear42.gif" alt="foggybear"/></a> <a href=
 "https://t-hates-you.neocities.org" target="_blank"><img src=
 "images/evilfuckingwebsite.png" alt="t-hates-you" /></a> <a href=
 "https://aurorawho.neocities.org" target="_blank"><img src=