yet another site redesign

homepage/faq.m4

@@ -1,18 +1,15 @@
 <H2 ID="faq">frequently asked questions</H2>
-<H4>updated 2022-08-30</H4>
+<H4>updated 2022-10-23</H4>
 
 <H5>I messaged you on [<I>platform</I>] and you didn't respond. Why is that?</H5>
 <P>
-I'm not active on many platforms and the ones on which I am active tend to glitch out because I always have weird device setups.
+Because you didn't e-mail me, because I didn't receive your e-mail, or because your e-mail resembled spam.
-If you need to get in touch with me I highly encourage you to contact me via SMTP at the addresses on the site index.
-Unless you opened with something really weird, had I seen your message, I would have responded.
 </P>
 
-<H5>Why "Trinity"? Don't you go by Deven?</H5>
+<H5>Should I call you by your first or middle name?</H5>
 <P>
-I go by both.
+I can usually tell how well someone knows me (between "by a name on a paper" or "by an introduction") by what name they use for me.
-What do you think the T in DTB stood for?
+I prefer to be referred to as Trinity.
-I mostly use "Deven Blake" in formal contexts.
 </P>
 
 <H5>TLS? But I still browse this site with Internet Explorer 1!</H5>
@@ -21,11 +18,3 @@ All bad things must come to an end.
 <A HREF="https://sourcehut.org/blog/2021-02-18-sourcehut-pages/">Sourchut Pages forces TLS</A>.
 It's not my choice but it's an alright one and I'm happy to be on a platform whose principles are ones with which I can agree.
 </P>
-<P>
-This change in hosting has also put fuel in the fire that's burned
-<A HREF="https://web.archive.org/web/2/devenzone">/devenzone</A>,
-<A HREF="https://web.archive.org/web/2/http://www.trinity.moe/stickers">/stickers</A>,
-and much of <A HREF="css">/css</A>.
-These are all pages that heavily relied on third-party resources, which Sourcehut forbids.
-This is no great loss and these pages won't be missed.
-</P>

homepage/html.m4

