edit some mindmaps

8 files changed, 108 insertions, 76 deletions

diff --git a/config/doom.org b/config/doom.org
index a458d5f..2bb8fb5 100644
--- a/config/doom.org
+++ b/config/doom.org
@@ -187,26 +187,32 @@ And another to connect to libera:
 In order to use this configuration, you must install and configure mu and mbsync.
 #+begin_src emacs-lisp :tangle yes
 
+;; (setq send-mail-function 'smtpmail-send-it)
+;; (setq smtpmail-default-smtp-server "mail.nullring.xyz")
+;; (setq smtpmail-smtp-server "mail.nullring.xyz")
+;; (setq smtpmail-smtp-service 465)
+;; (setq smtpmail-stream-type 'starttls)
+
+(require 'smtpmail)
 (setq send-mail-function 'smtpmail-send-it)
-(setq smtpmail-default-smtp-server "mail.nullring.xyz")
 (setq smtpmail-smtp-server "mail.nullring.xyz")
+(setq smtpmail-default-smtp-server "mail.nullring.xyz")
 (setq smtpmail-smtp-service 465)
+(setq smtpmail-smtp-user "preston@nullring.xyz")
 (setq smtpmail-stream-type 'ssl)
+(setq smtpmail-debug-info t)
+(setq smtpmail-auth-credentials '(("mail.nullring.xyz" 465 "preston@nullring.xyz" "lO7Y`\"-si<zU")))
 
-(after! mu4e
- (setq mu4e-get-mail-command "mbsync prestonpan")
- (setq mu4e-drafts-folder "/Drafts")
- (setq mu4e-sent-folder   "/Sent")
- (setq mu4e-trash-folder  "/Trash")
-
- (setq mu4e-html2text-command "w3m -T text/html"
-       mu4e-update-interval 300
-       mu4e-headers-auto-update t
-       mu4e-view-show-images t
-       mu4e-compose-signature-auto-include nil
-       mu4e-use-fancy-chars t)
- (setq mu4e-compose-reply-ignore-address '("no-?reply" "preston@nullring.xyz")))
+(set-email-account! "prestonpan"
+  '((mu4e-sent-folder       . "/Sent")
+    (mu4e-drafts-folder     . "/Drafts")
+    (mu4e-trash-folder      . "/Trash")
+    (smtpmail-smtp-user     . "preston@nullring.xyz")
+    (user-mail-address      . "preston@nullring.xyz")    ;; only needed for mu < 1.4
+    (mu4e-compose-signature . "---\nPreston Pan"))
+  t)
 #+end_src
+
 *** RSS
 We need to set up elfeed with a list of rss feeds.
 #+begin_src emacs-lisp :tangle yes
@@ -333,7 +339,6 @@ In order to publish my website, we need to configure emacs to publish it somewhe
         ("website" :auto-sitemap t :components ("website-org" "website-static"))))
 ;; (setq org-export-html-postamble-format '(("en" "<p class=\"preamble\"><a href=\"../index.html\">previous page</a> | <a href=\"/index.html\">home</a></p>")))
 (setq org-html-postamble "Copyright © 2024 Preston Pan")
-(setq org-export-with-section-numbers nil)
 #+end_src
 *** Contacts
 Now we configure org-contacts, which allows me to store contacts in an org mode file:
@@ -438,6 +443,11 @@ Our website uses the tufte css styling and we must therefore tell emacs to gener
 (use-package! ox-tufte)
 (use-package! plan9-theme)
 #+end_src
+*** This is supposed to work
+but it doesn't
+#+begin_src emacs-lisp
+(setq org-export-with-section-numbers nil)
+#+end_src
 
 * packages.el Configuration
 These are some external packages that I use that are not provided by doom modules.
diff --git a/index.org b/index.org
index 61e1b2a..8ed03fb 100644
--- a/index.org
+++ b/index.org
@@ -24,7 +24,7 @@ Hello! I'm a person on the internet that does things, such as:
 - Mathematics
 - Physics
 - Linguistics
-- Thinking
+- Thinking about stuff
 And if you're here to do one of these things, I guarantee you're in the right place!
 
 * [[file:journal/index.org][Journal]]
@@ -64,7 +64,7 @@ website:
 #+begin_src shell :exports code :results silent
 cd ~/org/website
 git add .
-git commit -m "add linkedin"
+git commit -m "edit some mindmaps"
 git push github main
 rsync -azvP ~/website_html/ root@nullring.xyz:/var/www/ret2pop/
 #+end_src
diff --git a/journal/20240127.org b/journal/20240127.org
new file mode 100644
index 0000000..d3cf67d
--- /dev/null
+++ b/journal/20240127.org
@@ -0,0 +1,12 @@
+#+TITLE: Daily Journal
+#+STARTUP: showeverything
+#+DESCRIPTION: My daily journal entry
+#+AUTHOR: Preston Pan
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../style.css" />
+#+html_head: <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+#+html_head: <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+#+options: broken-links:t
+* Saturday, 27 January 2024
+** 23:27
+This is my journal, I know i've been demonstrating it a lot so you readers might get bored of more journal
+demonstrations but i'm demonstrating journal to someone again.
diff --git a/journal/20240128.org b/journal/20240128.org
new file mode 100644
index 0000000..8087d4b
--- /dev/null
+++ b/journal/20240128.org
@@ -0,0 +1,11 @@
+#+TITLE: Daily Journal
+#+STARTUP: showeverything
+#+DESCRIPTION: My daily journal entry
+#+AUTHOR: Preston Pan
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../style.css" />
+#+html_head: <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+#+html_head: <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+#+options: broken-links:t
+* Sunday, 28 January 2024
+** 22:09
+Today i took it easy and implemented a decent amount of the transpiler; I also did some bug fixing for stem.
diff --git a/journal/20240205.org b/journal/20240205.org
new file mode 100644
index 0000000..46811ea
--- /dev/null
+++ b/journal/20240205.org
@@ -0,0 +1,17 @@
+#+TITLE: Daily Journal
+#+STARTUP: showeverything
+#+DESCRIPTION: My daily journal entry
+#+AUTHOR: Preston Pan
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../style.css" />
+#+html_head: <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+#+html_head: <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+#+options: broken-links:t
+* Monday, 05 February 2024
+** 16:39
+I'm going back to vancouver today, and I'm showing yet another person my journal.
+** 18:36
+I am finally returning home from Victoria, and thus, my schedule will continue on. My agenda currenty has a lot of missed habits
+but hopefully I will be able to recover.
+** 21:57
+Okay, apparently the busses are not running very often. This is kind of bad because I need to wait an hour for the next bus to actually come,
+and this means I will probably get home at around 00:00.
diff --git a/mindmap/index.org b/mindmap/index.org
index f816eee..b979341 100644
--- a/mindmap/index.org
+++ b/mindmap/index.org
@@ -20,6 +20,9 @@ No, it's a mindmap you fucking idiot.
 - Don't use the back button on your browser
 - Everything here is going to be a link to another mindmap page.
 - Therefore, if there is a page you want to go back to, you must navigate until you find a loop back to the original page.
+** Prerequisites
+One must have an open mind, know the basics of the [[https://nullring.xyz/blog/stem.html][Stem programming language]], and have finished a high school mathematics
+education. One must also know about some mathematical notation, though much of it will be explained in the articles.
 ** What Happens if I don't Follow the Rules?
 You're ruining your own fun I guess. These are just the recommended settings
 and if you want to change them then you're free to.
diff --git a/mindmap/recursion.org b/mindmap/recursion.org
index a23838e..644e196 100644
--- a/mindmap/recursion.org
+++ b/mindmap/recursion.org
@@ -19,9 +19,9 @@ Self reference.
 Yeah, but I think it's a good introduction to the subject. You can think of recursion
 as [[id:42dbae12-827c-43c4-8dfc-a2cb1e835efa][self-assembly]] and it has deep connections to topics such as [[id:b005fb71-2a16-40f9-9bb6-29138f4719a2][emergence]]. I will first
 describe it in a mathematics context, and then a programming context.
-For demonstration purposes, I will use [[id:5d2e2f3b-96ac-4196-9baf-4c3d6d349c98][python]].
+For demonstration purposes, I will use my own programming language, [[https://ret2pop.nullring.xyz/blog/stem.html][Stem]] (warning: link takes you outside of mindmap).
 * [[id:a6bc601a-7910-44bb-afd5-dffa5bc869b1][Mathematics]] Describes Recursion
-For this example, I will be using the  [[id:aed6b5dc-c2ec-4e8c-b793-538cd5d6e355][factorial]]. One might define it like so:
+For this example, I will be using the [[id:aed6b5dc-c2ec-4e8c-b793-538cd5d6e355][factorial]]. One might define it like so:
 \begin{align*}
 f: \mathbb{N}\rightarrow\mathbb{N}\ s.t. \\
 f(0) = 1 \\
@@ -43,78 +43,56 @@ f(1) = 1f(0) = 1 \times 1 = 1 \\
 f(2) = 2f(1) = 2 \times 1 = 2 \\
 f(3) = 3f(2) = 3 \times 2 = 6
 \end{align*}
-and so the result is multiplying $3 * 2 * 1 * 1 = 6$. If you observe what we did, you'll see that we started
+and so the result is multiplying $3 \times 2 \times 1 \times 1 = 6$. If you observe what we did, you'll see that we started
 by trying to replace unknown variables by trying to evaluate $f(x)$ one number down, and eventually we reach
 a "base case" -- zero. As soon as the "base case" occurs, we then "go back up" by replacing all the unknown
 values with known ones -- and that's how we evaluate recursive functions.
 
-* Programming Describes Recursion
-Even if you don't understand programming, it should be clear that this represents the [[id:aed6b5dc-c2ec-4e8c-b793-538cd5d6e355][factorial]] [[id:b1f9aa55-5f1e-4865-8118-43e5e5dc7752][function]]:
-#+begin_src python :exports both
-def factorial(x):
-    if x < 0:
-        return None
-    elif x == 0:
-        return 1
-    return x * factorial(x - 1)
-return factorial(5)
+* Programming Describe Recursion
+In stem, a factorial implementation might look like this:
+#+begin_src stem :exports both
+factorial [ dup 0 <= [ 1 + ] [ dup 1 - factorial * ] if ] def
+5 factorial .
 #+end_src
 
 #+RESULTS:
 : 120
-
-And it also prints the result that we expect for the factorial of 5. Take note that just like in our mathematics
-example, ~factorial~ calls itself until it reaches a base case, ~x == 0~.
-** The stack frame
-We are now going to modify the code to be more transparent in the sense that it is going to print
-each factorial call out:
-#+begin_src python :results output :exports both
-def factorial(x):
-    if x < 0:
-        return None
-    elif x == 0:
-        print(1)
-        return 1
-    n = x * factorial(x - 1)
-    print(n)
-    return n
-factorial(5)
+and in stem, we can print out the stack every step of the way with the builtin word ~?~:
+#+begin_src stem :exports both
+factorial-debug [ dup 0 <= [ 1 + ] [ ? "\n" . dup 1 - factorial-debug dup . * ] if ] def
+5 factorial-debug .
 #+end_src
 
 #+RESULTS:
-: 1
-: 1
-: 2
-: 6
-: 24
-: 120
+#+begin_example
+5
 
-what is happening here? Why is it printing in the reverse order? Well, it is the /exact same phenomenon/
-as the "going back up" procedure we did before!
+5
+4
 
-You can model this behavior with a [[id:52d255d2-114c-42f4-b362-f0b4a2f7b83d][stack]], which is why it is called a stack frame. What's interesting is that
-the "going down until you reach the bottom and then building back up" procedure we did to solve $f(3)$ in the
-math section is actually modeled well by a stack. Just look at the far right hand side of all our equations in
-that example: we try but fail to evaluate $f(2)$, then $f(1)$, then $f(0)$. Then, we succeed in evaluating
-$f(0)$, which leads to being able to evaluate $f(1)$, which leads to being able to evaluate $f(2)$. This reverse
-ordering is exactly what we see by pushing a list of items onto a stack then removing them from one. Additionally,
-the second equation block from that section's right hand side is identical to the first few entries we see in the
-results block of this one, and you can see an exact mirroring of the first block in its evaluations of $f(n)$.
+5
+4
+3
 
-So, the "going down" procedure is the same thing as pushing values onto some sort of stack, and the "going back up"
-procedure is exactly the same as popping those values off a stack!
-** Stacks Describe Recursion
-To see more transparently how stacks relate to recursion, we use my programming language stem, which is a
-concatenative programming language, as a more transparent example.
-#+begin_src stem :exports both
-factorial [ dup 0 <= [ 1 + ] [ dup 1 - factorial * ] if ] def
-5 factorial .
-#+end_src
+5
+4
+3
+2
 
-#+RESULTS:
-: 120
+5
+4
+3
+2
+1
 
-* TODO Recursion Describes…?
+1
+1
+2
+6
+24
+120
+#+end_example
 
+* TODO Recursion Describes…?
 * TODO Recursion is not Recursive
 * TODO Recursion = [[id:1b1a8cff-1d20-4689-8466-ea88411007d7][duality]]?
diff --git a/mindmap/self-assembly.org b/mindmap/self-assembly.org
index a9ef3a1..110c085 100644
--- a/mindmap/self-assembly.org
+++ b/mindmap/self-assembly.org
@@ -6,4 +6,5 @@
 #+html_head: <link rel="stylesheet" type="text/css" href="../style.css" />
 
 * Introduction
-bla bla bla.
+Self assembly is the process by which a system decreases entropy in its surrounding area
+by way of [[id:8f265f93-e5fd-4150-a845-a60ab7063164][recursive]], [[id:b005fb71-2a16-40f9-9bb6-29138f4719a2][emergent]] structures.