From d99cee2efeafc32581147424e31cfdce9531dc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.eu>
Date: Sun, 10 Jun 2018 21:09:27 +0200
Subject: [i3] Replace icons by font awesome

---
 .i3/config               |  2 +-
 .i3/conkyrc              | 30 ++++++++++++------------------
 .i3/icons/cpu.xbm        |  6 ------
 .i3/icons/down.xbm       |  6 ------
 .i3/icons/fan.xbm        |  6 ------
 .i3/icons/fan2.xbm       |  5 -----
 .i3/icons/load.xbm       |  6 ------
 .i3/icons/mem.xbm        |  6 ------
 .i3/icons/mpd.xbm        |  6 ------
 .i3/icons/net-wifi.xbm   |  6 ------
 .i3/icons/net-wifi3.xbm  |  6 ------
 .i3/icons/net-wifi4.xbm  |  6 ------
 .i3/icons/net-wifi5.xbm  |  6 ------
 .i3/icons/net-wired.xbm  |  6 ------
 .i3/icons/net-wired2.xbm |  6 ------
 .i3/icons/pause.xbm      |  6 ------
 .i3/icons/plus.xbm       |  5 -----
 .i3/icons/power-ac.xbm   |  6 ------
 .i3/icons/power-bat.xbm  |  6 ------
 .i3/icons/power-bat2.xbm |  6 ------
 .i3/icons/temp.xbm       |  6 ------
 .i3/icons/up.xbm         |  6 ------
 .i3/icons/vol-hi.xbm     |  6 ------
 .i3/icons/vol-mute.xbm   |  6 ------
 24 files changed, 13 insertions(+), 149 deletions(-)
 delete mode 100644 .i3/icons/cpu.xbm
 delete mode 100644 .i3/icons/down.xbm
 delete mode 100644 .i3/icons/fan.xbm
 delete mode 100644 .i3/icons/fan2.xbm
 delete mode 100644 .i3/icons/load.xbm
 delete mode 100644 .i3/icons/mem.xbm
 delete mode 100644 .i3/icons/mpd.xbm
 delete mode 100644 .i3/icons/net-wifi.xbm
 delete mode 100644 .i3/icons/net-wifi3.xbm
 delete mode 100644 .i3/icons/net-wifi4.xbm
 delete mode 100644 .i3/icons/net-wifi5.xbm
 delete mode 100644 .i3/icons/net-wired.xbm
 delete mode 100644 .i3/icons/net-wired2.xbm
 delete mode 100644 .i3/icons/pause.xbm
 delete mode 100644 .i3/icons/plus.xbm
 delete mode 100644 .i3/icons/power-ac.xbm
 delete mode 100644 .i3/icons/power-bat.xbm
 delete mode 100644 .i3/icons/power-bat2.xbm
 delete mode 100644 .i3/icons/temp.xbm
 delete mode 100644 .i3/icons/up.xbm
 delete mode 100644 .i3/icons/vol-hi.xbm
 delete mode 100644 .i3/icons/vol-mute.xbm

