so many things

1 files changed, 46 insertions, 35 deletions

diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme
index 4806421..f1ce6c8 100644
--- a/irssi/solarized-powerline.theme
+++ b/irssi/solarized-powerline.theme
@@ -60,7 +60,7 @@ info_eol = "false";
 
 # these characters are automatically replaced with specified color
 # (dark grey by default)
-replaces = { "[]=" = "%9$*%9"; };
+replaces = { "[]=" = "$*"; };
 
 abstracts = {
   ##
@@ -75,13 +75,13 @@ abstracts = {
 
   # timestamp styling, nothing by default
   # %N%8 = reverse normal (to match line_start)
-  timestamp = "%N%k%z005f87%9$*%9%N%Z005f87%n";
+  timestamp = "%N%k%z005f87$*%N%Z005f87%n";
 
   # any kind of text that needs hilighting, default is to bold
-  hilight = "%9$*%9";
+  hilight = "$*";
 
   # any kind of error message
-  error = "%r$*%n";
+  error = "%z5f5fd7$*%n";
 
   # channel name is printed
   channel = "%Z00af00$*%n";
@@ -100,7 +100,7 @@ abstracts = {
 
   # server name is printed
   server = "%Z00af00$*";
-  iserver = "%9%Zeeeeee%z00af00$*%9%n";
+  iserver = "%Zeeeeee%z00af00$*%n";
 
   # some kind of comment is printed
   comment = " $*";
@@ -134,7 +134,7 @@ abstracts = {
   # ban/ban exception/invite list mask is printed
   # %R = brightred (Solarized: orange)
   # %n = return
-  ban = "%R$*%n";
+  ban = "%zff5f00$*%n";
 
 
   ##
@@ -162,7 +162,7 @@ abstracts = {
 
   # $0 = nick mode, $1 = nick
   # %3 = yellow
-  ownmsgnick = "%z5f5fff%k{%z5f5fff%9 $0$1-%9}%N%0%Z5f5fff %Zeeeeee";
+  ownmsgnick = "%z5f5fff%k{%z5f5fff $0$1-}%N%0%Z5f5fff %Zeeeeee";
   ownnick = "%Zeeeeee$*";
 
   # public message in channel, $0 = nick mode, $1 = nick
@@ -192,7 +192,7 @@ abstracts = {
   ownprivmsg = " %Z005f87$0%G<%Z005f87$1-%G>%n ";
 
   # own private message in query
-  ownprivmsgnick = "%z5f5fff%k{%z5f5fff%9 $*%9}%N%Z5f5fff %C";
+  ownprivmsgnick = "%z5f5fff%k{%z5f5fff $*}%N%Z5f5fff %C";
   ownprivnick = "%k$*";
 
   # private message in query
@@ -207,7 +207,7 @@ abstracts = {
   action_core = "%N%k %n$*";
 
   # generic one that's used by most actions
-  action = "{action_core %9$*%n} ";
+  action = "{action_core $*%n} ";
 
   # own action, both private/public
   ownaction = "%N%k {mynick $0}%N%C $1-";
@@ -234,13 +234,13 @@ abstracts = {
   whois = "%k%z005f87WHOIS %N%k%#%N $[8]0  %Y$1-";
 
   # notices
-  ownnotice = "%1%k %k$0 %k%1%8%0 {ichannelhilight $1-} %k%z00af5f%N ";
-  notice = "%1%k %k$0- %r%0%N ";
+  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 = "%1%k %k!$* %k%8%n ";
+  servernotice = "%z8787ff%k %k!$* %k%8%n ";
 
   # CTCPs
   ownctcp = "%k%z005f87 %k$0%G %N%Z005f87 %Z005f87$1-%G  ";
@@ -252,13 +252,13 @@ abstracts = {
   wallop_action = "%c * $*%n ";
 
   # netsplits
-  netsplit = "%r$*%n";
+  netsplit = "%z5f5fd7$*%n";
   netjoin = "%g$*%n";
 
   # /names list
   names_prefix = "%N%k%n";
-  names_nick = " %G%9$0%9$1-%N  ";
-  names_nick_op = " %k%9$0$_$1-%n  ";
+  names_nick = " %G$0$1-%N  ";
+  names_nick_op = " %k$0$_$1-%n  ";
   names_nick_halfop = " %Y$_$0$_$1-%n  ";
   names_nick_voice = " %C$_$0$_$1-%n  ";
   names_users = "%k%z005f87 $* %Z005f87%0%n";
@@ -266,7 +266,7 @@ abstracts = {
 
   # DCC
   dcc = "%N%k%n %g$*%n";
-  dccfile = "%9$*%9";
+  dccfile = "$*";
 
   # DCC chat, own msg/action
   dccownmsg = "[%Z005f87$0%G($1-%G)%n] ";
@@ -313,15 +313,15 @@ abstracts = {
 
   # text at the beginning of statusbars. sb-item already puts
   # space there,so we don't use anything by default.
-  sbstart = "%z005f00%9";
+  sbstart = "%z005f00";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.
-  sbend = "%9%n";
+  sbend = "%n";
 
   topicsbstart = "{sbstart $*}";
   topicsbend = "{sbend $*}";
 
-  prompt = "%9%k%z005f87$c $* %N%Z005f87%9%n ";
+  prompt = "%k%z005f87$c $* %N%Z005f87%n ";
 
   # This controls each part of a statusbar, including the outer brackets of adv_windowlist
   sb = "$*";
@@ -345,17 +345,16 @@ abstracts = {
   # This also affects the color of the window with direct message in adv_windowlist
   sb_act_hilight = "%m$*";
   # hilight with specified color, $0 = color, $1 = text
-  sb_act_hilight_color = "%R$1-";
+  sb_act_hilight_color = "%z5f5fd7$1-";
 
   ### For usercount.pl script
-
-  sb_usercount = "{sb $0 users %Z005f87(%n$1-%Z005f87)}";
-  sb_uc_ircops = "%k*%n$*";
-  sb_uc_ops = "%y@%n$*";
-  sb_uc_halfops = "%p%%%n$*";
-  sb_uc_voices = "%Z005f87+%n$*";
-  sb_uc_normal = "%k %n$*";
-  sb_uc_space = "%k·%n";
+  sb_usercount = "%Z000000%z005faf%Z000000%z005faf{sb $0 nicks %Zeeeeee %Z000000$1-%Z005faf%z000000}";
+  sb_uc_ircops = "%Z000000%z005faf*$*";
+  sb_uc_ops = "%Z000000%z005faf@$*";
+  sb_uc_halfops = "%Z000000%z005faf%%$*";
+  sb_uc_voices = "%Z000000%z005faf+$*";
+  sb_uc_normal = "$*";
+  sb_uc_space = " ";
 
   ### For adv_windowlist.pl script
 
@@ -367,7 +366,7 @@ formats = {
   "fe-common/core" = {
     daychange = "           %g-----%k-%W-%n Day changed to %%D %W-%k-%g-----%n";
     join = "%k%z00af5fJOIN %8 {ichannelhilight $2} %0%Z00d700%0 {inick $0}%0 %N%8%n%k%N {chanhost_hilight $1}";
-    line_start_irssi = "%k%zff0000IRSSI%N%Zff0000 %N";
+    line_start_irssi = "%k%z5f5fd7IRSSI%N%Z5f5fd7 %N";
     new_topic = "%k%z00d700TOPIC %8 {ichannelhilight $1} by {inick $0}%8  $2";
     nick_changed = "%k%z00d700RENAME %Z00d700%0 {nick $0} %Zff8700 {nick $1} %N%8%n%k%N";
     part = "%k%z00d700PART %8 {ichannelhilight $2}%N %0%Z005f87 %N{inick $0}%0 %k%Zeeeeee {reason $3}";
@@ -403,13 +402,13 @@ formats = {
     end_of_who = "%z00d700%kWHO %N%k%N END";
     end_of_whois = "%z00d700%kWHOIS %N%k%N END";
     end_of_whowas = "%z00d700%kWHOWAS %N%k%N END";
-    netsplit = "%k%1%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2";
-    netsplit_join = "%k%1 NETSPLIT %k%8%N Joins: $0";
-    netsplit_join_more = "%k%1 NETSPLIT %k%8%N Joins: $0 (+$1 more)";
-    netsplit_more = "%k%1%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2 (+$3 more, use /NETSPLIT to show all of them)";
+    netsplit = "%k%z8787ff%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N 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 = "%k%z8787ff%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N 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%1 SERVERMODE %k%8 {channelhilight $0} {mode $1} by {nick $2}";
+    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";
     unaway = "%k%z00d700AWAY %N%k%N END";
@@ -425,11 +424,23 @@ formats = {
   "Irssi::Script::adv_windowlist" = {
     awl_display_header = "";
     awl_display_key = "  %0$N  $H$C$S  %n";
-    awl_display_key_active = "%9%W%Z008700%0%8 %zeeeeee$N  $H$C$S%8 %0%8%8%9%n";
+    awl_display_key_active = "%W%Z008700%0%8 %zeeeeee$N  $H$C$S%8 %0%8%8%n";
     awl_display_key_visible = "%Z005fff %m$N %k $H$C$S %8%8%n";
     awl_display_nokey = "  %0$N  %U$C%U  %n";
     awl_display_nokey_active = "%k%z005f87 %k$N %k %U$C%U %8%8%n";
     awl_display_nokey_visible = "%k%z5f5fff %m$N %k %U$C%U %8%8%n";
     awl_separator = "";
   };
+  "Irssi::Script::usercount" = {
+    sb_usercount = "%z00af5f{sb $0 nicks ($1-)}";
+    sb_uc_ircops = "%z00d787*$*";
+    sb_uc_ops = "%z00d787@$*";
+    sb_uc_halfops = "%z00d787%%$*";
+    sb_uc_voices = "%z00af5f+$*";
+    sb_uc_normal = "$*";
+    sb_uc_space = " ";
+  };
+  "Irssi::Script::hilite_url" = {
+    url_color = "38;5;6";
+  };
 };