# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1534011258 0
# Node ID 291b07317431f3c964e7de9f8d045ce131c1a877
# Parent  f14a899254c7d12358ec598d5ba3f6962f868bac# Parent  d95b0a82e74ee8c9f4f51ffa0bca55310b11d615
Merge.

diff -r d95b0a82e74e -r 291b07317431 bin/pastebin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/pastebin	Sat Aug 11 18:14:18 2018 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+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`')
+
+echo -n "http://paste.stevelosh.com/$PASTE_SHA" | pbcopy
+echo -n 'Copied '
+tput bold
+pbpaste
+tput sgr0
+echo ' to the clipboard.'
diff -r d95b0a82e74e -r 291b07317431 bin/pb
--- a/bin/pb	Wed Aug 08 14:53:06 2018 +0000
+++ b/bin/pb	Sat Aug 11 18:14:18 2018 +0000
@@ -1,10 +1,1 @@
-#!/usr/bin/env bash
-
-set -e
-
-curl -F 'sprunge=<-' http://paste.stevelosh.com | tr -d '\n' | sed -e 's_sprunge-stevelosh.herokuapp.com_http://paste.stevelosh.com_' | pbcopy
-echo
-curl -s "`pbpaste`"
-tput bold
-echo ""
-echo "Copied URL `pbpaste` to clipboard"
+pastebin
\ No newline at end of file
diff -r d95b0a82e74e -r 291b07317431 bin/pbcopy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/pbcopy	Sat Aug 11 18:14:18 2018 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+xclip -selection clipboard -i
diff -r d95b0a82e74e -r 291b07317431 bin/pbpaste
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/pbpaste	Sat Aug 11 18:14:18 2018 +0000
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+xclip -selection clipboard -o
diff -r d95b0a82e74e -r 291b07317431 weechat/plugins.conf
--- a/weechat/plugins.conf	Wed Aug 08 14:53:06 2018 +0000
+++ b/weechat/plugins.conf	Sat Aug 11 18:14:18 2018 +0000
@@ -76,7 +76,6 @@
 python.slack.debug_level = "3"
 python.slack.debug_mode = "false"
 python.slack.distracting_channels = ""
-python.slack.external_user_suffix = "*"
 python.slack.group_name_prefix = "&"
 python.slack.map_underline_to = "_"
 python.slack.migrated = "true"
@@ -86,7 +85,6 @@
 python.slack.render_italic_as = "italic"
 python.slack.send_typing_notice = "false"
 python.slack.server_aliases = ""
-python.slack.shared_name_prefix = "%"
 python.slack.short_buffer_names = "false"
 python.slack.show_reaction_nicks = "false"
 python.slack.slack_api_token = "${sec.data.slack_token}"
@@ -119,7 +117,6 @@
 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."
 python.slack.distracting_channels = "List of channels to hide."
-python.slack.external_user_suffix = "The suffix appended to nicks to indicate external users."
 python.slack.group_name_prefix = "The prefix of buffer names for groups (private channels)."
 python.slack.map_underline_to = "When sending underlined text to slack, use this formatting character for it. The default ("_") sends it as italics. Use "*" to send bold instead."
 python.slack.never_away = "Poke Slack every five minutes so that it never marks you "away"."
@@ -128,7 +125,6 @@
 python.slack.render_italic_as = "When receiving bold text from Slack, render it as this in weechat. If your terminal lacks italic support, consider using "underline" instead."
 python.slack.send_typing_notice = "Alert Slack users when you are typing a message in the input bar (Requires reload)"
 python.slack.server_aliases = "A comma separated list of `subdomain:alias` pairs. The alias will be used instead of the actual name of the slack (in buffer names, logging, etc). E.g `work:no_fun_allowed` would make your work slack show up as `no_fun_allowed` rather than `work.slack.com`."
-python.slack.shared_name_prefix = "The prefix of buffer names for shared channels."
 python.slack.short_buffer_names = "Use `foo.#channel` rather than `foo.slack.com.#channel` as the internal name for Slack buffers. Overrides server_aliases."
 python.slack.show_reaction_nicks = "Display the name of the reacting user(s) alongside each reactji."
 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."