5f30a4963a1c

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Thu, 09 May 2019 16:45:54 -0400
parents 27ccadef78b3 (current diff) a92fa44e6833 (diff)
children 0b7bb860082f 1b2269fb3ada
branches/tags (none)
files

Changes

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/lml	Thu May 09 16:45:54 2019 -0400
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+ln -s "/home/sjl/src/makerlisp/sjl/$1.l" .
--- a/lispwords	Thu May 09 16:45:09 2019 -0400
+++ b/lispwords	Thu May 09 16:45:54 2019 -0400
@@ -69,6 +69,7 @@
 ; cffi
 (2 defcfun)
 (3 defcallback)
+(2 cstruct)
 
 ; maxpc
 (2 =destructure)
@@ -122,6 +123,8 @@
 (2 define-interface)
 (1 make-option)
 
+; boots
+(1 make-widget)
 
 ; makerlisp
 (1 if-lets)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stumpwm/streaming.lisp	Thu May 09 16:45:54 2019 -0400
@@ -0,0 +1,52 @@
+#S(GDUMP
+   :NUMBER 1
+   :NAME "Default"
+   :TREE ((((#S(FDUMP
+                :NUMBER 0
+                :X 0
+                :Y 0
+                :WIDTH 1237
+                :HEIGHT 731
+                :WINDOWS (29360133)
+                :CURRENT 29360133)
+             #S(FDUMP
+                :NUMBER 5
+                :X 0
+                :Y 731
+                :WIDTH 1237
+                :HEIGHT 709
+                :WINDOWS (33554437)
+                :CURRENT 33554437))
+            (#S(FDUMP
+                :NUMBER 1
+                :X 1237
+                :Y 0
+                :WIDTH 2100
+                :HEIGHT 1440
+                :WINDOWS (25165829)
+                :CURRENT 25165829)
+             (#S(FDUMP
+                 :NUMBER 2
+                 :X 3337
+                 :Y 0
+                 :WIDTH 523
+                 :HEIGHT 1020
+                 :WINDOWS (31457285 46137349)
+                 :CURRENT 31457285)
+              #S(FDUMP
+                 :NUMBER 4
+                 :X 3337
+                 :Y 1020
+                 :WIDTH 523
+                 :HEIGHT 420
+                 :WINDOWS (44040197)
+                 :CURRENT 44040197))))
+           #S(FDUMP
+              :NUMBER 3
+              :X 3860
+              :Y 0
+              :WIDTH 1260
+              :HEIGHT 1440
+              :WINDOWS (69206017 62914565 52428816 27262981 23068677)
+              :CURRENT 69206017)))
+   :CURRENT 3)
\ No newline at end of file
--- a/vim/custom-dictionary.utf-8.add	Thu May 09 16:45:09 2019 -0400
+++ b/vim/custom-dictionary.utf-8.add	Thu May 09 16:45:54 2019 -0400
@@ -281,4 +281,5 @@
 lparallel
 subshell
 schemaless
+virtualization
 rebasing
--- a/weechat/plugins.conf	Thu May 09 16:45:09 2019 -0400
+++ b/weechat/plugins.conf	Thu May 09 16:45:54 2019 -0400
@@ -73,9 +73,6 @@
 python.slack.auto_open_threads = "false"
 python.slack.background_load_all_history = "false"
 python.slack.channel_name_typing_indicator = "true"
-python.slack.color_buflist_muted_channels = "darkgray"
-python.slack.color_reaction_suffix = "darkgray"
-python.slack.color_thread_suffix = "lightcyan"
 python.slack.colorize_private_chats = "false"
 python.slack.debug_level = "3"
 python.slack.debug_mode = "false"
@@ -97,7 +94,6 @@
 python.slack.slack_api_token = "xoxp-3324703083-436133997184-447755985685-90585fad41071ee30fb518ad29831038"
 python.slack.slack_timeout = "20000"
 python.slack.switch_buffer_on_join = "true"
-python.slack.thread_messages_in_channel = "false"
 python.slack.thread_suffix_color = "lightcyan"
 python.slack.unfurl_auto_link_display = "both"
 python.slack.unfurl_ignore_alt_text = "false"
@@ -122,9 +118,6 @@
 python.slack.auto_open_threads = "Automatically open threads when mentioned or inresponse to own messages."
 python.slack.background_load_all_history = "Load history for each channel in the background as soon as it opens, rather than waiting for the user to look at it."
 python.slack.channel_name_typing_indicator = "Change the prefix of a channel from # to > when someone is typing in it. Note that this will (temporarily) affect the sort order if you sort buffers by name rather than by number."
-python.slack.color_buflist_muted_channels = "Color to use for muted channels in the buflist"
-python.slack.color_reaction_suffix = "Color to use for the [:wave:(@user)] suffix on messages that have reactions attached to them."
-python.slack.color_thread_suffix = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.colorize_private_chats = "Whether to use nick-colors in DM windows."
 python.slack.debug_level = "Show only this level of debug info (or higher) when debug_mode is on. Lower levels -> more messages."
 python.slack.debug_mode = "Open a dedicated buffer for debug messages and start logging to it. How verbose the logging is depends on log_level."
@@ -145,7 +138,6 @@
 python.slack.slack_api_token = "List of Slack API tokens, one per Slack instance you want to connect to. See the README for details on how to get these."
 python.slack.slack_timeout = "How long (ms) to wait when communicating with Slack."
 python.slack.switch_buffer_on_join = "When /joining a channel, automatically switch to it as well."
-python.slack.thread_messages_in_channel = "When enabled shows thread messages in the parent channel."
 python.slack.thread_suffix_color = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.unfurl_auto_link_display = "When displaying ("unfurling") links to channels/users/etc, determine what is displayed when the text matches the url without the protocol. This happens when Slack automatically creates links, e.g. from words separated by dots or email addresses. Set it to "text" to only display the text written by the user, "url" to only display the url or "both" (the default) to display both."
 python.slack.unfurl_ignore_alt_text = "When displaying ("unfurling") links to channels/users/etc, ignore the "alt text" present in the message and instead use the canonical name of the thing being linked to."
--- a/xsessionrc	Thu May 09 16:45:09 2019 -0400
+++ b/xsessionrc	Thu May 09 16:45:54 2019 -0400
@@ -21,5 +21,6 @@
 
 # /usr/bin/dunst -config $HOME/.dunstrc &
 
-exec gpg-agent --daemon --enable-ssh-support /usr/local/bin/stumpwm
+# exec gpg-agent --daemon --enable-ssh-support /usr/local/bin/stumpwm
+exec /usr/local/bin/stumpwm