# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1663298596 14400
# Node ID d8677652f94b27fae44d4e66bbce3c0053cd7e3f
# Parent  476dcce0f104faa8a4e2b85bfd629ed8496ccabe# Parent  169f00eabdc6863248215b20a37b51adf707d5e0
Merge

diff -r 169f00eabdc6 -r d8677652f94b bin/bootstrap.sh
--- a/bin/bootstrap.sh	Thu Aug 11 16:31:41 2022 -0400
+++ b/bin/bootstrap.sh	Thu Sep 15 23:23:16 2022 -0400
@@ -54,7 +54,6 @@
 ensure_link "src/dotfiles/sqliterc"                    ".sqliterc"
 ensure_link "src/dotfiles/stumpwmrc"                   ".stumpwmrc"
 ensure_link "src/dotfiles/stumpwm/local-share-stumpwm" ".local/share/stumpwm"
-ensure_link "src/dotfiles/tmux/tmux.conf"              ".tmux.conf"
 ensure_link "src/dotfiles/vim"                         ".vim"
 ensure_link "src/dotfiles/vim/vimrc"                   ".vimrc"
 ensure_link "src/dotfiles/w3m-keymap"                  ".w3m/keymap"
diff -r 169f00eabdc6 -r d8677652f94b bin/external-ip
--- a/bin/external-ip	Thu Aug 11 16:31:41 2022 -0400
+++ b/bin/external-ip	Thu Sep 15 23:23:16 2022 -0400
@@ -4,5 +4,5 @@
 
 
 #dig @resolver1.opendns.com ANY myip.opendns.com +short
-curl whatismyip.stevelosh.com
+curl https://whatismyip.stevelosh.com
 
diff -r 169f00eabdc6 -r d8677652f94b bin/pastebin
--- a/bin/pastebin	Thu Aug 11 16:31:41 2022 -0400
+++ b/bin/pastebin	Thu Sep 15 23:23:16 2022 -0400
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-PASTE_SHA=$(ssh paste.stevelosh.com -- 'cat > tmppaste && sha1sum tmppaste | cut -d" " -f1 && mv tmppaste /var/www/paste/`sha1sum tmppaste | cut -d" " -f1`')
+PASTE_SHA=$(ssh paste.stevelosh.com -- 'cat > tmppaste && sha1sum tmppaste | cut -d" " -f1 && mv tmppaste /var/www/paste.stevelosh.com/`sha1sum tmppaste | cut -d" " -f1`')
 URL="https://paste.stevelosh.com/$PASTE_SHA"
 
 echo -n "$URL" | pbcopy
diff -r 169f00eabdc6 -r d8677652f94b fish/config.fish
--- a/fish/config.fish	Thu Aug 11 16:31:41 2022 -0400
+++ b/fish/config.fish	Thu Sep 15 23:23:16 2022 -0400
@@ -196,7 +196,7 @@
             set_color normal
             printf ' on '
             set_color magenta
-            printf '%s' (git current-branch ^/dev/null)
+            printf '%s' (git current-branch 2>/dev/null)
             set_color green
             git_prompt_status
             set_color normal
diff -r 169f00eabdc6 -r d8677652f94b fish/functions/serve-this.fish
--- a/fish/functions/serve-this.fish	Thu Aug 11 16:31:41 2022 -0400
+++ b/fish/functions/serve-this.fish	Thu Sep 15 23:23:16 2022 -0400
@@ -1,3 +1,3 @@
 function serve-this -d "Launch a webserver on 8000 serving the cwd"
-    python -m SimpleHTTPServer
+    python3 -m http.server
 end
diff -r 169f00eabdc6 -r d8677652f94b lispwords
--- a/lispwords	Thu Aug 11 16:31:41 2022 -0400
+++ b/lispwords	Thu Sep 15 23:23:16 2022 -0400
@@ -146,3 +146,5 @@
 ; boots
 (1 event-case)
 
+; parsnip
+(1 let!)
diff -r 169f00eabdc6 -r d8677652f94b remote/bootstrap.sh
--- a/remote/bootstrap.sh	Thu Aug 11 16:31:41 2022 -0400
+++ b/remote/bootstrap.sh	Thu Sep 15 23:23:16 2022 -0400
@@ -9,8 +9,7 @@
         # Already linked.
         true
     elif test -e "$dst"; then
