diff --git a/config.toml b/config.toml
index 4a1569e..b58330b 100644
--- a/config.toml
+++ b/config.toml
@@ -1,32 +1,25 @@
baseURL = "https://fzorb.xyz/"
languageCode = "en-us"
-title = "FzOrb's website"
+title = "fzorb.xyz"
theme = "fzmin"
[[menus.main]]
-name = "Home"
+name = "/"
pageRef = "/"
weight = 10
[[menus.main]]
-name = "Blog Posts"
+name = "/posts"
pageRef = "/posts"
weight = 20
[[menus.main]]
-name = "Services"
+name = "/services"
pageRef = "/services"
weight = 30
-[[menus.main]]
-name = "File Uploader"
-pageRef = "/upload"
-weight = 40
-
-[[menus.main]]
-name = "Guestbook"
-pageRef = "/guestbook"
-weight = 50
-
[markup.goldmark.renderer]
-unsafe = true
\ No newline at end of file
+unsafe = true
+
+[params]
+footer = "Yggdrasil // Tor
Live free or die
All content on this page is released under CC0"
diff --git a/content/_index.md b/content/_index.md
index 5ec0cbc..aa678ed 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,44 +1,14 @@
---
title: Home
+url: "/"
+type: "page"
---
-Hi, my name is Fzorb. I am a person from Bucharest, Romania with a deep passion for computers and technology. I am also interested in urbanism, games, history and music
-
-
-Currently I can be found at the following places.
-**Email**: [fzorb@fzorb.xyz](mailto:fzorb@fzorb.xyz) or alternatively [fzorb@airmail.cc](mailto:fzorb@airmail.cc)
-**Twitter/X**: [@fzorbie](https://twitter.com/fzorbie)
-**Discord**: [@fzorbie](https://discord.com/users/1133639224030150656)
-**Telegram**: [@fzorb](https://t.me/fzorb)
-**Matrix**: @fzorb:m.fzorb.xyz
-**Git**: [@fzorb@git.fzorb.xyz](https://git.fzorb.xyz/fzorb) or alternatively [@fzorb@github.com](https://github.com/fzorb)
-**Fediverse**: [@fzorb@p.fzorb.xyz](https://p.fzorb.xyz/users/fzorb)
-**LastFM**: [@fzorb](https://www.last.fm/user/fzorb)
-**Public Key**: https://fzorb.xyz/pub.asc
+## **ATTN**: all *@fzorb.xyz emails are down.
+**Contact me**: [/contact](/contact)
**Stuff I host**: [/services](/services)
-**About me**: [/whoami](/whoami)
-****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-****
-You can also access this site via Yggdrasil or [Tor](http://azy5ogcqnpdzcddeff4j4kml5ffrhuscii74juva4jloxstrp5t4m4id.onion).
-****
-
+**About me**: [/whoami](/whoami)
+**File uploader**: [/upload](/upload)
+**Guestbook**: [/guestbook](/guestbook)
+**Webring**: [/webring](/webring)
### Latest posts:
\ No newline at end of file
diff --git a/content/contact.md b/content/contact.md
new file mode 100644
index 0000000..c9439e1
--- /dev/null
+++ b/content/contact.md
@@ -0,0 +1,16 @@
+---
+title: "Contact"
+type: "page"
+url: "/contact/"
+---
+
+Currently I can be found at the following places.
+**Email**: ~~[fzorb@fzorb.xyz](mailto:fzorb@fzorb.xyz)~~ or alternatively [fzorb@airmail.cc](mailto:fzorb@airmail.cc)
+**Twitter/X**: [@fzorbie](https://twitter.com/fzorbie)
+**Discord**: [@fzorbie](https://discord.com/users/1133639224030150656)
+**Telegram**: [@fzorb](https://t.me/fzorb)
+**Matrix**: @fzorb:m.fzorb.xyz
+**Git**: [@fzorb@git.fzorb.xyz](https://git.fzorb.xyz/fzorb) or alternatively [@fzorb@github.com](https://github.com/fzorb)
+**Fediverse**: [@fzorb@p.fzorb.xyz](https://p.fzorb.xyz/users/fzorb)
+**LastFM**: [@fzorb](https://www.last.fm/user/fzorb)
+**Public Key**: https://fzorb.xyz/pub.asc
diff --git a/content/services.md b/content/services.md
new file mode 100644
index 0000000..553040b
--- /dev/null
+++ b/content/services.md
@@ -0,0 +1,18 @@
+---
+title: "Services"
+type: "page"
+url: "/services/"
+---
+
+This is a catalogue of all the things I am hosting for the public. This isn't everything I host, as I decided to omit private services.
+* [Matrix](https://m.fzorb.xyz) - Matrix server ran using [conduwuit](https://conduwuit.puppyirl.gay/). Register using a standard matrix client like Element and using the key [here](/matrix.txt). The key has been put in palce to prevent bots from registering.
+* [Git Forge](https://git.fzorb.xyz) - Public gitea-based git server.
+* [4get](https://search.fzorb.xyz) - A proxy search engine that doesn't suck.
+* [Nitter](https://nitter.fzorb.xyz) - FOSS Twitter front-end. Running the PrivacyDevel fork.
+
+### "Free Hosting"
+I also provide hosting to some friends of mine and the general public.
+* [Bokku](https://bokku.xyz) - free public web host
+* FrenVPS project - this is a private service that is offered to close friends of mine. Notable mentions:
+ * [Greg's Website](https://greg04.xyz)
+ * [zx86.org](https://zx86.org/)
\ No newline at end of file
diff --git a/content/services/_index.md b/content/services/_index.md
deleted file mode 100644
index 7870d7a..0000000
--- a/content/services/_index.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: "Services"
----
-## Tier I services:
-*These are the services that I commit to having 98-100% uptime*
-* [Matrix](https://m.fzorb.xyz) - a matrix server ran using [conduwuit](https://conduwuit.puppyirl.gay/). Register using a standard matrix client like Element and using the key [here](/matrix.txt). The key has been put in palce to prevent bots from registering.
-* [Git server](https://git.fzorb.xyz) - yet another Gitea-based git server.
-* [Zorbmail](https://mail.fzorb.xyz) - an invite only email server. Contact me for access. Custom domains welcome.
-* [Pleroma](https://p.fzorb.xyz/) - a Pleroma server
-
-## Tier II services:
-*These are services that may or may not go down at any time*
-* [earthwalker](https://earth.fzorb.xyz) - Earthwalker is a game of a similar concept to GeoGuessr. [source](https://gitlab.com/glatteis/earthwalker)
-* [Nitter](https://nitter.fzorb.xyz) - a free and open source alternative Twitter front-end focused on privacy and performance
-* [4get](https://search.fzorb.xyz) - a proxy search engine that doesn't suck.
-* [Mumble](mumble://fzorb.xyz:5002) - a simple mumble server
-
-## Tier III services:
-*These are services being ran by other people on my infrastructure*
-* Free VMs: I offer free VMs to some friends. Notable mentions:
- * [zx86.org](https://zx86.org)
-
-**Table of hardware**: [/hardware](/hardware)
\ No newline at end of file
diff --git a/content/webring.md b/content/webring.md
new file mode 100644
index 0000000..9de74eb
--- /dev/null
+++ b/content/webring.md
@@ -0,0 +1,33 @@
+---
+title: "Webring"
+type: "page"
+url: "/webring/"
+---
+
+This is a catalogue of sites I find cool.
+
+### fzorb.xyz
+[](https://fzorb.xyz)
+HTTPs: https://fzorb.xyz
+Tor: http://azy5ogcqnpdzcddeff4j4kml5ffrhuscii74juva4jloxstrp5t4m4id.onion
+Yggdrasil: [http://[201:acd2:6e63:671b:f32f:8a4:d7d6:3537]](http://[201:acd2:6e63:671b:f32f:8a4:d7d6:3537])
+*Note: this entry is purely demonstrative of how you could implement my site in a webring. You don't have to ask me for prior approval in order to be added to any webring.*
+
+### nishi.boats
+[](https://nishi.boats)
+HTTP: http://nishi.boats
+Tor: http://dd6xumtnsuxm646oko7mk2ugkkkdjf334ga7egi2n2zugnptvt2ijdqd.onion/
+Gopher: [gopher://gopher.nishi.boats](gopher://gopher.nishi.boats)
+
+### akatas.xyz
+[](https://akatas.xyz)
+HTTPs: https://akatas.xyz
+
+### Macos.amfi's website
+[](https://meower.xyz)
+HTTPs: https://meower.xyz
+
+### PythonScratcher's website
+[](https://psr.tf)
+HTTPs: https://psr.tf
+Tor: http://fxerrmu4o5jmlvoft6itsmok5a3b5mchd6lf5yqwbaok2crvk3ljojad.onion/
diff --git a/static/pictures/Whole_onion.jpeg b/static/pictures/Whole_onion.jpeg
deleted file mode 100644
index d48dc9d..0000000
Binary files a/static/pictures/Whole_onion.jpeg and /dev/null differ
diff --git a/static/pictures/bucuresti-m1.png b/static/pictures/bucuresti-m1.png
deleted file mode 100644
index d88b78a..0000000
Binary files a/static/pictures/bucuresti-m1.png and /dev/null differ
diff --git a/static/pictures/bucuresti-m2.png b/static/pictures/bucuresti-m2.png
deleted file mode 100644
index b0af7b3..0000000
Binary files a/static/pictures/bucuresti-m2.png and /dev/null differ
diff --git a/static/pictures/bucuresti-m3.png b/static/pictures/bucuresti-m3.png
deleted file mode 100644
index 8c27988..0000000
Binary files a/static/pictures/bucuresti-m3.png and /dev/null differ
diff --git a/static/pictures/bucuresti-m4.png b/static/pictures/bucuresti-m4.png
deleted file mode 100644
index 7aee809..0000000
Binary files a/static/pictures/bucuresti-m4.png and /dev/null differ
diff --git a/static/pictures/bucuresti-m5.png b/static/pictures/bucuresti-m5.png
deleted file mode 100644
index 3258326..0000000
Binary files a/static/pictures/bucuresti-m5.png and /dev/null differ
diff --git a/static/pictures/bucuresti-m6.png b/static/pictures/bucuresti-m6.png
deleted file mode 100644
index cceca1b..0000000
Binary files a/static/pictures/bucuresti-m6.png and /dev/null differ
diff --git a/static/pictures/prague.png b/static/pictures/prague.png
deleted file mode 100644
index 35fce72..0000000
Binary files a/static/pictures/prague.png and /dev/null differ
diff --git a/static/webring/akatas.png b/static/webring/akatas.png
new file mode 100644
index 0000000..ce16f53
Binary files /dev/null and b/static/webring/akatas.png differ
diff --git a/static/webring/banner.png b/static/webring/banner.png
new file mode 100644
index 0000000..c3217f3
Binary files /dev/null and b/static/webring/banner.png differ
diff --git a/static/webring/meower.xyz.png b/static/webring/meower.xyz.png
new file mode 100644
index 0000000..570e288
Binary files /dev/null and b/static/webring/meower.xyz.png differ
diff --git a/static/webring/nishi.gif b/static/webring/nishi.gif
new file mode 100644
index 0000000..b77ce69
Binary files /dev/null and b/static/webring/nishi.gif differ
diff --git a/static/webring/psr.gif b/static/webring/psr.gif
new file mode 100644
index 0000000..296c708
Binary files /dev/null and b/static/webring/psr.gif differ
diff --git a/themes/fzmin/static/css/style.css b/themes/fzmin/static/css/style.css
index 3cd085d..561a08a 100644
--- a/themes/fzmin/static/css/style.css
+++ b/themes/fzmin/static/css/style.css
@@ -54,7 +54,7 @@ code { background: none; }
pre code { background: none; }
/* misc elements */
-img, iframe, video { max-width: 100%; }
+img, iframe, video { max-width: 100%; margin-bottom: none; }
main { hyphens: auto; }
blockquote {
background: #f9f9f9;
@@ -67,4 +67,5 @@ table {
}
table thead th { border-bottom: 1px solid var(--bg3); }
th, td { padding: 5px; }
-thead, tfoot, tr:nth-child(even) { background: var(--bg3); }
\ No newline at end of file
+thead, tfoot, tr:nth-child(even) { background: var(--bg3); }
+ul {margin-top: none;}
\ No newline at end of file
diff --git a/themes/fzmin/static/css/themes/default.css b/themes/fzmin/static/css/themes/default.css
index d2f8071..634efd9 100644
--- a/themes/fzmin/static/css/themes/default.css
+++ b/themes/fzmin/static/css/themes/default.css
@@ -1,8 +1,8 @@
:root {
- --text-color: #fdfaff;
- --accent: #ff4949;
- --bg0: #110e0e;
- --bg1: #292323;
- --bg2: #131010;
- --bg3: #2e2a2a;
-}
\ No newline at end of file
+ --text-color: black;
+ --accent: #666;
+ --bg0: #eee;
+ --bg1: #ddd;
+ --bg2: #ddd;
+ --bg3: #f9f9f9;
+}
diff --git a/themes/zmin b/themes/zmin
new file mode 160000
index 0000000..c01873d
--- /dev/null
+++ b/themes/zmin
@@ -0,0 +1 @@
+Subproject commit c01873d657a5f884643b575800b116db6b4d2978