From 6744462d008057e40644a8bbb7902f0909298511 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Wed, 14 Aug 2019 10:10:21 -0400 Subject: [PATCH] pull remote changes when running make --- Makefile | 4 +- weechat/.weechat/irc.conf | 86 +---------------------------------- weechat/.weechat/trigger.conf | 8 ++++ weechat/.weechat/weechat.conf | 4 +- 4 files changed, 14 insertions(+), 88 deletions(-) diff --git a/Makefile b/Makefile index 08370b0..c62bcb8 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ fish: fzf: fish @printf "$(YELLOW)--- fzf ------------------------------------------------\n$(RESET)" - git submodule update --init -- fzf/.fzf + git submodule update --remote --init -- fzf/.fzf stow -t "$$HOME" fzf ~/.fzf/install --no-bash --no-zsh --no-completion --no-update-rc --key-bindings --64 @@ -84,7 +84,7 @@ vim: @printf "$(YELLOW)--- vim ------------------------------------------------\n$(RESET)" mkdir -p ~/.vim/{undodir,swap,backup} chmod 700 ~/.vim/{undodir,swap,backup} - git submodule update --init -- vim/.vim/bundle + git submodule update --remote --init -- vim/.vim/bundle stow -t "$$HOME" vim vscode: diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf index ed00b2d..6ca7d15 100644 --- a/weechat/.weechat/irc.conf +++ b/weechat/.weechat/irc.conf @@ -181,7 +181,7 @@ tilde.local_hostname tilde.usermode tilde.command = "/oper root ${sec.data.tildenetoper}; /msg operserv login ${sec.data.pass}" tilde.command_delay -tilde.autojoin = "#chaos,#meta,#opers,#secret-sudoers,#team,#sudoers,#YourTilde,#music,#politics,#gopher,#tildeverse,#idlerpg,#tilderadio,#minecraft,#tildelinux,#cosmic,#institute,#.tilde,#tildetel,#center,#thunix,#theasylum,#minetest,#aussie,#uucp,#projects,#hamradio,#vim,#black,#pink,#vh7,#~,#netnews,#admin,#bots,#ctrl-c,#bitbot,#radiofreqs,#brains,#envs,#town :57:60,:10:20" +tilde.autojoin = "#chaos,#meta,#opers,#secret-sudoers,#team,#sudoers,#yourtilde,#music,#politics,#gopher,#tildeverse,#idlerpg,#tilderadio,#minecraft,#tildelinux,#cosmic,#institute,#.tilde,#tildetel,#thunix,#theasylum,#minetest,#aussie,#uucp,#projects,#hamradio,#vim,#black,#pink,#~,#netnews,#admin,#bots,#ctrl-c,#bitbot,#radiofreqs,#brains,#envs,#rfcs,#best :57:60,:10:20" tilde.autorejoin tilde.autorejoin_delay tilde.connection_timeout @@ -468,7 +468,7 @@ freenode.local_hostname freenode.usermode freenode.command freenode.command_delay -freenode.autojoin = "#weechat,##oodnet,#lobsters,#lobsters-boil,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#oragono,#weechat-android,#git,#tilde.team,#sr.ht,#cmpwn,#gopherproject,#bitreich-en,#bitbot,#bitreich-de,#ircv3,#gophernicus,##jan6,##ircv3-offtopic,#disroot,#thelounge,#ovh,#elixir-lang,#ascii.town,#sonarr,#systemd,#python,#lxcontainers 6:10" +freenode.autojoin = "#weechat,##oodnet,#lobsters,#lobsters-boil,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#oragono,#weechat-android,#git,#tilde.team,#sr.ht,#cmpwn,#gopherproject,#bitreich-en,#bitbot,#bitreich-de,#ircv3,#gophernicus,##jan6,##ircv3-offtopic,#ovh,#elixir-lang,#ascii.town,#sonarr,#lxcontainers 6:10" freenode.autorejoin freenode.autorejoin_delay freenode.connection_timeout @@ -686,88 +686,6 @@ red.msg_part red.msg_quit red.notify red.split_msg_max_length -darenet.addresses = "irc.darenet.org/6697" -darenet.proxy -darenet.ipv6 -darenet.ssl = on -darenet.ssl_cert -darenet.ssl_priorities -darenet.ssl_dhkey_size -darenet.ssl_fingerprint -darenet.ssl_verify -darenet.password -darenet.capabilities -darenet.sasl_mechanism -darenet.sasl_username = "benharri" -darenet.sasl_password = "${sec.data.pass}" -darenet.sasl_key -darenet.sasl_timeout -darenet.sasl_fail -darenet.autoconnect -darenet.autoreconnect -darenet.autoreconnect_delay -darenet.nicks -darenet.nicks_alternate -darenet.username -darenet.realname -darenet.local_hostname -darenet.usermode -darenet.command -darenet.command_delay -darenet.autojoin = "#DareNET,#chat" -darenet.autorejoin -darenet.autorejoin_delay -darenet.connection_timeout -darenet.anti_flood_prio_high -darenet.anti_flood_prio_low -darenet.away_check -darenet.away_check_max_nicks -darenet.msg_kick -darenet.msg_part -darenet.msg_quit -darenet.notify -darenet.split_msg_max_length -irc.com.addresses = "irc.irc.com/6697" -irc.com.proxy -irc.com.ipv6 -irc.com.ssl = on -irc.com.ssl_cert -irc.com.ssl_priorities -irc.com.ssl_dhkey_size -irc.com.ssl_fingerprint -irc.com.ssl_verify -irc.com.password -irc.com.capabilities -irc.com.sasl_mechanism -irc.com.sasl_username = "benharri" -irc.com.sasl_password = "${sec.data.pass}" -irc.com.sasl_key -irc.com.sasl_timeout -irc.com.sasl_fail -irc.com.autoconnect -irc.com.autoreconnect -irc.com.autoreconnect_delay -irc.com.nicks = "benharri,bhh" -irc.com.nicks_alternate -irc.com.username -irc.com.realname -irc.com.local_hostname -irc.com.usermode -irc.com.command -irc.com.command_delay -irc.com.autojoin = "#atheism,#sysadmin,#programming,#beer" -irc.com.autorejoin -irc.com.autorejoin_delay -irc.com.connection_timeout -irc.com.anti_flood_prio_high -irc.com.anti_flood_prio_low -irc.com.away_check -irc.com.away_check_max_nicks -irc.com.msg_kick -irc.com.msg_part -irc.com.msg_quit -irc.com.notify -irc.com.split_msg_max_length ascii.addresses = "ascii.town/6697" ascii.proxy ascii.ipv6 diff --git a/weechat/.weechat/trigger.conf b/weechat/.weechat/trigger.conf index 6e0796e..7c441d0 100644 --- a/weechat/.weechat/trigger.conf +++ b/weechat/.weechat/trigger.conf @@ -33,6 +33,14 @@ beep.hook = print beep.post_action = none beep.regex = "" beep.return_code = ok +chansaver.arguments = "buffer_closed;buffer_opened" +chansaver.command = "/mute /autojoin --run;/mute /save" +chansaver.conditions = "" +chansaver.enabled = on +chansaver.hook = signal +chansaver.post_action = none +chansaver.regex = "" +chansaver.return_code = ok cmd_pass.arguments = "5000|input_text_display;5000|history_add;5000|irc_command_auth" cmd_pass.command = "" cmd_pass.conditions = "" diff --git a/weechat/.weechat/weechat.conf b/weechat/.weechat/weechat.conf index 123ca8f..124682c 100644 --- a/weechat/.weechat/weechat.conf +++ b/weechat/.weechat/weechat.conf @@ -111,8 +111,8 @@ prefix_error = "=!=" prefix_join = "-->" prefix_network = "--" prefix_quit = "<--" -prefix_same_nick = "⤷" -prefix_same_nick_middle = "|" +prefix_same_nick = "└─" +prefix_same_nick_middle = "├─" prefix_suffix = "│" quote_nick_prefix = "<" quote_nick_suffix = ">"