From 90e607b6a3756619c5935396591f0b343a46e773 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Thu, 7 Jan 2021 10:39:53 +0100 Subject: Include Matrix support in WeeChat --- .config/awesome/rc.lua | 20 ++++++++++++-- .local/bin/open | 2 ++ .local/etc/gittab/tabs/weechat | 6 ++-- .ssh/config | 2 +- .ssh/known_hosts | 10 +++++++ .weechat/python/matrix | 1 + .weechat/python/matrix.py | 1 + .weechat/python/signal.py | 1 + .weechat/python/slack.py | 1 + .weechat/python/wee_slack.py | 1 - .weechat/weechat.conf | 62 +++++++++++++++++------------------------- .zshrc | 2 +- 12 files changed, 64 insertions(+), 45 deletions(-) create mode 120000 .weechat/python/matrix create mode 120000 .weechat/python/matrix.py create mode 120000 .weechat/python/signal.py create mode 120000 .weechat/python/slack.py delete mode 120000 .weechat/python/wee_slack.py diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 8eea786..04273c5 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -269,9 +269,9 @@ globalkeys = gears.table.join( {description = "swap with next client by index", group = "client"}), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, {description = "swap with previous client by index", group = "client"}), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative(-1) end, {description = "focus the next screen", group = "screen"}), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative( 1) end, {description = "focus the previous screen", group = "screen"}), --awful.key({ modkey, }, "u", awful.client.urgent.jumpto, -- {description = "jump to urgent client", group = "client"}), @@ -525,7 +525,7 @@ awful.rules.rules = { } }, properties = { - tag = sharedtaglist[5] + tag = sharedtaglist[6] }, }, @@ -537,6 +537,20 @@ awful.rules.rules = { -- Set Firefox to always map on the tag named "2" on screen 1. -- { rule = { class = "Firefox" }, -- properties = { screen = 1, tag = "2" } }, + + -- World of Warcraft + { + rule_any = { + class = { + "wow.exe", + }, + }, + properties = { + tag = sharedtaglist[5], + maximized_vertical = true, + maximized_horizontal = true, + }, + } } -- }}} diff --git a/.local/bin/open b/.local/bin/open index 2de4100..39ef1e5 100755 --- a/.local/bin/open +++ b/.local/bin/open @@ -52,6 +52,8 @@ multi sub cmd (HttpUrl $t where *.hostname.ends-with('zaaksysteem.nl')) { "chrom # Rewrite bad site to good site multi sub cmd (HttpUrl $t is copy where *.hostname eq "twitter.com") { callwith(URL.new(|$t.Hash, hostname => 'nitter.net')) } +multi sub cmd (HttpUrl $t is copy where *.hostname eq "instagram.com") { callwith(URL.new(|$t.Hash, hostname => 'brap.top', path => $t.path.unshift('u'))) } +multi sub cmd (HttpUrl $t is copy where *.hostname eq "www.instagram.com") { callwith(URL.new(|$t.Hash, hostname => 'brap.top', path => $t.path.unshift('u'))) } # All other URLs should be opened with the preferred browser. diff --git a/.local/etc/gittab/tabs/weechat b/.local/etc/gittab/tabs/weechat index 81b80aa..27b21eb 100644 --- a/.local/etc/gittab/tabs/weechat +++ b/.local/etc/gittab/tabs/weechat @@ -1,2 +1,4 @@ -# Local name Remote URL Branch -wee_slack https://github.com/wee-slack/wee-slack master +# Local name Remote URL Branch +protocol-slack https://github.com/wee-slack/wee-slack master +protocol-matrix https://github.com/poljar/weechat-matrix master +protocol-signal https://github.com/thefinn93/signal-weechat master diff --git a/.ssh/config b/.ssh/config index 14c36ba..70c49fa 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,4 +1,4 @@ -IdentityFile ~/.ssh/id_ed25519 +IdentityFile ~/.ssh/id_edephas_ed25519 Host home Hostname home.tyil.nl diff --git a/.ssh/known_hosts b/.ssh/known_hosts index 53535fa..3e93fa9 100644 --- a/.ssh/known_hosts +++ b/.ssh/known_hosts @@ -32,3 +32,13 @@ jerom.dblug.nl,2001:bc8:4700:2500::120b ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTIt jeron.dblug.nl,2a0f:bd00::f816:3eff:fe0d:a231 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHOODTSqLum0QxcGc3RK+F3Zs5w+OmOl4/pykoJvCbXb+IDI5DeDw6BqJdQcRYWzjpQkidZ35t8IY8W/ssyZeDQ= vpn.mintlab.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA7yoT2+lMwOJ/d5qkzIAxIzepAtHL6rhyMaNXmNy0EjTszJQwGuNpJeVq4pDAlekeXlgUZsxamyGbleCIpFdWE= yui.runners.sr.ht,173.195.146.244 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD1/ylT3PlIzgoTlA7VgLYTaYHqWq1svvLbGSg3Mfn//vWRe+QWwv8YR7OYF3wnL0LZVuguq/XVb+2jW9zlewrE= +gemini.circumlunar.space,2604:180:f3::185 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA9QMHYOKwhT4s6263VXuhC5ZZCLjtohfFI6N7k8FOCqhk+nsyxBsfWj6AVSyjW6TkTV6W9nUUW5OtYZe5CiiY4= +84.247.14.141 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA7yoT2+lMwOJ/d5qkzIAxIzepAtHL6rhyMaNXmNy0EjTszJQwGuNpJeVq4pDAlekeXlgUZsxamyGbleCIpFdWE= +2606:4700:90:0:f22e:fbec:5bed:a9b9 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY= +140.82.121.4 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +10.24.100.7 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIvl5ciNlSPt8qW+AB1fYQRvRRdRB4eiO9TB6SBL0oqcwqcI7REBz7cQnRhKTQzEsLSUc08oaxKRibbbqwRVO0= +140.82.118.4 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +140.82.121.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +git.tyil.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIvl5ciNlSPt8qW+AB1fYQRvRRdRB4eiO9TB6SBL0oqcwqcI7REBz7cQnRhKTQzEsLSUc08oaxKRibbbqwRVO0= +home.tyil.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIvl5ciNlSPt8qW+AB1fYQRvRRdRB4eiO9TB6SBL0oqcwqcI7REBz7cQnRhKTQzEsLSUc08oaxKRibbbqwRVO0= +10.20.107.73 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKdPFnVMIVt9S4h7WLKF5JmS2WBA5tWV2uX6VA1w1xRmVeE1vGLt4njgBBxLVjN7ly6isXfgOdMIcP5hE2EvoB4= diff --git a/.weechat/python/matrix b/.weechat/python/matrix new file mode 120000 index 0000000..fcfe38d --- /dev/null +++ b/.weechat/python/matrix @@ -0,0 +1 @@ +../vendor/protocol-matrix/matrix \ No newline at end of file diff --git a/.weechat/python/matrix.py b/.weechat/python/matrix.py new file mode 120000 index 0000000..490a57b --- /dev/null +++ b/.weechat/python/matrix.py @@ -0,0 +1 @@ +../vendor/protocol-matrix/main.py \ No newline at end of file diff --git a/.weechat/python/signal.py b/.weechat/python/signal.py new file mode 120000 index 0000000..3fa05ee --- /dev/null +++ b/.weechat/python/signal.py @@ -0,0 +1 @@ +../vendor/protocol-signal/signal.py \ No newline at end of file diff --git a/.weechat/python/slack.py b/.weechat/python/slack.py new file mode 120000 index 0000000..d92d31f --- /dev/null +++ b/.weechat/python/slack.py @@ -0,0 +1 @@ +../vendor/protocol-slack/wee_slack.py \ No newline at end of file diff --git a/.weechat/python/wee_slack.py b/.weechat/python/wee_slack.py deleted file mode 120000 index 13f5337..0000000 --- a/.weechat/python/wee_slack.py +++ /dev/null @@ -1 +0,0 @@ -../vendor/wee_slack/wee_slack.py \ No newline at end of file diff --git a/.weechat/weechat.conf b/.weechat/weechat.conf index 19c23b8..6a3fafb 100644 --- a/.weechat/weechat.conf +++ b/.weechat/weechat.conf @@ -253,6 +253,7 @@ save_config_on_unload = on [bar] buffers.color_bg = default +buffers.color_bg_inactive = default buffers.color_delim = default buffers.color_fg = default buffers.conditions = "" @@ -267,6 +268,7 @@ buffers.size = 0 buffers.size_max = 20 buffers.type = root buflist.color_bg = default +buflist.color_bg_inactive = default buflist.color_delim = default buflist.color_fg = default buflist.conditions = "" @@ -281,6 +283,7 @@ buflist.size = 0 buflist.size_max = 0 buflist.type = root fset.color_bg = default +fset.color_bg_inactive = default fset.color_delim = cyan fset.color_fg = default fset.conditions = "${buffer.full_name} == fset.fset" @@ -295,6 +298,7 @@ fset.size = 3 fset.size_max = 3 fset.type = window input.color_bg = default +input.color_bg_inactive = default input.color_delim = 8 input.color_fg = 15 input.conditions = "" @@ -309,6 +313,7 @@ input.size = 1 input.size_max = 0 input.type = window nicklist.color_bg = default +nicklist.color_bg_inactive = default nicklist.color_delim = 13 nicklist.color_fg = 2 nicklist.conditions = "nicklist" @@ -323,6 +328,7 @@ nicklist.size = 0 nicklist.size_max = 10 nicklist.type = root ruby-buffers.color_bg = default +ruby-buffers.color_bg_inactive = default ruby-buffers.color_delim = default ruby-buffers.color_fg = default ruby-buffers.conditions = "" @@ -337,6 +343,7 @@ ruby-buffers.size = 0 ruby-buffers.size_max = 20 ruby-buffers.type = root status.color_bg = 8 +status.color_bg_inactive = default status.color_delim = gray status.color_fg = 11 status.conditions = "" @@ -351,6 +358,7 @@ status.size = 1 status.size_max = 0 status.type = window title.color_bg = 8 +title.color_bg_inactive = default title.color_delim = 13 title.color_fg = 6 title.conditions = "" @@ -365,6 +373,7 @@ title.size = 1 title.size_max = 0 title.type = window vi_cmd.color_bg = default +vi_cmd.color_bg_inactive = default vi_cmd.color_delim = default vi_cmd.color_fg = default vi_cmd.conditions = "" @@ -379,6 +388,7 @@ vi_cmd.size = 0 vi_cmd.size_max = 0 vi_cmd.type = root vi_line_numbers.color_bg = default +vi_line_numbers.color_bg_inactive = default vi_line_numbers.color_delim = default vi_line_numbers.color_fg = default vi_line_numbers.conditions = "" @@ -416,17 +426,25 @@ irc.bitlbee.#secretaries = message irc.bitlbee.#supportcenter = message irc.bitlbee.#theladies = message irc.bitlbee.patrick = message +irc.darenet.#computertech = highlight irc.darenet.#DareNET = highlight irc.darenet.#help = message irc.darenet.#nitemare.debug = highlight +irc.freenode.##computertech = highlight +irc.freenode.##eggdrop = highlight irc.freenode.##mahjong = highlight irc.freenode.##t = highlight irc.freenode.#freenode = highlight irc.freenode.#gentoo = highlight irc.freenode.#mageia = highlight irc.freenode.#raku-dev = highlight +irc.freenode.#sqt = message irc.freenode.#zfsonlinux = highlight +irc.oftc.#awesome = highlight irc.rizon.#/g/technology = highlight +irc.technet.#computertech = highlight +irc.technet.#nitemare = highlight +irc.technet.#technet = highlight python.mintlab.slack.com.#bier = all python.mintlab.slack.com.#development = all python.mintlab.slack.com.#devops = all @@ -476,47 +494,11 @@ python.mintlab.slack.com.rudolf = all python.mintlab.slack.com.Slackbot = all python.mintlab.slack.com.wesleys = all python.slack-debug = none -python.slack.mintlab.#bier = all -python.slack.mintlab.#development = all -python.slack.mintlab.#devops = all -python.slack.mintlab.#devops-alerts = all -python.slack.mintlab.#devops-ci = highlight -python.slack.mintlab.#devops-info = all -python.slack.mintlab.#exxellence = all -python.slack.mintlab.#exxellence-intro = all -python.slack.mintlab.#general = all -python.slack.mintlab.#livingroom = all -python.slack.mintlab.#quality_assurance = all -python.slack.mintlab.#release = all -python.slack.mintlab.#secretaries = all -python.slack.mintlab.#supportcenter = all -python.slack.mintlab.&devops-security = all -python.slack.mintlab.&devops-team = all -python.slack.mintlab.&devopsbff = all -python.slack.mintlab.&meems = all -python.slack.mintlab.&patricia = all -python.slack.mintlab.&platform = all -python.slack.mintlab.&storytellers = all -python.slack.mintlab.&theladies = all -python.slack.mintlab.Barnie = all +python.slack.mintlab.#zaaksysteem-commits = highlight python.slack.mintlab.Barnie,Flippy = all -python.slack.mintlab.blessy = all -python.slack.mintlab.Dennis = all -python.slack.mintlab.Flippy = all -python.slack.mintlab.GoogleCalendar = all -python.slack.mintlab.jascha = all -python.slack.mintlab.jos = all python.slack.mintlab.Karly = all -python.slack.mintlab.Laurens = all python.slack.mintlab.marcel = all python.slack.mintlab.marco = all -python.slack.mintlab.Martijn = all -python.slack.mintlab.MichelleVeltman = all -python.slack.mintlab.michiel = all -python.slack.mintlab.Remco = all -python.slack.mintlab.rudolf = all -python.slack.mintlab.Slackbot = all -python.slack.mintlab.wesleys = all [filter] irc_smart = on;*;irc_smart_filter;* @@ -572,6 +554,10 @@ darenet.brandon = on;irc.darenet.*;nick_brandon;* perl.mst = on;irc.perl.*;nick_mst;* freenode.mst = on;irc.freenode.*;nick_mst;* bitlbee.disroot.marmulak = on;irc.bitlbee.#disroot;nick_marmulak;* +rizon.brandon = on;irc.rizon.*;nick_brandon;* +rizon.karma = on;irc.rizon.*;nick_karma;* +rizon.gb.welcome = on;irc.rizon.#ComputerTech;*;Welcome to #computertech +rizon.karma.trigger = on;irc.rizon.#ComputerTech;*;\!jizz [key] ctrl-? = "/input delete_previous_char" @@ -634,6 +620,7 @@ meta-9 = "/buffer *9" meta-< = "/input jump_previously_visited_buffer" meta-= = "/filter toggle" meta-> = "/input jump_next_visited_buffer" +meta-B = "/buflist toggle" meta-OA = "/input history_global_previous" meta-OB = "/input history_global_next" meta-OC = "/input move_next_word" @@ -863,6 +850,7 @@ meta2-D = "/cursor move left" @chat(python.*):M = "hsignal:slack_cursor_message" @chat(python.*):R = "hsignal:slack_cursor_reply" @chat(python.*):T = "hsignal:slack_cursor_thread" +@chat(python.matrix.*):r = "hsignal:matrix_cursor_reply" @item(buffer_nicklist):K = "/window ${_window_number};/kickban ${nick}" @item(buffer_nicklist):b = "/window ${_window_number};/ban ${nick}" @item(buffer_nicklist):k = "/window ${_window_number};/kick ${nick}" diff --git a/.zshrc b/.zshrc index 1242aea..3ab08d5 100644 --- a/.zshrc +++ b/.zshrc @@ -90,7 +90,7 @@ function precmd() # {{{ EXITCODE=$(printf "%03i" "$?") # set window title - echo -en "\e]2;`whoami`@`hostname`:`pwd`\a" + echo -en "\e]2;`whoami`@`hostname -f`:`pwd`\a" # git info {{{ if git rev-parse --is-inside-work-tree &> /dev/null -- cgit v1.1