same_nick_middle, git aliases

3 files changed, 12 insertions, 8 deletions

diff --git a/git/.gitconfig b/git/.gitconfig
index fedb489..5f218e0 100755
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -30,5 +30,9 @@
 	lol = log --oneline --graph --decorate --all
 	joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1
 	dad = !curl https://icanhazdadjoke.com
+	staged = diff --staged
+	ap = add --patch
+	local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD
+	upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
 [rerere]
 	enabled = true
diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index a3fc568..f2c9142 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 = "#meta,#chaos,#opers,#secret-sudoers,#team,#sudoers,#yourtilde,#bots,#music,#politics,#gopher,#tildeverse,#idlerpg,#tilderadio,#minecraft,#tildelinux,#slbr,#cosmic,#institute,#.tilde,#tildetel,#dcss,#center,#thunix,#theasylum,#minetest,#aussie,#uucp,#projects,#hamradio,#vim,#black,#pink,#modded,#admin,#vh7,#cervezafria,#~,#netnews :10:20,:57:60"
+tilde.autojoin = "#chaos,#meta,#opers,#secret-sudoers,#team,#sudoers,#yourtilde,#music,#politics,#gopher,#tildeverse,#idlerpg,#tilderadio,#minecraft,#tildelinux,#slbr,#cosmic,#institute,#.tilde,#tildetel,#dcss,#center,#thunix,#theasylum,#minetest,#aussie,#uucp,#projects,#hamradio,#vim,#black,#pink,#modded,#vh7,#cervezafria,#~,#netnews,#admin,#bots,#ctrl-c,#bitbot,#radiofreqs :57:60,:10:20"
 tilde.autorejoin
 tilde.autorejoin_delay
 tilde.connection_timeout
@@ -222,7 +222,7 @@ hashbang.local_hostname
 hashbang.usermode
 hashbang.command = "/oper benharri x"
 hashbang.command_delay
-hashbang.autojoin = "#!,#!social,#!os,#!politics,#!support,#!git,#!opers"
+hashbang.autojoin = "#!opers,#!git,#!support,#!politics,#!os,#!social,#!"
 hashbang.autorejoin
 hashbang.autorejoin_delay
 hashbang.connection_timeout
@@ -263,7 +263,7 @@ town.local_hostname
 town.usermode
 town.command
 town.command_delay
-town.autojoin = "#tildetown,#bots,#dumpsterfire,#tildemush,#counting,#movienight,#counting-meta,#heavy,#quiet,#counting-anarchy,#soup,#alc,#queer"
+town.autojoin = "#tildetown,#bots,#dumpsterfire,#tildemush,#counting,#movienight,#counting-meta,#heavy,#quiet,#counting-anarchy,#soup,#alc,#queer,#math"
 town.autorejoin
 town.autorejoin_delay
 town.connection_timeout
@@ -427,7 +427,7 @@ oftc.local_hostname
 oftc.usermode
 oftc.command
 oftc.command_delay
-oftc.autojoin = "#fish,#debian-devel"
+oftc.autojoin = "#debian-devel,#fish"
 oftc.autorejoin
 oftc.autorejoin_delay
 oftc.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 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,#disroot,#thelounge,#tilde.team-offtopic 6:10"
 freenode.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout
@@ -550,7 +550,7 @@ inspircd.local_hostname
 inspircd.usermode
 inspircd.command
 inspircd.command_delay
-inspircd.autojoin = "#inspircd.dev,#inspircd 10,10"
+inspircd.autojoin = "#inspircd,#inspircd.dev 10"
 inspircd.autorejoin
 inspircd.autorejoin_delay
 inspircd.connection_timeout
@@ -632,7 +632,7 @@ bitlbee.local_hostname
 bitlbee.usermode
 bitlbee.command
 bitlbee.command_delay
-bitlbee.autojoin = "&bitlbee,#tilde.zone_@ben"
+bitlbee.autojoin = "&bitlbee,#tilde.zone_ben"
 bitlbee.autorejoin
 bitlbee.autorejoin_delay
 bitlbee.connection_timeout
diff --git a/weechat/.weechat/weechat.conf b/weechat/.weechat/weechat.conf
index 01c8cda..123ca8f 100644
--- a/weechat/.weechat/weechat.conf
+++ b/weechat/.weechat/weechat.conf
@@ -112,7 +112,7 @@ prefix_join = "-->"
 prefix_network = "--"
 prefix_quit = "<--"
 prefix_same_nick = "⤷"
-prefix_same_nick_middle = ""
+prefix_same_nick_middle = "|"
 prefix_suffix = "│"
 quote_nick_prefix = "<"
 quote_nick_suffix = ">"