From 0b227719b46769049e829c7034cd560ea23d9cf4 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 3 Mar 2021 21:31:06 +0100
Subject: [PATCH] update blocks

---
 bar/bar1.conf                 | 62 ++++++++++++++++++++++++-----------
 bar/src/acpi.php              |  2 +-
 bar/src/app.php               |  2 +-
 bar/src/bandwidth.php         |  5 +--
 bar/src/base/block.php        | 29 ++++++++++++++++
 bar/src/date.php              |  2 +-
 bar/src/ip.php                |  7 ++--
 bar/src/ip_wan.php            |  2 +-
 bar/src/meteo.php             |  7 ++--
 bar/src/mount_point_space.php |  2 +-
 bar/src/rss.php               |  2 +-
 bar/src/screensaver.php       |  2 +-
 bar/src/spotify.php           |  2 +-
 bar/src/spotify_ctrl.php      |  2 +-
 bar/src/time.php              |  2 +-
 bar/src/volume.php            |  2 +-
 16 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/bar/bar1.conf b/bar/bar1.conf
index 561f971..e84265c 100644
--- a/bar/bar1.conf
+++ b/bar/bar1.conf
@@ -1,35 +1,47 @@
 [bandwidth_eth0]
-command=/home/simon/.i3/bar/src/bandwidth.php eth0
+command=/home/simon/.i3/bar/src/bandwidth.php eth0 inet eth
 format=json
 markup=pango
 interval=5
 
-[bandwidth_eth1]
-command=/home/simon/.i3/bar/src/bandwidth.php eth1
+[bandwidth_enx00e04cf69b06]
+command=/home/simon/.i3/bar/src/bandwidth.php enx00e04cf69b06 inet eth
 format=json
 markup=pango
 interval=5
 
-[bandwidth_wlan0]
-command=/home/simon/.i3/bar/src/bandwidth.php wlan0
+[bandwidth_enx00e04c68022c]
+command=/home/simon/.i3/bar/src/bandwidth.php enx00e04c68022c inet eth
+format=json
+markup=pango
+interval=5
+
+[bandwidth_wlp59s0]
+command=/home/simon/.i3/bar/src/bandwidth.php wlp59s0 inet wifi
 format=json
 markup=pango
 interval=1
 
 [ip_eth0_inet]
-command=/home/simon/.i3/bar/src/ip.php eth0
+command=/home/simon/.i3/bar/src/ip.php eth0 inet eth
 format=json
 markup=pango
 interval=10
 
-[ip_eth1_inet]
-command=/home/simon/.i3/bar/src/ip.php eth1
+[ip_enx00e04cf69b06_inet]
+command=/home/simon/.i3/bar/src/ip.php enx00e04cf69b06 inet eth
 format=json
 markup=pango
 interval=10
 
-[ip_wlan0_inet]
-command=/home/simon/.i3/bar/src/ip.php wlan0
+[ip_enx00e04c68022c_inet]
+command=/home/simon/.i3/bar/src/ip.php enx00e04c68022c inet eth
+format=json
+markup=pango
+interval=10
+
+[ip_wlp59s0_inet]
+command=/home/simon/.i3/bar/src/ip.php wlp59s0 inet wifi
 format=json
 markup=pango
 interval=10
@@ -70,26 +82,38 @@ format=json
 markup=pango
 interval=1
 
+[i3remote]
+command=/home/simon/.i3/bar/src/i3remote.php
+format=json
+markup=pango
+interval=3
+
 [screensaver]
 command=/home/simon/.i3/bar/src/screensaver.php
 format=json
 markup=pango
 interval=3
 
-[meteo]
-command=/home/simon/.i3/bar/src/meteo.php
-format=json
-markup=pango
-interval=3600
+#[meteo]
+#command=/home/simon/.i3/bar/src/meteo.php
+#format=json
+#markup=pango
+#interval=3600
 
-[app_passwords]
-command=/home/simon/.i3/bar/src/app.php app_passwords P "/home/simon/bin/deblan-passwords" '#444444' '#ffc337'
+#[app_passwords]
+#command=/home/simon/.i3/bar/src/app.php app_passwords P "/home/simon/bin/deblan-passwords" '#444444' '#ffc337'
+#format=json
+#markup=pango
+#interval=1000
+
+[app_otp]
+command=/home/simon/.i3/bar/src/app.php app_otp "🔐" "/home/simon/bin/otpclient" '#363636' '#ffc337'
 format=json
 markup=pango
 interval=1000
 
 [app_cloud]
-command=/home/simon/.i3/bar/src/app.php app_cloud C "xdg-open https://deblan.cloud/" '#5d5d7d' '#fff'
+command=/home/simon/.i3/bar/src/app.php app_cloud C "xdg-open https://deblan.cloud/" '#3c4e74' '#fff'
 format=json
 markup=pango
 interval=1000
@@ -107,7 +131,7 @@ markup=pango
 interval=1000
 
 [time]
-command=/home/simon/.i3/bar/src/time.php "H:i:s d/m/Y"
+command=/home/simon/.i3/bar/src/time.php "H:i:s d/m"
 format=json
 markup=pango
 interval=1
diff --git a/bar/src/acpi.php b/bar/src/acpi.php
index d872baa..309d9b5 100755
--- a/bar/src/acpi.php
+++ b/bar/src/acpi.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/app.php b/bar/src/app.php
index 017cb65..6283413 100755
--- a/bar/src/app.php
+++ b/bar/src/app.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/bandwidth.php b/bar/src/bandwidth.php
index f8fea2d..0b987d9 100755
--- a/bar/src/bandwidth.php
+++ b/bar/src/bandwidth.php
@@ -1,10 +1,11 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
 
 $iface = $argv[1] ?? 'eth0';
 $inet = ($argv[2] ?? 'inet').' ';
