updateHEADmain

1 files changed, 77 insertions, 52 deletions

diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme
index b3b1f09..b3c9d72 100644
--- a/irssi/solarized-powerline.theme
+++ b/irssi/solarized-powerline.theme
@@ -61,7 +61,7 @@ info_eol = "false";
 
 # these characters are automatically replaced with specified color
 # (dark grey by default)
-replaces = { "[]=" = "$*"; };
+replaces = { "[]=" = "%Z0087ff$*%n"; };
 
 abstracts = {
   ##
@@ -144,7 +144,7 @@ abstracts = {
   ##
 
   # the basic styling of how to print message, $0 = nick mode, $1 = nick
-  msgnick = "%m%Zeeeeee$0{nick $1-}%N%m%0%Z005f5f";
+  msgnick = "%Z005f00%Zeeeeee{nick $0$1-}%N%Z005f00%0%Z005f5f";
 
   # message from you is printed. "msgownnick" specifies the styling of the
   # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
@@ -164,21 +164,24 @@ abstracts = {
 
   # $0 = nick mode, $1 = nick
   # %3 = yellow
-  ownmsgnick = "%z5f5fff%k{%z5f5fff $0$1-}%N%0%Z5f5fff %Z005f5f";
+  # ownmsgnick = "%z5f5fff%k{%z5f5fff $0$1-}%N%0%Z5f5fff %Z005f5f";
+  ownmsgnick = "%z005f5f%k%Zeeeeee%k$chatnet%Z005f5f%z5f8787%k$C%z5f5fff%Z5f8787%Zeeeeee%9{%Zeeeeee%z5f5fffmsgnick $0$1-}%N%Z5f5fff%z5f8787%Z5f8787%z005f5f%Z005f5f%0%N %Z005f5f";
   ownnick = "%Zeeeeee$* %Z005f5f";
 
   # public message in channel, $0 = nick mode, $1 = nick
-  pubmsgnick = "%z005f87%k%Zeeeeee{%Zeeeeee%z005f87msgnick $0$1-}%N%Z005f87 %Z005f5f";
+  pubmsgnick = "%z005f5f%k%Zeeeeee%k$chatnet%Z005f5f%z5f8787%k$C%z005f87%Z5f8787%Zeeeeee{%Zeeeeee%z005f87msgnick $0$1-}%N%Z005f87%z5f8787%Z5f8787%z005f5f%Z005f5f%0%N %Z005f5f";
   pubnick = "%Zeeeeee$* %Z005f5f";
 
   # public message in channel meant for me, $0 = nick mode, $1 = nick
   # %5 = magenta
-  pubmsgmenick = "%m%5%k{msgnick $0$1-}%N%m %Z005f5f";
+  # pubmsgmenick = "%Z005f00%z005f00%k$chatnet$C{msgnick $0$1-}%N%Z005f00 %Z005f5f";
+  pubmsgmenick = "%z005f5f%k%Zeeeeee%k$chatnet%Z005f5f%z5f8787%k$C%z005f00%Z5f8787%Zeeeeee%9$0$1%Z005f00%z5f8787%N%Z5f8787%z005f5f%Z005f5f%0%N %Z005f5f";
   menick = "%Zeeeeee$* %Z005f5f";
 
   # public highlighted message in channel
   # $0 = highlight color, $1 = nick mode, $2 = nick
-  pubmsghinick = " %z005f87%k%z005f87{%Zeeeeee%z005f87msgnick $1 %Zeeeeee$2-}%N%Z005f87 %Z005f5f";
+  # pubmsghinick = " %z005f87%k%z005f87$chatnet/$C/{%Zeeeeee%z005f87msgnick$1 %Zeeeeee$2-}%N%Z005f87 %Z005f5f";
+  pubmsghinick = " %z005f5f%k%Zeeeeee%k$chatnet%Z005f5f%z5f8787%k$C%z005f87%Z5f8787%Zeeeeee{%Zeeeeee%z005f87msgnick $0$1 %Zeeeeee$2-}%N%Z005f87%z5f8787%Z5f8787%z005f5f%Z005f5f%0%N %Z005f5f";
 
   # channel name is printed with message
   # This is printed whenever the channel name is printed for disambiguation, e.g.
@@ -187,7 +190,7 @@ abstracts = {
 
   # private message, $0 = nick, $1 = host
   # TODO: To test for Solarized
-  privmsg = " %m$0%G<%n$1-%G>%n %Z005f87";
+  privmsg = " %Z005f00$0%G<%n$1-%G>%n %Z005f87";
 
   # private message from you, $0 = "msg", $1 = target nick
   # TODO: To test for Solarized
@@ -207,13 +210,13 @@ abstracts = {
   ##
 
   # used internally by this theme
-  action_core = "%N%k %n$*";
+  action_core = "%N%k%z5f8787 %9$*%Z5f8787";
 
   # generic one that's used by most actions
   action = "{action_core $*%n} ";
 
   # own action, both private/public
-  ownaction = "%N%k {mynick $0}%N%C $1-";
+  ownaction = "%N%k%z5f8787 %9{mynick $0}%N%Z5f8787%N$1-";
 
   # own action with target, both private/public
   # NOTE: to test: /action NICK farted.  (This will tell NICK that you farted)
@@ -222,11 +225,11 @@ abstracts = {
 
   # private action sent by others
   # %M = brightmagenta (Solarized: violet)
-  pvtaction = "%m (*) $*%n ";
+  pvtaction = "%Z5f875f (*) $*%N ";
   pvtaction_query = "{action $*}";
 
   # public action sent by others
-  pubaction = "%N%k {nick $0}%N $1-";
+  pubaction = "%N%Z5f875f {nick $0}%N%Z5f875f $1-";
 
 
   ##
@@ -234,25 +237,26 @@ abstracts = {
   ##
 
   # whois
-  whois = "%k%z005f87WHOIS %0%Z005f87%N%#%N $[8]0  %Y$1-";
+  whois = "%k%z005f87WHOIS %0%Z005f87%N%#%N $[8]0  %Y$1-";
 
   # notices
-  ownnotice = "%z8787ff%k %k$0 %k%z8787ff%8%0 {ichannelhilight $1-} %k%z00af5f%N ";
-  notice = "%z5f5fd7%k %k$0- %Z5f5fd7%0%N ";
-  #notice = "%1%w %W$* %k%8%n ";
-  pubnotice_channel = "{ichannelhighlight $*}";
-  #pubnotice_channel = "%G%n$*";
-  pvtnotice_host = " %k%n {hickhost $*}";
-  servernotice = "%z8787ff%k %k!$* %k%8%n ";
+  ownnotice = "%z5f87af%k %k$0 %k%z5f87af%8%0%9 {ichannelhilight $1-} %k%Z00af5f ";
+  notice = "%z5f87af%k %k$0- %Z5f87af%0%N ";
+  # notice = "%1%w %W$* %k%8%n ";
+  # pubnotice_channel = "{ichannelhighlight $*}";
+  pubnotice_channel = "%G%n$*";
+  # the typo is intentional
+  pvtnotice_host = " %k%n %9{hickhost $*} ";
+  servernotice = "%z5f87af%k %9%k!$* %k%8%n ";
 
   # CTCPs
   ownctcp = "%k%z005f87 %k$0%G %N%Z005f87 %Z005f87$1-%G  ";
-  ctcp = "%N%k%n %Zeeeeee$*%n";
+  ctcp = "%N%k%z5f5f00%Z5f5f00%0%n %Zeeeeee$*%z5f5f00%k%Z5f5f00%0%n";
 
   # wallops
-  wallop = "%c$*%n: ";
-  wallop_nick = "%n$*";
-  wallop_action = "%c * $*%n ";
+  wallop = "%k%4%9 $*%0%b%N ";
+  wallop_nick = "%z00afff%b%9%k$* %4%Z00afff ";
+  wallop_action = "%Z005f00%Z00afff * $*%N ";
 
   # netsplits
   netsplit = "%z5f5fd7$*%n";
@@ -272,7 +276,7 @@ abstracts = {
   dccfile = "$*";
 
   # DCC chat, own msg/action
-  dccownmsg = "[%Z005f87$0%G($1-%G)%n] ";
+  dccownmsg = "[[%Z005f87$0%G($1-%G)%n]] ";
   dccownnick = "%Z005f87$*%n";
   dccownquerynick = "%c$*%n";
   dccownaction = "{action $*}";
@@ -329,7 +333,7 @@ abstracts = {
   # This controls each part of a statusbar, including the outer brackets of adv_windowlist
   sb = "$*";
   # The mode is next to your NICK and the channel
-  sbmode = "%p$*%k";
+  sbmode = "%Z5f5fff$*%k";
   sbaway = "%Z00af00%k%z00af00 zZzZzZzZ %Z00af00%0";
   sbservertag = "%Z00af00 $0 %Z005f87(change with ^X)%n";
   sbnickmode = "%Zeeeeee$0";
@@ -338,7 +342,8 @@ abstracts = {
 
   # ',' separator between the window numbers
   # %g = green (same color as the active statusbar so we dont' see it)
-  sb_act_sep = "%Z005fff+";
+  sb_act_sep = "%Z005fff%9/";
+  # sb_act_sep = "%Z005f00";
   # normal text
   # This also affects the color of the window with activity in adv_windowlist
   sb_act_text = "%C$*";
@@ -346,12 +351,12 @@ abstracts = {
   sb_act_msg = "%c$*";
   # hilight (when people actually chat)
   # This also affects the color of the window with direct message in adv_windowlist
-  sb_act_hilight = "%m$*";
+  sb_act_hilight = "%N%Z5f5fff%9$*%N";
   # hilight with specified color, $0 = color, $1 = text
-  sb_act_hilight_color = "%z5f5fd7$1-";
+  sb_act_hilight_color = "%N$0$1-%N";
 
   # For usercount.pl script
-  sb_usercount = "%Z000000%z005faf%Z000000%z005faf{sb $0 nicks %Zeeeeee %Z000000$1-%Z005faf%z000000}";
+  sb_usercount = "%Z000000%z005faf%Z000000%z005faf{sb $0 nicks %Zeeeeee %Z000000$1-%Z005faf%z000000}%N";
   sb_uc_ircops = "%Z000000%z005faf*$*";
   sb_uc_ops = "%Z000000%z005faf@$*";
   sb_uc_halfops = "%Z000000%z005faf%%$*";
@@ -399,11 +404,17 @@ abstracts = {
 };
 
 formats = {
+  "fe-text" = {
+    lastlog_start = "%Zaf5f5f%zaf5f5f%k%9Lastlog%9%Zaf5f5f%0";
+    lastlog_end = "%Zaf5f5f%0%zaf5f5f%k%9Lastlog%9%0%Zaf5f5f";
+    lastlog_separator = "%Zaf5f5f%zaf5f5f%k%Zaf5f5f%0";
+    lastlog_date = "%g<<%%F>> ";
+  };
   "fe-common/core" = {
-    daychange = "           %g-----%k-%W-%n Day changed to %%D %W-%k-%g-----%n";
+    daychange = "           %Zd7ff5f%0%zd7ff5f%k%Zd7ff5f%0%k%zd7ff5f %9 Day changed to %%D %9 %Zd7ff5f%0%zd7ff5f%k%Zd7ff5f%0";
     join = "%k%z00af5fJOIN %8 {ichannelhilight $2} %0%Z00d700%0 {inick $0}%0 %N {chanhost_hilight $1}";
-    line_start_irssi = "%k%z5f5fd7IRSSI%N%Z5f5fd7 %N";
-    new_topic = "%k%z00d700TOPIC %8 {ichannelhilight $1} %wby {inick $0} %N%9%Z5f5fd7  $2";
+    line_start_irssi = "%k%z5f5fd7IRSSI%N%Z5f5fd7 %N";
+    new_topic = "%k%z00afffTOPIC %8 {ichannelhilight $1} %wby {inick $0} %N%9%Z5f5fd7  $2";
     nick_changed = "%k%z00d700RENAME %Z00d700%0 %k%z005f87{nick $0} %Zff8700 {nick $1}%Z005f87%0%N";
     part = "%K%Z00d700%k%z00d700PART %8 {ichannelhilight $2}%N %0%Z005f87 %N{inick $0}%0 %Z005f87%Zeeeeee {reason $3}";
     quit = "%0%Z005f00%k%z005f00QUIT %N {inick $0}%0 %Zeeeeee %N%n%k%N {reason $2}";
@@ -411,19 +422,29 @@ formats = {
     own_msg = "$nickcolor$nickalign{ownmsgnick $2 {ownnick $[.15]0}}$1";
     own_msg_channel = "$nickcolor$nickalign{ownmsgnick $3 {ownnick $[.15]0}{msgchannel $1}}$2";
     own_msg_private_query = "$nickcolor$nickalign{ownprivmsgnick {ownprivnick $2}}$1";
-    pubmsg_me = "$nickalign{pubmsgmenick $2 {menick $[.12]0}}$1";
-    pubmsg_me_channel = "$nickalign{pubmsgmenick $3 {menick $[.12]0}{msgchannel $1}}$2";
-    pubmsg_hilight = "$nickalign{pubmsghinick $0 $3 $[.12]1}$2";
-    pubmsg_hilight_channel = "$nickalign{pubmsghinick $0 $4 $[.12]1{msgchannel $2}}$3";
-    pubmsg = "$nickcolor$nickalign{pubmsgnick $2 {pubnick $[.12]0}}$1";
-    pubmsg_channel = "$nickcolor$nickalign{pubmsgnick $3 {pubnick $[.12]0}{msgchannel $1}}$2";
+    pubmsg_me = "$nickalign{pubmsgmenick $2 {menick $[.15]0}}$1";
+    pubmsg_me_channel = "$nickalign{pubmsgmenick $3 {menick $[.15]0}{msgchannel $1}}$2";
+    pubmsg_hilight = "$nickalign{pubmsghinick $0 $3 $[.15]1}$2";
+    pubmsg_hilight_channel = "$nickalign{pubmsghinick $0 $4 $[.15]1{msgchannel $2}}$3";
+    pubmsg = "$nickcolor$nickalign{pubmsgnick $2 {pubnick $[.15]0}}$1";
+    pubmsg_channel = "$nickcolor$nickalign{pubmsgnick $3 {pubnick $[.15]0}{msgchannel $1}}$2";
     msg_private_query = "$nickcolor$nickalign{privmsgnick $0}$2";
+    servertag = "%k%z008787%9$0%0%Z008787%N ";
+    tls_ephemeral_key = "EDH Key:%Z5f87ff {hilight $0} bit {hilight $1}";
+    tls_ephemeral_key_unavailable = "EDH Key: %Z5f87ff{error N/A}";
+    tls_pubkey = "Public Key: %Z5f87ff{hilight $0} bit {hilight $1}, valid from {hilight $2} to {hilight $3}";
+    tls_cert_header = "Certificate Chain:";
+    tls_cert_subject = "  Subject: %Z5f87ff{hilight $0}";
+    tls_cert_issuer = "  Issuer: %Z5f87ff {hilight $0}";
+    tls_pubkey_fingerprint = "Public Key Fingerprint: %Z5f87ff {hilight $0} ({hilight $1})";
+    tls_cert_fingerprint = "Certificate Fingerprint: %Z5f87ff{hilight $0} ({hilight $1})";
+    tls_protocol_version = "Protocol: %Z5f87ff{hilight $0} ({hilight $1} bit, {hilight $2})";
   };
   "fe-common/irc" = {
     away = "%k%z00d700AWAY %Z00d700%0%N";
     banlist = "%k%z005f00BANS %z005f00 $[-3]0 %8 %z005f00{ichannelhilight $1} %k%N {ban $2}";
     banlist_long = "%k%z005f00BANS %z005f00 $[-3]0 %8 %z005f00{ichannelhilight $1} {comment by {inick $3}%0%k,%Z005f00 $4 secs ago} %N {ban $2}";
-    chanmode_change = "%k%z008700MODE %N%Z008700%N {channelhilight $0} %Zeeeeee%n {mode $1}%n by {nick $2}";
+    chanmode_change = "%k%z00af87MODE %N%Z00af87%N {channelhilight $0} %Zeeeeee%n {mode $1}%n by {nick $2}";
     channel_created = "%k%N Channel {channelhilight $0} created $1";
     channel_mode = "%k%N mode/{channelhilight $0} {mode $1}";
     ctcp_default_reply = "%W%0%N $0- ";
@@ -435,27 +456,30 @@ formats = {
     default_event_server = "%k%z00d700$0 %N%k %N%n$1";
     ebanlist = "%k%z005f00BANS %k exception %8 %z005f00{ichannelhilight $0} %N {ban $1}";
     ebanlist_long = "%k%z005f00BANS %k exception %8 {ichannelhilight $0} %z005f00{comment by {inick $2}%0%k, $3 secs ago} %N {ban $1}";
-    end_of_who = "%z00d700%kWHO %Z00d700%0%N END";
-    end_of_whois = "%z00d700%kWHOIS %Z00d700%0%N END";
-    end_of_whowas = "%z00d700%kWHOWAS %Z00d700%0%N END";
+    end_of_who = "%z00d700%kWHO %Z00d700%0%N END";
+    end_of_whois = "%z00d700%kWHOIS %Z00d700%0%N END";
+    end_of_whowas = "%z00d700%kWHOWAS %Z00d700%0%N END";
     netsplit = "%0%Z8787ff%z8787ff%k NETSPLIT %z8787ff%Z00af00%z00af00%k {iserver $0}  {iserver $1} %Z00af00%0%Z8787ff Quits: $2";
     netsplit_join = "%k%z8787ff NETSPLIT %k%8%N Joins: $0";
     netsplit_join_more = "%k%z8787ff NETSPLIT %k%8%N Joins: $0 (+$1 more)";
     netsplit_more = "%0%Z8787ff%z8787ff%k NETSPLIT %z8787ff%Z00af00%z00af00%k {iserver $0}  {iserver $1} %Z00af00%0%Z8787ff Quits: $2 (+$3 more, use /NETSPLIT to show all of them)";
     no_topic = "%k%N No topic set for {channelhilight $0}";
     own_ctcp = "%k%z005f87 CTCP {hilight $2-}  {inick $0} %n%Z005f87%N";
-    server_chanmode_change = "%k%z8787ff SERVERMODE %k%8 {channelhilight $0} {mode $1} by {nick $2}";
-    topic = "%k%z00d700TOPIC %Z00d700%0%N {channel $0}%N  $1";
-    topic_info = "%k%z00d700TOPIC %Z00d700%0%N {nick $0}%N {nickhost $2}  $1";
+    server_chanmode_change = "%k%z8787ff SERVERMODE %k%8%N%g {channelhilight $0} %g {mode $1} by {nick $2}";
+    topic = "%k%z00d700TOPIC %Z00d700%0%N {channel $0}%N  $1";
+    topic_info = "%k%z00d700TOPIC %Z00d700%0%N {nick $0}%N {nickhost $2}  $1";
     unaway = "%k%z00d700AWAY %Z00d700%0%N END";
-    usermode_change = "%z008700%ZeeeeeeMODE %N%Z008700%N {mode $0}%N for %0{mynick $1}%N";
-    who = "%z00d700%kWHO %Z00d700%z005f87 %z005f87%k{inick $[!9]1} %Z005f87%2 %k$0 %0%g Status: $[!3]2  $[-2]3 hops %N%g%N {nickhost $4@$5} {comment $6}";
-    whois = "%z00d700%kWHOIS %Z00d700%z005f87 {nick $0} %Z005f87%0 {nickhost $1@$2}%:{whois ircname $3}";
-    whowas = "%z00d700%kWHOWAS %Z00d700%z005f87 {nick $0} %Z005f87%0 {nickhost $1@$2}%:{whois was $3}";
+    usermode_change = "%k%z5fafd7%ZeeeeeeMODE %N%Z5fafd7%N {mode $0}%N for %0{mynick $1}%N";
+    who = "%z00d700%kWHO %Z00d700%z005f87 %z005f87%k{inick $[!9]1} %Z005f87%2 %k$0 %0%g Status: $[!3]2  $[-2]3 hops %N%g%N {nickhost $4@$5} {comment $6}";
+    whois = "%z00d700%kWHOIS %Z00d700%z005f87 {nick $0} %Z005f87%0 {nickhost $1@$2}%:{whois ircname $3}";
+    whowas = "%z00d700%kWHOWAS %Z00d700%z005f87 {nick $0} %Z005f87%0 {nickhost $1@$2}%:{whois was $3}";
     own_action = "$nickalign{ownaction $0$nicktrunc}$1";
     action_private = "$nickalign{pvtaction $[.15]0$nicktrunc}$2";
     action_private_query = "$nickalign{pvtaction_query $[.15]0$nicktrunc}$2";
     action_public = "$nickalign{pubaction $[.15]0$nicktrunc}$1";
+    notice_server = "{servernotice $0}$1";
+    notice_public = "{notice $0{pubnotice_channel $1}}$2";
+    notice_private = "{notice $0{pvtnotice_host $1}}%Z00af87$2%N";
   };
   "Irssi::Script::adv_windowlist" = {
     awl_display_header = "";
@@ -477,9 +501,11 @@ formats = {
     sb_uc_space = " ";
   };
   "Irssi::Script::nm2" = {
-    neat_pad_char = "  ";
-    neat_style = ",cp,,,,,,,";
+    neat_pad_char = " ";
+    neat_style = ",cpt,,,,,,,";
     neat_custom_modes = "&%B&%n%Zeeeeee | @%g@%n%Zeeeeee | +%y+%n%Zeeeeee";
+    neat_truncate_char = "~";
+    neat_notruncate_char = "";
   };
   "Irssi::Script::mh_sbsplitmode" = {
     mh_sbsplitmode_line = "%Zaf5f87{server $0}: $1 {comment $2}";
@@ -494,6 +520,5 @@ formats = {
     otr_stb_unknown = "{sb {hilight state unknown (BUG!)}}";
     otr_stb_untrusted = "{sb %pOTR%n (%runverified%n)}";
     otr_stb_trust = "{sb %GOTR%n}";
-
   };
 };