# HG changeset patch # User Steve Losh # Date 1541617223 18000 # Node ID f97cbfe06fdee64bab38c71083ebe12123467776 # Parent ff1589a7737270953c4cb348b24829543d378fa8 More diff -r ff1589a77372 -r f97cbfe06fde .hgsub --- a/.hgsub Wed Oct 31 12:43:56 2018 -0400 +++ b/.hgsub Wed Nov 07 14:00:23 2018 -0500 @@ -5,6 +5,7 @@ vim/bundle/badwolf = [hg]https://bitbucket.org/sjl/badwolf/ vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/ vim/bundle/commentary = [git]https://github.com/tpope/vim-commentary +vim/bundle/confluencewiki = [git]https://github.com/vim-scripts/confluencewiki.vim vim/bundle/ctrlp = [git]https://github.com/ctrlpvim/ctrlp.vim vim/bundle/delimitmate = [git]https://github.com/Raimondi/delimitMate vim/bundle/fugitive = [git]https://github.com/tpope/vim-fugitive diff -r ff1589a77372 -r f97cbfe06fde .hgsubstate --- a/.hgsubstate Wed Oct 31 12:43:56 2018 -0400 +++ b/.hgsubstate Wed Nov 07 14:00:23 2018 -0500 @@ -5,6 +5,7 @@ 5e4a535e2d239cba3db19b6b79abedbc7c541727 vim/bundle/badwolf a4d79fc208764917cb58e2aed6fbaeb5e3356d33 vim/bundle/clam 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary +03c2863510945c749e6d325e2b001d7a49755a7f vim/bundle/confluencewiki c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate 196e44837555e0e05080e6bc9dfc5605a06eaabb vim/bundle/fugitive diff -r ff1589a77372 -r f97cbfe06fde bin/figlet-find-font --- a/bin/figlet-find-font Wed Oct 31 12:43:56 2018 -0400 +++ b/bin/figlet-find-font Wed Nov 07 14:00:23 2018 -0500 @@ -1,3 +1,3 @@ #!/usr/bin/env bash -ls /usr/local/share/figlet/fonts/ | grep -e 'fl[fc]' | xargs -J FONT -n1 figlet-out FONT "$@" | less +ls /usr/share/figlet/ | grep -e 'fl[fc]' | xargs -I FONT -n1 figlet-out FONT "$@" | less diff -r ff1589a77372 -r f97cbfe06fde gitconfig --- a/gitconfig Wed Oct 31 12:43:56 2018 -0400 +++ b/gitconfig Wed Nov 07 14:00:23 2018 -0500 @@ -58,7 +58,7 @@ delete-local-branch = branch -D delete-local-reference-to-remote-branch = "!sh -c 'git branch -rd $1/$2' -" delete-remote-branch = "!sh -c 'git push $1 --delete $2' -" - delete-branch = "!sh -c 'git delete-local-branch $1; git remotes | cut -f1 | sort | uniq | xargs -n1 -J % git delete-local-reference-to-remote-branch % $1' -" + delete-branch = "!sh -c 'git delete-local-branch $1; git remotes | cut -f1 | sort | uniq | xargs -n1 -I % git delete-local-reference-to-remote-branch % $1' -" currentbranch = rev-parse --abbrev-ref HEAD diff -r ff1589a77372 -r f97cbfe06fde hgignore --- a/hgignore Wed Oct 31 12:43:56 2018 -0400 +++ b/hgignore Wed Nov 07 14:00:23 2018 -0500 @@ -6,3 +6,4 @@ tags.bak *.fasl *.dx64fsl +*.lx64fsl diff -r ff1589a77372 -r f97cbfe06fde stumpwmrc --- a/stumpwmrc Wed Oct 31 12:43:56 2018 -0400 +++ b/stumpwmrc Wed Nov 07 14:00:23 2018 -0500 @@ -380,6 +380,7 @@ ("s-t" . "C-t") ("s-w" . "C-w") ("s-r" . "C-r") + ("s-f" . "C-f") ("s-z" . "C-z") ("s-x" . "C-x") ("s-c" . "C-c") diff -r ff1589a77372 -r f97cbfe06fde vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Wed Oct 31 12:43:56 2018 -0400 +++ b/vim/custom-dictionary.utf-8.add Wed Nov 07 14:00:23 2018 -0500 @@ -264,3 +264,4 @@ deserialization unmarshal lol +Dihydrogen diff -r ff1589a77372 -r f97cbfe06fde vim/vimrc --- a/vim/vimrc Wed Oct 31 12:43:56 2018 -0400 +++ b/vim/vimrc Wed Nov 07 14:00:23 2018 -0500 @@ -150,6 +150,7 @@ set wildignore+=*.fasl " Lisp FASLs set wildignore+=*.dx64fsl " CCL +set wildignore+=*.lx64fsl " CCL " }}} " Line Return {{{ @@ -257,7 +258,7 @@ silent! digr !, 8816 "U+2270=≰ NEITHER LESS-THAN NOR EQUAL TO silent! digr !. 8817 "U+2271=≱ NEITHER GREATER-THAN NOR EQUAL TO silent! digr xs 8339 "U+2093=ₓ SUBSCRIPT X - +silent! digr >< 8652 "U+21cc=⇌ EQUILIBRIUM " }}} " Convenience mappings ---------------------------------------------------- {{{ @@ -432,6 +433,7 @@ command! -bang WA wa command! -bang Wq wq command! -bang WQ wq +command! -bang Wqa wqa " Toggle paste " For some reason pastetoggle doesn't redraw the screen (thus the status bar @@ -470,6 +472,10 @@ " has to be imap because we want to be able to use the "go-indent" mapping imap gi +" Diff Navigation +nnoremap dn ]c +nnoremap dN [c + " Insert Mode Completion {{{ inoremap @@ -2248,6 +2254,7 @@ \ '^.*\.meta$', \ '^.*\.fasl$', \ '^.*\.dx64fsl$', + \ '^.*\.lx64fsl$', \ '.*\.bcf$', '.*\.blg$', '.*\.fdb_latexmk$', '.*\.bbl$', '.*\.aux$', '.*\.run.xml$', '.*\.fls$', \ '.*\.midi$'] diff -r ff1589a77372 -r f97cbfe06fde weechat/plugins.conf --- a/weechat/plugins.conf Wed Oct 31 12:43:56 2018 -0400 +++ b/weechat/plugins.conf Wed Nov 07 14:00:23 2018 -0500 @@ -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."