]> git.za3k.com Git - za3k.git/commitdiff
General trimming
authorZachary Vance <za3k@za3k.com>
Sun, 14 Apr 2019 21:19:58 +0000 (14:19 -0700)
committerZachary Vance <za3k@za3k.com>
Sun, 14 Apr 2019 21:19:58 +0000 (14:19 -0700)
14 files changed:
arch.md [deleted file]
archive/adapters.md [moved from adapters.md with 100% similarity]
archive/adult.md [moved from adult.md with 100% similarity]
archive/colony.md [moved from colony.md with 100% similarity]
archive/issues.md [moved from issues.md with 100% similarity]
archived.html
books.md [deleted file]
dissociating.md [deleted file]
include.md [deleted file]
index.html
pet.jpg [deleted file]
private.md [deleted file]
sclera.jpg [deleted file]
tricks.md [deleted file]

diff --git a/arch.md b/arch.md
deleted file mode 100644 (file)
index 9f10359..0000000
--- a/arch.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Arch Linux runs on raspberry pi. The official installation method is [here](http://archlinuxarm.org/platforms/armv6/raspberry-pi). A script to automate this is [on github](https://github.com/za3k/short-programs/blob/master/extract-alarmpi).
-
-If you just want to download the image, it's [1GB](https://za3k.com/archlinux-raspberrypi-1G.img). You'll have to resize the linux partition yourself after putting it on an SD card.
-
-A signature or SHA sum is deliberately not provided. Use at your own risk.
similarity index 100%
rename from adapters.md
rename to archive/adapters.md
similarity index 100%
rename from adult.md
rename to archive/adult.md
similarity index 100%
rename from colony.md
rename to archive/colony.md
similarity index 100%
rename from issues.md
rename to archive/issues.md
index c8f45ab6fe597465f923b9319df4d798861984d9..a8f12042df5c4fe42aca30a8b9330c1ec68a46c8 100644 (file)
             <li>My 2013-2014 <a href="https://www.beeminder.com/zacharyvance/goals/pomodoros">work log</a></li>
             <li>2008-2013 <a href="/archive/wordpress/">blog posts</a></li>
             <li>My <a href="/archive/recipes.index.leaves">recipe cards</a></li>
+            <li>My public <a href="https://www.beeminder.com/zacharyvance/goals/pomodoros2">work log</a></li>
+        </ul>
+    </section>
+    <section id="creative">
+        <h1>Creative</h1>
+        <ul>
+            <li>Read the bible in <a href="new latin bible.txt">pig latin</a> <a href="https://github.com/za3k/newlatinbible">[Source]</a></li>
+            <li>2014 <a href="https://nanowrimo.za3k.com">nanowrimo</a> incomplete entry</li>
         </ul>
     </section>
     <section id="games">
         <h1>Games</h1>
         <ul>
+            <li><a href="computercraft_reference.html">Computercraft reference sheet</a></li>
             <li><a href="colony.md">Colony on the Moon</a>, my in-development minecraft modpack</li>
         </ul>
     </section>
@@ -38,7 +47,9 @@
     <section id="services">
         <h1>Services</h1>
         <ul>
-            <li>An independent news server for singularitarians, which you can access at nntp.za3k.com .</li>
+            <li>An independent news server for singularitarians, which you can access at nntp.za3k.com . (Down forever)</li>
+            <li><a href="https://publishing.za3k.com">Publish</a> any physical book at minimum cost and maximum convenience <span style="color:red">Down</span></li>
+            <li><a href="https://irc.za3k.com/?channels=forum">Web chat</a> for irc.za3k.com <span style="color:red">Down</span></li>
         </ul>
     </section>
     <section id="research">
diff --git a/books.md b/books.md
deleted file mode 100644 (file)
index aa1d867..0000000
--- a/books.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Books
-=====
-
-- Godel, Escher, Bach
-- The Martian
diff --git a/dissociating.md b/dissociating.md
deleted file mode 100644 (file)
index 0ab15e5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Things that Dani remembers:
-
-- Be nice and friendly
-- Small sentences
-- Lea is telling me something is wrong that we could change, not yelling at me.
-
-Grounding exercises and stuff Dani wrote (also trying to be grounded, seperately):
-- 0 to 10, how gone are you?
-- Smells, looks, tastes, sees.
-- "Can you tell me where you are and who I am?"
-- Try hard to be not gone
-- Where in body you're tense
-
-Things that help with dissociating:
-
-- Tell me your name, and details about yourself
-- Look at me while you talk
-- Check that I understand what you're saying to me.
-- Being friendly, nice, reassuring.
-- Asking 'x or y' questions. (yes or no, this or that)
-- Ask me if I know where I am and who you are. Explain to me if I say no or am not sure.
-- Do not suddenly leave me alone, explain why you are leaving.
-- Remind me I am safe.
-- Suggest I communicate by writing (I communicate more comfortably this way)
-- Suggest (in the form of a question) simple tasks:
-    - Can you do this?
-    - Can you look at me?
-    - Do you want some water?
-- Asking if I can do a simple thing as opposed to telling me to do it. ("Are you able to calm down now?" instead of "calm down.")
-- Asking "can I" and "can you" questions.
-- Talking a lot makes me dissociate eventually, give me breaks where I don't have to speak or listen to you.
-- Asking my level of dissociation (from 1-10) and if I know what caused it. (we can work on stopping what caused it if it's still happening)
-- Helping me focus on the senses with things in the room I am in.
-- Occasionally stopping to explain what's happening at the moment.
-- I need to have the option to leave if I am anxious/ Having the option to move freely/do what I want.
diff --git a/include.md b/include.md
deleted file mode 100644 (file)
index c36d15d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-This a list, keeping track of whether different programs require one config file, support includes, or support directories directly.
-
-Program           | Config file   | Support
----------------------------------------------
-Bash              | ~/.bashrc     | Yes (includes with globbing)
-OpenSSH           | ~/.ssh/config | Will be in (7.3)[https://bugzilla.mindrot.org/show_bug.cgi?id=1585]
-
index 9deb26f053256f6988b7ea9c5a66ba1146a4cdcf..d71a20ca8dad5d295badca8411103bc3cce71e95 100644 (file)
                 <td>Blog</td>
                 <td><a href="https://blog.za3k.com">blog.za3k.com</a></td>
             </tr>
-            <tr>
-                <td>Twitter</td>
-                <td><a href="https://twitter.com/unchoke">@unchoke</a></td>
-            </tr>
             <tr>
                 <td>Public key</td>
                 <td><a href="https://za3k.com/gpg.pub">GPG</a></td>
         </table>
     </section>
 
-    <section id="games">
-        <h1>Games</h1>
+    <section id="recommendations">
+        <h1>Recommendations</h1>
         <ul>
             <li><a href="games.md">Video games I like</a></li>
-            <li><a href="computercraft_reference.html">Computercraft reference sheet</a></li>
-        </ul>
-    </section>
-
-    <section id="opendata">
-        <h1>Personal Data</h1>
-        <ul>
-            <li>My public <a href="https://www.beeminder.com/zacharyvance/goals/pomodoros2">work log</a></li>
-            <li>An online collection of <a href="https://library.za3k.com" rel="nofollow">books</a></li>
             <li><a href="pandora.txt">Music</a> I favorited on <a href="http://pandora.com">Pandora</a></li>
+            <li>An online collection of <a href="https://library.za3k.com" rel="nofollow">books</a></li>
         </ul>
     </section>
 
         <h1>Website</h1>
         <ul>
             <li><a href="colophon.md">Colophon</a></li>
-            <li><a href="archived.html">Site map</a>: less popular, old, or obsolete resources</li>
+            <li><a href="archived.html">Older stuff</a>: less popular, old, or obsolete resources</li>
             <li>Visit the <a href="servers.md">servers</a> that run this</li>
         </ul>
     </section>
 
-    <section id="creative">
-        <h1>Creative</h1>
-        <ul>
-            <li>Read the bible in <a href="new latin bible.txt">pig latin</a> <a href="https://github.com/za3k/newlatinbible">[Source]</a></li>
-            <li>2014 <a href="https://nanowrimo.za3k.com">nanowrimo</a> incomplete entry</li>
-        </ul>
-    </section>
-
     <section id="services">
         <h1>Services</h1>
         <ul>
             <li>I host an <a href="https://etherpad.za3k.com">etherpad</a> server</li>
-            <li>Get some <a href="http://moreorcs.com">orc-themed email addresses</a></li>
-            <li>Get some free <a href="http://moreorcs.com/domain.html">orc-themed subdomain names</a> to point to your server (IPv6 included)</li>
-            <li><a href="https://publishing.za3k.com">Publish</a> any physical book at minimum cost and maximum convenience <span style="color:red">Down</span></li>
-            <li><a href="https://irc.za3k.com/?channels=forum">Web chat</a> for irc.za3k.com <span style="color:red">Down</span></li>
+            <li>Get some <a href="http://moreorcs.com">orc-themed email addresses</a> or <a href="http://moreorcs.com/domain.html">orc-themed subdomain names</a> (IPv6 included)</li>
         </ul>
     </section>
 
diff --git a/pet.jpg b/pet.jpg
deleted file mode 100644 (file)
index 42ba4af..0000000
Binary files a/pet.jpg and /dev/null differ
diff --git a/private.md b/private.md
deleted file mode 100644 (file)
index 3ed2513..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-- Avalanche [torrents](http://192.168.1.235:9091/transmission/web/#upload)
-- IcyEgo [email](https://email.icyego.com/mail/)
diff --git a/sclera.jpg b/sclera.jpg
deleted file mode 100644 (file)
index 99a0a15..0000000
Binary files a/sclera.jpg and /dev/null differ
diff --git a/tricks.md b/tricks.md
deleted file mode 100644 (file)
index 39a103e..0000000
--- a/tricks.md
+++ /dev/null
@@ -1,39 +0,0 @@
-What fuckpet will learn next
-============================
-- Be embarassed
-- Stop what you're doing, touch immediately, squirt
-
-Tricks fuckpet has learned
-==========================
-
-| Trick              | Learned | Description                                                                                     |
-|--------------------|---------|-------------------------------------------------------------------------------------------------|
-| Good boy           |         | Feel really happy and turned on                                                                 |
-| Get close          |         | Get close to squirting. Fuckpet is allowed to squirt if Dani says so.                           |
-| Get close, quickly |         | Get close to squirting quickly. Fuckpet is allowed to squirt if Dani says so. Quickly means 5-30 seconds |
-| Sit                |         | Stop touching. Wait for Dani instructions. (Usually involves no touching/squirting/finishing for a while) |
-| Look               |         | Look Dani in the eyes. No looking away until Dani tells you "You can look away now" or lets go of collar.            |
-| Down               | No      | Sprawl on the ground                                                                            |
-| Up                 | No      | Get back up after **Down**                                                                      |
-| Pray <- Come out, Ciel     | No      | Get ridiculously turned on                                                                                |
-| Be embarassed      | No      | Get really embarassed in public |
-| (No name)          | No      | Stop what you're doing, touch immediately, squirt                                               |
-
-Fuckpet always
-==============
-- thinks about Dani when they finish
-
-Nice treats
-===========
-- Oreos
-- Scooby snack (?)
-- Relief (a break / finishing)
-- "Good boy"
-
-Fuckpet and Dani
-================
-
-![Fuckpet](/pet.jpg "Fuckpet")
-
-![Dani](/me.jpg "Dani")
-