diff --git a/.i3/config b/.i3/config
index c4a5bff..29167eb 100644
--- a/.i3/config
+++ b/.i3/config
@@ -30,7 +30,7 @@ font pango:Inconsolata 9
 # Bars «1
 #################################################
 bar {
-    font pango:DroidSansMono 9
+    font pango:DroidSansMono, FontAwesome 9
     status_command $script/conkystatus.sh
     position top
     tray_output primary
diff --git a/.i3/conkyrc b/.i3/conkyrc
index b955ae8..ce5ef17 100644
--- a/.i3/conkyrc
+++ b/.i3/conkyrc
@@ -34,37 +34,31 @@ conky.config = {
 	cpu_avg_samples = 2,
 
 	lua_load = '$HOME/.i3/scripts/conky_helpers.lua',
-
-	template0 = [["$HOME/.i3/icons/\1.xbm"]],
 };
 
 conky.text = [[
 [ \
-    ${if_mpd_playing}{
-        "full_text" : "${lua json ${mpd_smart}}",\
-        "icon" : ${if_match "${mpd_status}"=="Paused"}${template0 pause}${else}${template0 mpd}${endif} \
-    },${endif}\
     {\
-        "full_text" : "${cpu}%",\
-        "icon" : ${template0 cpu},\
-        "min_width" : "99%",\
-        "align" : "right"\
+        "full_text" : " ${if_match ${cpu}<10}  ${endif}${cpu}%"\
     },\
     {\
-        "full_text" : " ${mem}",\
-        "icon" : ${template0 load},\
-        "min_width" : " 1000M",\
+        "full_text" : " ${mem}",\
+        "min_width" : " 1000M",\
         "color" : "\#${if_match ${memperc}<90}ffffff${else}ff0000${endif}"\
     },\
     {\
-        "full_text" : "${platform coretemp.0 temp 2}°C${platform f71882fg.2560 temp 2}°C ${execi 30 nvidia-settings -query GPUCoreTemp | perl -n -e'/Attribute.*: (.*).$/ && print $1'}°C",\
-        "icon" : ${template0 temp}\
+        "full_text" : "${if_existing /sys/class/power_supply/AC0/online 1}${else}${endif}  ${battery_percent BAT0}${if_existing /sys/class/power_supply/AC0/online 0} ${lua utime ${battery_time BAT0}}${endif}"\
     },\
     {\
-        "full_text" : " ${if_up eth0}${addr}${else}(down)${endif}",\
-        "icon" : ${template0 net-wired},\
-        "color" : "\#${if_up eth0}ffffff${else}ff0000${endif}"\
+        "full_text" : " ${platform coretemp.0 temp 2}°C"\
     },\
+    ${if_up eth0}{\
+        "full_text" : "⑆  ${addr eth0}"\
+    },${endif}\
+    ${if_up wlan0}{\
+        "full_text" : "  ${addr wlan0} (${wireless_essid wlan0})",\
+        "color" : "\#${if_match ${wireless_link_qual_perc wlan0}<80}${if_match ${wireless_link_qual_perc wlan0}>50}ffff00${else}ff0000${endif}${else}ffffff${endif}"\
+    },${endif}\
     {\
         "full_text" : "${time %a, %d. %b %R}",\
         "color" : "\#40B5D6"\
diff --git a/.i3/icons/cpu.xbm b/.i3/icons/cpu.xbm
deleted file mode 100644
index 1b2768d..0000000
--- a/.i3/icons/cpu.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_cpu_width 16
-#define load_cpu_height 16
-static unsigned char load_cpu_bits[] = {
-   0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f, 0xfc, 0x3f, 0xfe, 0x7f,
-   0x1c, 0x38, 0x1c, 0x38, 0x1e, 0x78, 0x1c, 0x38, 0xfc, 0x3f, 0xfe, 0x7f,
-   0xfc, 0x3f, 0x48, 0x12, 0x48, 0x12, 0x00, 0x00 };
diff --git a/.i3/icons/down.xbm b/.i3/icons/down.xbm
deleted file mode 100644
index bc350dd..0000000
--- a/.i3/icons/down.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define down_width 16
-#define down_height 16
-static unsigned char down_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/fan.xbm b/.i3/icons/fan.xbm
deleted file mode 100644
index 764c995..0000000
--- a/.i3/icons/fan.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define fan_width 16
-#define fan_height 16
-static unsigned char fan_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x0f, 0xf0, 0x1e, 0x78, 0x3c, 0x3c,
-   0x78, 0x1e, 0xc0, 0x03, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-   0x80, 0x01, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03 };
diff --git a/.i3/icons/fan2.xbm b/.i3/icons/fan2.xbm
deleted file mode 100644
index 5159e74..0000000
--- a/.i3/icons/fan2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define fan_width 9
-#define fan_height 9
-static unsigned char fan_bits[] = {
-   0x86, 0x00, 0x39, 0x01, 0x7c, 0x01, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00,
-   0x7d, 0x00, 0x39, 0x01, 0xc2, 0x00 };
diff --git a/.i3/icons/load.xbm b/.i3/icons/load.xbm
deleted file mode 100644
index b9a1061..0000000
--- a/.i3/icons/load.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_width 16
-#define load_height 16
-static unsigned char load_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,
-   0x02, 0x44, 0x02, 0x4a, 0x02, 0x71, 0x8e, 0x40, 0x52, 0x40, 0x22, 0x40,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/.i3/icons/mem.xbm b/.i3/icons/mem.xbm
deleted file mode 100644
index 5c5bc8e..0000000
--- a/.i3/icons/mem.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_mem_width 16
-#define load_mem_height 16
-static unsigned char load_mem_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f,
-   0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0x48, 0x12,
-   0x48, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/mpd.xbm b/.i3/icons/mpd.xbm
deleted file mode 100644
index 4cdfa7e..0000000
--- a/.i3/icons/mpd.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define mpd_width 16
-#define mpd_height 16
-static unsigned char mpd_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0xc0, 0x13, 0x40, 0x10,
-   0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x40, 0x1c, 0x70, 0x1e, 0x78, 0x0c,
-   0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/net-wifi.xbm b/.i3/icons/net-wifi.xbm
deleted file mode 100644
index 0b3a4a1..0000000
--- a/.i3/icons/net-wifi.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define net_wifi4_width 16
-#define net_wifi4_height 16
-static unsigned char net_wifi4_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x08, 0x10, 0xe4, 0x27, 0x10, 0x08,
-   0xc0, 0x03, 0x20, 0x04, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01,
-   0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00 };
diff --git a/.i3/icons/net-wifi3.xbm b/.i3/icons/net-wifi3.xbm
deleted file mode 100644
index 7ebb55d..0000000
--- a/.i3/icons/net-wifi3.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define wireless3_full_width 16
-#define wireless3_full_height 16
-static unsigned char wireless3_full_bits[] = {
-   0x00, 0x00, 0xf0, 0x0f, 0x08, 0x10, 0xe4, 0x27, 0x10, 0x08, 0x00, 0x00,
-   0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-   0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/net-wifi4.xbm b/.i3/icons/net-wifi4.xbm
deleted file mode 100644
index 8179eb4..0000000
--- a/.i3/icons/net-wifi4.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define net_wifi4_width 16
-#define net_wifi4_height 16
-static unsigned char net_wifi4_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x7f, 0x00, 0x00,
-   0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0xf8, 0x1f, 0xf8, 0x1f, 0x00, 0x00,
-   0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/net-wifi5.xbm b/.i3/icons/net-wifi5.xbm
deleted file mode 100644
index 8a097ef..0000000
--- a/.i3/icons/net-wifi5.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define wireless_full_width 16
-#define wireless_full_height 16
-static unsigned char wireless_full_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfe, 0x7f, 0x00, 0x00,
-   0xfc, 0x3f, 0xf8, 0x1f, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00,
-   0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/net-wired.xbm b/.i3/icons/net-wired.xbm
deleted file mode 100644
index d9655d7..0000000
--- a/.i3/icons/net-wired.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth2_width 16
-#define network_eth2_height 16
-static unsigned char network_eth2_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0xc2, 0x43, 0xc2, 0x43,
-   0xc2, 0x43, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/.i3/icons/net-wired2.xbm b/.i3/icons/net-wired2.xbm
deleted file mode 100644
index fb7276a..0000000
--- a/.i3/icons/net-wired2.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth1_width 16
-#define network_eth1_height 16
-static unsigned char network_eth1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x60, 0x03, 0x70, 0x07,
-   0x78, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x78, 0x0f, 0x70, 0x07, 0x60, 0x03,
-   0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/pause.xbm b/.i3/icons/pause.xbm
deleted file mode 100644
index 497b838..0000000
--- a/.i3/icons/pause.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define pause_width 16
-#define pause_height 16
-static unsigned char pause_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0e, 0x70, 0x0e,
-   0x70, 0x0e, 0x70, 0x0e, 0x70, 0x0e, 0x70, 0x0e, 0x70, 0x0e, 0x70, 0x0e,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/plus.xbm b/.i3/icons/plus.xbm
deleted file mode 100644
index f8e5f8a..0000000
--- a/.i3/icons/plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define occupied_width 8
-#define occupied_height 16
-static unsigned char occupied_bits[] = {
-   0x00, 0x00, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/power-ac.xbm b/.i3/icons/power-ac.xbm
deleted file mode 100644
index 45ed243..0000000
--- a/.i3/icons/power-ac.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define power_ac_width 16
-#define power_ac_height 16
-static unsigned char power_ac_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x07, 0xc0, 0x3f,
-   0xe0, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xe0, 0x07, 0xc0, 0x3f, 0x80, 0x07,
-   0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/power-bat.xbm b/.i3/icons/power-bat.xbm
deleted file mode 100644
index c450bbc..0000000
--- a/.i3/icons/power-bat.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define battery_width 16
-#define battery_height 16
-static unsigned char battery_bits[] = {
-   0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0x10, 0x08,
-   0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-   0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00 };
diff --git a/.i3/icons/power-bat2.xbm b/.i3/icons/power-bat2.xbm
deleted file mode 100644
index e7be632..0000000
--- a/.i3/icons/power-bat2.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define power_bat2_width 16
-#define power_bat2_height 16
-static unsigned char power_bat2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x7e, 0x18,
-   0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x18, 0xfe, 0x1f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/temp.xbm b/.i3/icons/temp.xbm
deleted file mode 100644
index f37932b..0000000
--- a/.i3/icons/temp.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define temp_width 16
-#define temp_height 16
-static unsigned char temp_bits[] = {
-   0x00, 0x00, 0x80, 0x01, 0xc0, 0x0b, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x0b,
-   0x40, 0x02, 0x40, 0x02, 0x40, 0x0a, 0x40, 0x02, 0x40, 0x02, 0x60, 0x06,
-   0x20, 0x04, 0x60, 0x06, 0xc0, 0x03, 0x00, 0x00 };
diff --git a/.i3/icons/up.xbm b/.i3/icons/up.xbm
deleted file mode 100644
index 2fb6f25..0000000
--- a/.i3/icons/up.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define up_width 16
-#define up_height 16
-static unsigned char up_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/vol-hi.xbm b/.i3/icons/vol-hi.xbm
deleted file mode 100644
index 7c4a849..0000000
--- a/.i3/icons/vol-hi.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_hi2_width 16
-#define vol_hi2_height 16
-static unsigned char vol_hi2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x80, 0x21, 0xc0, 0x49, 0xfc, 0x51,
-   0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x51, 0xc0, 0x49,
-   0x80, 0x21, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00 };
diff --git a/.i3/icons/vol-mute.xbm b/.i3/icons/vol-mute.xbm
deleted file mode 100644
index 2d01f7b..0000000
--- a/.i3/icons/vol-mute.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_mute2_width 16
-#define vol_mute2_height 16
-static unsigned char vol_mute2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x01, 0xfc, 0x01,
-   0xfc, 0x01, 0xfc, 0x29, 0xfc, 0x11, 0xfc, 0x29, 0xfc, 0x01, 0xc0, 0x01,
-   0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 };
-- 
cgit v1.2.3