# HG changeset patch # User Steve Losh # Date 1558395518 14400 # Node ID 8c524b57a91b83e9236327c2692e02ffcf0ea2da # Parent 8f0891b016637651db0477c751dd3ef0dcacc30f# Parent c4db6138478b64280a819ebf9fbccb73dff466fa Merge. diff -r 8f0891b01663 -r 8c524b57a91b bin/cacl --- a/bin/cacl Mon May 20 19:38:24 2019 -0400 +++ b/bin/cacl Mon May 20 19:38:38 2019 -0400 @@ -4,5 +4,6 @@ LISPS=("sbcl" "ccl" "abcl" "ecl") LISPS=("sbcl" "ccl") +LISPS=("sbcl") rlwrap ~/src/cacl/cacl-$(shuf -n1 -e "${LISPS[@]}") "$@" diff -r 8f0891b01663 -r 8c524b57a91b stumpwmrc --- a/stumpwmrc Mon May 20 19:38:24 2019 -0400 +++ b/stumpwmrc Mon May 20 19:38:38 2019 -0400 @@ -255,10 +255,7 @@ (run-or-raise "~/intellij/bin/idea.sh" '(:class "jetbrains-idea-ce"))) (defcommand browser () () - (run-shell-command - (hostcase - (:bitdumpster "google-chrome") - (t "firefox")))) + (run-or-raise "firefox" '(:class "Firefox"))) ;;;; EQ Timers ---------------------------------------------------------------- @@ -320,6 +317,7 @@ ("H-Home" "st-font-reset") ("H-\\" "pass-personal") ("H-b" "browser") + ("H-B" "exec firefox") ("H-o" "spotify") ("H-q" "exec slock") ("H-y" "screenshot-area") diff -r 8f0891b01663 -r 8c524b57a91b uhk.json --- a/uhk.json Mon May 20 19:38:24 2019 -0400 +++ b/uhk.json Mon May 20 19:38:38 2019 -0400 @@ -2,7 +2,7 @@ "userConfigMajorVersion": 4, "userConfigMinorVersion": 0, "userConfigPatchVersion": 0, - "deviceName": "My UHK", + "deviceName": "SJL UHK (Brown)", "doubleTapSwitchLayerTimeout": 250, "iconsAndLayerTextsBrightness": 35, "alphanumericSegmentsBrightness": 31, @@ -6751,7 +6751,11 @@ null, null, null, - null, + { + "keyActionType": "keystroke", + "type": "basic", + "scancode": 43 + }, null, null, null, diff -r 8f0891b01663 -r 8c524b57a91b vim/vimrc --- a/vim/vimrc Mon May 20 19:38:24 2019 -0400 +++ b/vim/vimrc Mon May 20 19:38:38 2019 -0400 @@ -266,6 +266,11 @@ silent! digr o+ 8853 "U+2295=⊕ CIRCLED PLUS silent! digr -^ 8593 "U+2191=↑ UPWARDS ARROW +silent! digr -- 8212 "U+2014=— EM DASH + +silent! digr // 9585 "U+2571=╱ BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT +silent! digr \\ 9586 "U+2572=╲ BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT + " }}} " Convenience mappings ---------------------------------------------------- {{{ @@ -1413,18 +1418,26 @@ let prev = getline(a:lnum-1) let next = getline(a:lnum+1) + " Toplevel folds. if line =~# '\v^//' + " Toplevel comments. if prev =~# '\v^//' return '1' else return '>1' endif elseif line =~# '\v^\S.*[{(]$' + " Things that open a toplevel block, e.g.: + " func foo () { return '>1' elseif line =~#'\v^[})]$' + " The close of a toplevel block, e.g.: + " } + " This doesn't close the fold because we want to fold the space after it + " later. return '1' elseif line == "" && next =~#'\v^//' - " blank line before a comment. If the previous line is a comment, fold + " Blank line before a comment. If the previous line is a comment, fold " it with that. Otherwise don't fold it. Example: " " func x () { @@ -1442,12 +1455,37 @@ return '0' endif elseif line == "" && prev =~#'\v^[})]$' + " Blank line after the close of a toplevel block. Fold it with the + " block. return '<1' elseif line =~# '\v^\S' + " Some other toplevel line, e.g.: + " import ... return '0' - else - return '=' endif + + " Inner folds. + if line =~# '\v^\s+//' + " Inner comment. + let p = prev =~# '\v^\s+//' + let n = next =~# '\v^\s+//' + if !n && !p + " Single line comment, don't make a new fold. + return '=' + elseif n && p + " Middle of a multi-line comment, fold. + return '2' + elseif !p + " Start of a multi-line comment. + return '>2' + elseif !n + " End of a multi-line comment. + return '<2' + endif + endif + + " Otherwise fold with previous. + return '=' endfunction augroup ft_go diff -r 8f0891b01663 -r 8c524b57a91b weechat/plugins.conf --- a/weechat/plugins.conf Mon May 20 19:38:24 2019 -0400 +++ b/weechat/plugins.conf Mon May 20 19:38:38 2019 -0400 @@ -73,6 +73,9 @@ 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" @@ -94,6 +97,7 @@ 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" @@ -118,6 +122,9 @@ 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." @@ -138,6 +145,7 @@ 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."