-        echo File "$dst" already exists and is not a symbolic link.
-        exit 1
+        echo File "$dst" already exists, skipping.
     elif test ! -e "$src"; then
         echo File "$src" does not exist.
         exit 1
@@ -30,5 +29,4 @@
 ensure_link "src/dotfiles/dircolors"     ".dircolors"
 ensure_link "src/dotfiles/ffignore"      ".ffignore"
 ensure_link "src/dotfiles/config.fish"   ".config/fish/config.fish"
-ensure_link "src/dotfiles/tmux.conf"     ".tmux.conf"
 ensure_link "src/dotfiles/hushlogin"     ".hushlogin"
diff -r 169f00eabdc6 -r d8677652f94b remote/tmux.conf
--- a/remote/tmux.conf	Thu Aug 11 16:31:41 2022 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../tmux/tmux.conf
\ No newline at end of file
diff -r 169f00eabdc6 -r d8677652f94b vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Thu Aug 11 16:31:41 2022 -0400
+++ b/vim/custom-dictionary.utf-8.add	Thu Sep 15 23:23:16 2022 -0400
@@ -317,3 +317,9 @@
 async
 valkyrie
 Greatshield
+superclasses
+metaclasses
+Metaobject
+memoize
+metaobjects
+memoized
diff -r 169f00eabdc6 -r d8677652f94b vim/vimrc
--- a/vim/vimrc	Thu Aug 11 16:31:41 2022 -0400
+++ b/vim/vimrc	Thu Sep 15 23:23:16 2022 -0400
@@ -1190,6 +1190,10 @@
     au FileType lisp noremap <buffer> <right> :<c-u>call SexpForward()<cr>
     au FileType lisp noremap <buffer> <up>    :<c-u>call SexpUp()<cr>
     au FileType lisp noremap <buffer> <down>  :<c-u>call SexpDown()<cr>
+
+    " Writing
+
+    au FileType lisp noremap <buffer> <localleader>=  I; => <esc>
 augroup END " }}}
 
 " }}}
diff -r 169f00eabdc6 -r d8677652f94b weechat/alias.conf
--- a/weechat/alias.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/alias.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [cmd]
diff -r 169f00eabdc6 -r d8677652f94b weechat/autosort.conf
--- a/weechat/autosort.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/autosort.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [sorting]
diff -r 169f00eabdc6 -r d8677652f94b weechat/buflist.conf
--- a/weechat/buflist.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/buflist.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/charset.conf
--- a/weechat/charset.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/charset.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [default]
diff -r 169f00eabdc6 -r d8677652f94b weechat/exec.conf
--- a/weechat/exec.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/exec.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [command]
diff -r 169f00eabdc6 -r d8677652f94b weechat/fifo.conf
--- a/weechat/fifo.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/fifo.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [file]
diff -r 169f00eabdc6 -r d8677652f94b weechat/fset.conf
--- a/weechat/fset.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/fset.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/logger.conf
--- a/weechat/logger.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/logger.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/python.conf
--- a/weechat/python.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/python.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/relay.conf
--- a/weechat/relay.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/relay.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
@@ -30,7 +30,7 @@
 auth_timeout = 60
 bind_address = ""
 clients_purge_delay = 0
-compression_level = 6
+compression = 20
 ipv6 = on
 max_clients = 5
 nonce_size = 16
diff -r 169f00eabdc6 -r d8677652f94b weechat/script.conf
--- a/weechat/script.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/script.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/trigger.conf
--- a/weechat/trigger.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/trigger.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/typing.conf
--- a/weechat/typing.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/typing.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]
diff -r 169f00eabdc6 -r d8677652f94b weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/urlgrab.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [color]
diff -r 169f00eabdc6 -r d8677652f94b weechat/xfer.conf
--- a/weechat/xfer.conf	Thu Aug 11 16:31:41 2022 -0400
+++ b/weechat/xfer.conf	Thu Sep 15 23:23:16 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart
+# For more info, see: https://weechat.org/doc/quickstart/
 #
 
 [look]