+$name = ($argv[3] ?? $iface);
 
 $command = sprintf(
     'ip address show %s | grep %s | awk \'{ print $2 }\' | cut -d/ -f1',
@@ -27,7 +28,7 @@ if (empty($bwidth)) {
 $down = pemoji(0xf0ab).$bwidth[0].'Ko/s ';
 $up = $bwidth[1].'Ko/s'.pemoji(0xf0aa);
 
-$fullText = pspan($iface, '#ccc', '#222').span($down.$up, '#ddd', '#000');
+$fullText = pspan($name, '#ccc', '#222').span($down.$up, '#ddd', '#000');
 
 echo block(
     'bandwidth_'.$iface,
diff --git a/bar/src/base/block.php b/bar/src/base/block.php
index acd4432..552c952 100644
--- a/bar/src/base/block.php
+++ b/bar/src/base/block.php
@@ -55,6 +55,35 @@ function pspan($text, $foreground = null, $background = null)
     return span(sprintf(' %s ', $text), $foreground, $background);
 }
 
+/**
+ * Creates span with right padding.
+ *
+ * @param string $text
+ * @param string $foreground
+ * @param string $background
+ *
+ * @return string
+ */
+function rpspan($text, $foreground = null, $background = null)
+{
+    return span(sprintf('%s ', $text), $foreground, $background);
+}
+
+/**
+ * Creates span with left padding.
+ *
+ * @param string $text
+ * @param string $foreground
+ * @param string $background
+ *
+ * @return string
+ */
+function lpspan($text, $foreground = null, $background = null)
+{
+    return span(sprintf(' %s', $text), $foreground, $background);
+}
+
+
 /**
  * Creates span.
  *
diff --git a/bar/src/date.php b/bar/src/date.php
index ba23b97..eeec38e 100755
--- a/bar/src/date.php
+++ b/bar/src/date.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/ip.php b/bar/src/ip.php
index 8cd1f78..7ef6426 100755
--- a/bar/src/ip.php
+++ b/bar/src/ip.php
@@ -1,13 +1,14 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
 
 $iface = $argv[1] ?? 'eth0';
 $inet = ($argv[2] ?? 'inet').' ';
+$name = ($argv[3] ?? $iface);
 
 $command = sprintf(
-    'ip address show %s | grep %s | awk \'{ print $2 }\' | cut -d/ -f1 | head -n 1',
+    'ip address show %s | grep %s | awk \'{ print $2 }\' | tail -n 1 | cut -d/ -f1 | head -n 1',
     escapeshellarg($iface),
     escapeshellarg($inet)
 );
@@ -18,7 +19,7 @@ if (empty($ip)) {
     die;
 }
 
-$fullText = pspan($iface, '#ccc', '#222').pspan($ip, '#ddd', '#000');
+$fullText = pspan($name, '#ccc', '#222').pspan($ip, '#ddd', '#000');
 
 if (getenv('BLOCK_BUTTON') === '1') {
     shell_exec('
diff --git a/bar/src/ip_wan.php b/bar/src/ip_wan.php
index 50c6948..f68f1b3 100755
--- a/bar/src/ip_wan.php
+++ b/bar/src/ip_wan.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/meteo.php b/bar/src/meteo.php
index 916a8d0..2cc8ed6 100755
--- a/bar/src/meteo.php
+++ b/bar/src/meteo.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
@@ -31,7 +31,8 @@ if (!empty($output)) {
 }
 
 if (getenv('BLOCK_BUTTON') === '1') {
-    $url = 'https://fr.wttr.in/';
-    $command = sprintf('xdg-open %s', escapeshellarg($url));
+    // $url = 'https://fr.wttr.in/';
+    // $command = sprintf('xdg-open %s', escapeshellarg($url));
+    $command = 'gnome-weather --class="gnome-weather"&';
     shell_exec($command);
 }
diff --git a/bar/src/mount_point_space.php b/bar/src/mount_point_space.php
index c6384f3..0859cdc 100755
--- a/bar/src/mount_point_space.php
+++ b/bar/src/mount_point_space.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/rss.php b/bar/src/rss.php
index 5bef8ad..99f71d3 100755
--- a/bar/src/rss.php
+++ b/bar/src/rss.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/screensaver.php b/bar/src/screensaver.php
index 253c488..6a6e917 100755
--- a/bar/src/screensaver.php
+++ b/bar/src/screensaver.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/spotify.php b/bar/src/spotify.php
index e9c1df5..d01ea81 100755
--- a/bar/src/spotify.php
+++ b/bar/src/spotify.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/spotify_ctrl.php b/bar/src/spotify_ctrl.php
index bd5fcf4..2cbbaa3 100755
--- a/bar/src/spotify_ctrl.php
+++ b/bar/src/spotify_ctrl.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/time.php b/bar/src/time.php
index f23d496..9823d6c 100755
--- a/bar/src/time.php
+++ b/bar/src/time.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php7.1
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';
diff --git a/bar/src/volume.php b/bar/src/volume.php
index 3bd2d78..ac9c8f6 100755
--- a/bar/src/volume.php
+++ b/bar/src/volume.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php7.3
+#!/usr/bin/env php
 <?php
 
 require __DIR__.'/base/block.php';