Merge branch 'master' of localhost:public/dotfiles into master

3 files changed, 17 insertions, 10 deletions

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index dc439fc..e51e8ac 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -1,7 +1,7 @@
 # Modifier
 set $mod Mod4
 
-font pango:DejaVu Sans Mono, Awesome 8
+font pango:DejaVu Sans Mono, Awesome 9
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -190,6 +190,8 @@ bindsym XF86AudioMute         exec amixer -D pulse sset Master 0%
 # Display
 bindsym XF86MonBrightnessUp   exec light -A 10
 bindsym XF86MonBrightnessDown exec light -U 10
+bindsym Prior exec light -A 10
+bindsym Next exec light -U 10
 bindsym Shift+XF86AudioRaiseVolume exec light -A 10
 bindsym Shift+XF86AudioLowerVolume exec light -U 10
 
@@ -215,4 +217,7 @@ gaps outer 5
 # Launch compositor
 exec compton
 
+# Kill xcape if bug
+bindsym $mod+F3 exec --no-startup-id killall -9 xcape
+
 # vim:filetype=i3
diff --git a/i3/.config/i3blocks/bin/battery b/i3/.config/i3blocks/bin/battery
index 378ee3f..0286809 100755
--- a/i3/.config/i3blocks/bin/battery
+++ b/i3/.config/i3blocks/bin/battery
@@ -5,7 +5,6 @@ if [ ! -d /sys/class/power_supply/BAT0 ]; then
     exit
 fi
 
-current_now=$(cat /sys/class/power_supply/BAT0/current_now)
 charge_now=$(cat /sys/class/power_supply/BAT0/charge_now)
 charge_full=$(cat /sys/class/power_supply/BAT0/charge_full)
 bat_status=$(cat /sys/class/power_supply/BAT0/status)
@@ -16,7 +15,7 @@ if [ "$bat_status" = "Full" ]; then
 fi
 
 if [ "$bat_status" = "Discharging" ]; then
-    tot_minutes_remaining=$(( charge_now*60/current_now ))
+    # tot_minutes_remaining=$(( charge_now*60/current_now ))
 
     if [[ $charge_percent -lt 20 ]]; then
         icon=""
@@ -36,14 +35,16 @@ if [ "$bat_status" = "Discharging" ]; then
     fi
 
 elif [ "$bat_status" = "Charging" ]; then
-    tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now ))
+    # current_now=$(cat /sys/class/power_supply/BAT0/current_now)
+    # tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now ))
 
     icon=
     color="lightblue"
 fi
 
-time_remaining=$(printf "%02d:%02d" \
-    $(( tot_minutes_remaining/60 )) \
-    $(( tot_minutes_remaining - (tot_minutes_remaining/60)*60 )))
+# time_remaining=$(printf "%02d:%02d" \
+#     $(( tot_minutes_remaining/60 )) \
+#     $(( tot_minutes_remaining - (tot_minutes_remaining/60)*60 )))
 
-echo "<span color='$color'>$icon</span> $charge_percent% ($time_remaining)"
+# echo "<span color='$color'>$icon</span> $charge_percent% ($time_remaining)"
+echo "<span color='$color'>$icon</span> $charge_percent%"
diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config
index e736e7e..0f0c207 100644
--- a/i3/.config/i3blocks/config
+++ b/i3/.config/i3blocks/config
@@ -73,15 +73,16 @@ label=<span color='gray'></span>
 command=echo $(free | grep '^Mem' | awk '{ printf "%3.0f%\n", 100*$3/$2 }')
 interval=30
 
+# Requires i3blocks-contrib (AUR)
 [diskhome]
 label=<span color='gray'></span>
-command=/usr/lib/i3blocks/disk
+command=/usr/lib/i3blocks/disk/disk
 instance=/home/urbain
 interval=300
 
 [diskroot]
 label=<span color='gray'></span>
-command=/usr/lib/i3blocks/disk
+command=/usr/lib/i3blocks/disk/disk
 instance=/
 interval=300