From e2a9e753ffbffe18816791ac057cac881fe626c5 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@mail.utoronto.ca>
Date: Thu, 15 Dec 2022 13:25:38 -0500
Subject: [PATCH] Fix battery i3block

---
 dot_config/i3/config.tmpl                      | 6 +++---
 dot_config/i3blocks/i3blocks.conf.tmpl         | 6 +++++-
 dot_config/i3blocks/scripts/executable_battery | 8 ++++++--
 dot_config/i3blocks/scripts/executable_wifi    | 2 +-
 dot_config/zathura/zathurarc                   | 2 +-
 scripts/executable_backup                      | 4 ++--
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
index f5a9108..3608850 100755
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -4,10 +4,10 @@ set $term kitty
 # set $term st
 # set $term_alt urxvt
 {{ if eq .chezmoi.hostname "x1-carbon" }}
-# set $term urxvt
+set $term urxvt
 # set $term_alt kitty
-# set $term_alt st
-set $term_alt urxvt
+set $term_alt st
+# set $term_alt urxvt
 exec dunst
 exec compton
 exec imwheel
diff --git a/dot_config/i3blocks/i3blocks.conf.tmpl b/dot_config/i3blocks/i3blocks.conf.tmpl
index 0138687..a006c17 100755
--- a/dot_config/i3blocks/i3blocks.conf.tmpl
+++ b/dot_config/i3blocks/i3blocks.conf.tmpl
@@ -15,6 +15,8 @@ color=#cbe4ff
 
 #  ticker [[[ #
 
+{{ if eq .chezmoi.hostname "nzxt" }}
+
 # [ticker]
 # label=BTC 
 # TICKER=BTC-USD
@@ -35,6 +37,8 @@ interval=30
 # TICKER=^IXIC
 # interval=30
 
+{{ end }}
+
 #  ]]] ticker #
 
 #  volume/spotify [[[ # 
@@ -69,7 +73,7 @@ interval=5
 
 {{ if eq .chezmoi.hostname "x1-carbon" }}
 [battery]
-label=⚡ 
+label=⚡
 interval=30
 
 [wifi]
diff --git a/dot_config/i3blocks/scripts/executable_battery b/dot_config/i3blocks/scripts/executable_battery
index 3a53325..cae339c 100755
--- a/dot_config/i3blocks/scripts/executable_battery
+++ b/dot_config/i3blocks/scripts/executable_battery
@@ -24,12 +24,16 @@ my $short_text;
 my $bat_number = $ENV{BLOCK_INSTANCE} || 0;
 
 # read the first line of the "acpi" command output
-open (ACPI, "acpi -b | grep 'Battery $bat_number' |") or die;
+open (ACPI, "acpi -b 2>/dev/null| grep 'Battery $bat_number' |") or die;
 $acpi = <ACPI>;
 close(ACPI);
 
 # fail on unexpected output
-if ($acpi !~ /: (\w+), (\d+)%/) {
+if (not defined($acpi)) {
+    # don't print anything to stderr if there is no battery
+    exit(0);
+}
+elsif ($acpi !~ /: ([\w\s]+), (\d+)%/) {
 	die "$acpi\n";
 }
 
diff --git a/dot_config/i3blocks/scripts/executable_wifi b/dot_config/i3blocks/scripts/executable_wifi
index 5b02f5d..4555d8a 100755
--- a/dot_config/i3blocks/scripts/executable_wifi
+++ b/dot_config/i3blocks/scripts/executable_wifi
@@ -31,7 +31,7 @@ INTERFACE="${BLOCK_INSTANCE:-wlan0}"
 QUALITY=$(sudo grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }')
 # echo $QUALITY
 W_inter=$(ip link | grep "[1-9]: wlp" | cut -d " " -f2 | tr -d ':')
-W_name=$(nmcli d | grep "$W_inter" | awk '{print $4}')
+# W_name=$(nmcli d | grep "$W_inter" | awk '{print $4}')
 
 #------------------------------------------------------------------------
 
diff --git a/dot_config/zathura/zathurarc b/dot_config/zathura/zathurarc
index b5cc5a8..e1ff79d 100755
--- a/dot_config/zathura/zathurarc
+++ b/dot_config/zathura/zathurarc
@@ -1,4 +1,4 @@
-# set recolor true
+set recolor true
 # black
 set recolor-darkcolor "#ffffff"
 set recolor-lightcolor "#000000"
diff --git a/scripts/executable_backup b/scripts/executable_backup
index 1495033..62050e1 100755
--- a/scripts/executable_backup
+++ b/scripts/executable_backup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# mount_dir="/run/media/kevin/backup-hd"
-mount_dir="/mnt/linux-files-2"
+mount_dir="/run/media/kevin/backup-hd"
+# mount_dir="/mnt/linux-files-2"
 # Backup destination
 case $1 in
 	nzxt )