@@ -5,6 +5,7 @@ define(`_code', `<CODE>$1</CODE>')dnl
 define(`_hyperlink', `<A HREF="$1">$2</A>')dnl
 define(`_literal_hyperlink', `_hyperlink($1, $1)')dnl
 define(`_italic', `<I>$1</I>')dnl
+define(`_noop', `$1')dnl
 define(`_td', `<TD>$1</TD>')dnl
 define(`_th', `<TH>$1</TH>')dnl
 define(`_tr', `<TR>$1</TR>')dnl

homepage/index.m4

@@ -19,60 +19,38 @@ window.onload = function(){
 };
 //--></SCRIPT>
 
-include(`announcement.m4')dnl
+<CENTER>
-<P>Hi, I'm Deven Trinity Blake. I'm just your normal everyday nerd.</P>
+<IMG
+	ALT="trinity"
+	WIDTH=25%
+	SRC="img/maya.png"
+/>
+<P>
+Deven Trinity Blake <BR />
 <SMALL>
-transcriptions of my name include: <BR />
+バレイク デビン <BR />
-ديفين بلايك <BR />
+ديفين بلايك
-バレイク デビン (BLAKE Deven)
 </SMALL>
-<P>
+</CENTER>
-To correctly refer to me you may use <CODE>she/her</CODE>, <CODE>they/them</CODE>, or any genderless pronoun set you prefer to use.
-If this confuses you just say things like &quot;<I>they</I> walked&quot;, or &quot;I saw <I>them</I> walking&quot;.
-I won't get offended if you use <CODE>he/him</CODE> but I'll probably be a bit confused.
 </P>
 <P>
-This website is the compiled output of an <A HREF="https://git.sr.ht/~trinity/homepage">m4 project</A>.
+Most people call me Trinity and use _code(`she/her') or genderless pronouns to refer to me.
-See something wrong? <A HREF="#contact">Contact me</A>.
+I won't get offended if you use _code(`he/him') but I'll probably be a bit confused.
 </P>
-<P>
-The canonical URL for this page is <A HREF="https://trinity.moe/">https://trinity.moe/</A>.
-You can also use the <A HREF="https://aaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/a?áaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂáaaÂåAæãæãæaâÁáÆáÆææææææáÅæãæáåÀåÅåÀæãæÀáÅåÄåÆåä">lengthened URL</A> if need be,
-and <A HREF="http://devenblake.com">devenblake.com</A> should redirect here but is broken.
-</P>
-
 include(`navigation.m4')dnl
-
+<P>
-_BAR
+This website is an <A HREF="https://git.sr.ht/~trinity/homepage">m4 project</A>.
-
+The canonical URL for this page is _literal_hyperlink(`https://trinity.moe/').
-include(`contact.m4')dnl
+</P>
-
-_BAR
 
 include(`services.m4')dnl
 
 _BAR
 
-include(`praise.m4')dnl
-
-_BAR
-
-include(`extensions.m4')dnl
-
-_BAR
-
-include(`now.m4')dnl
-
-_BAR
-
 include(`faq.m4')dnl
 
 _BAR
 
-include(`gear.m4')dnl
-
-_BAR
-
 include(`trinitisms.m4')dnl
 
 _BAR
@@ -81,7 +59,7 @@ include(`zelda.m4')dnl
 
 _BAR
 
-include(`privacy.m4')dnl
+include(`praise.m4')dnl
 
 _BAR
 
@@ -93,7 +71,7 @@ _BAR
 <P ID="quote_value"></P>
 <P ID="quote_author"></P>
 
-<HR ALIGN="left" SIZE="1" WIDTH="25%" />
+_BAR
 
 <P>
 This site is written in vim and tested in the latest Firefox.

homepage/navigation.m4

@@ -1,22 +1,12 @@
 <P><I>Click to jump or navigate to...
 <B>living</B>:
 <A HREF="bookmarks"  >bookmarks/</A>,
-<A HREF="#contact"   >#contact</A>,
 <A HREF="css/"       >css/</A>,
-<A HREF="#faq"        >#faq</A>,
-<A HREF="#gear"       >#gear</A>,
 <A HREF="home/"       >home/</A>,
 <A HREF="phones/"     >phones/</A>,
-<A HREF="#praise"    >#praise</A>,
-<A HREF="#services"  >#services</A>,
 <A HREF="shitlist/"   >shitlist/</A>,
-<A HREF="#trinitisms">#trinitisms</A>,
-<A HREF="#zelda"     >#zelda</A>;
 <B>ephemeral</B>:
 <A HREF="blah/"       >blah/</A>,
-<A HREF="#extensions" >#extensions</A>,
-<A HREF="#now"        >#now</A>,
-<A HREF="#privacy"    >#privacy</A>,
 <A HREF="thegame"     >thegame/</A>;
 <B>knowledge</B>:
 <A HREF="cat/"    >cat(1)</A>,

homepage/praise.m4

@@ -1,6 +1,6 @@
-<H2 ID="praise">Praise for www.trinity.moe's bold approach to the web</H2>
 <IMG
 	ALT="Praise me more."
+	ID="praise"
 	SRC="img/praise_me_more.jpg"
 />
 <UL>

homepage/services.m4

@@ -1,7 +1,6 @@
-define(`_service', `<B>$1</B>, $2')dnl
+define(`_service', `<B>$1</B> as <I>$2</I>')dnl
-define(`_service_inactive', `<I>_service($1, $2)</I>')dnl
+define(`_service_inactive', `_service($1, $2)')dnl
-<H2 ID="services">Services I'm on include...</H2>
+	<P ID="services">Services I'm on include
-	<P>
 _service_inactive(`All Things Weezer', `deven');
 _service_inactive(`ArchWiki', `deven');
 _service_inactive(`Bandcamp', `devenblake');
@@ -19,10 +18,9 @@ _service(`Sourcehut', `trinity');
 _service_inactive(`SpaceHey', `dtb');
 _service_inactive(`Substack', `trn1ty');
 _service_inactive(`TikTok', `trn1ty');
-_service_inactive(`Wikipedia', `DTB')
+and _service_inactive(`Wikipedia', `DTB').
 	</P>
 	<SMALL>(<A HREF="http://murderu.us/">I also have an IRC server (mirrored to Discord)</A>)</SMALL>
 <P>
-None of these are guaranteed to still be on-line and italicized entries are ones I rarely use.
+The only thing I consistently check is my e-mail, trinity at this domain. I'll reply from a different and possibly temporary address.
-I would prefer you simply e-mail me.
 </P>

homepage/stickers.m4

@@ -1,4 +1,4 @@
-<H2 ID="stickers">Stickers</H2>
+<H2 ID="stickers">stickers</H2>
 
 <A HREF="http://www.trinity.moe"><IMG
 ALT="trinity.moe. Hypertext on port 80. Click here."

homepage/trinitisms.m4

@@ -1,4 +1,4 @@
-<H2 ID="trinitisms">Trinitisms</H2>
+<H2 ID="trinitisms">trinitisms</H2>
 
 <P><I><B>ism</B> - A distinctive doctrine, system, or theory.</I> (From the American Heritage(R) Dictionary of the English Language, 5th ed, <A HREF="https://www.wordnik.com/words/ism">according to Wordnik</A>.)</P>
 
@@ -28,4 +28,7 @@ Though I hope someone important finds individual terms for each America and has
 	<LI>The only good programmers are the insane programmers.</LI>
 	<LI>If less than one half of the packaging is in a non-Latin writing system, the noodles will be sub-par.</LI>
 	<LI><B>home ownership corporation</B> - "home owners' association". A home ownership corporation is exactly that - a corporation that can force you to sell your home if you don't comply with their own rules, separate from the government. Calling it an "association" implies you have power within someone else's corporation.</LI>
+	<LI>"<B>supperino neighborino</B>" - "What's up, neighbor?"</LI>
+	<LI><B>pocket gizmo</B> - smart phone</LI>
+	<LI>You should steal from the military. Your tax dollars paid for their stuff anyway.</LI>
 </UL>

homepage/zelda.m4

@@ -1,5 +1,4 @@
-<H2 ID="zelda">Play the Zelda theme song in your terminal</H2>
+<P ID="zelda"><CODE STYLE="DISPLAY: BLOCK;">
-<P><CODE STYLE="DISPLAY: BLOCK;">
 <A HREF="https://archive.org/download/cirno_actually_plays_zelda_in_terminal/cirno_actually_plays_zelda_in_terminal.png">
 curl https://www.trinity.moe/zeldb.sh | sudo sh
 </A>