dotfiles

commit d006040eb0661cf4ac0d9be4802eac4f61919a58
parent ba238ff53d92329bea95c18143b3b00eca147cc8
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date:   Mon, 14 Mar 2016 10:55:25 -0700

Merge branch 'master' of github.com:anders-dc/dotfiles

Diffstat:
M
.i3/config
 | 
1
+
M
.tmux.conf
 | 
3
++-
A
bin/battery-linux
 | 
2
++

3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.i3/config b/.i3/config
@@ -136,6 +136,7 @@ bindsym $mod+space exec dmenu_run -nb \#222222 -nf \#888888 -sb \#333333 -sf \#f
 
 # change focus
 bindsym $mod+h focus left
+bindsym $mod+$alt+Shift+h focus left
 bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
diff --git a/.tmux.conf b/.tmux.conf
@@ -116,7 +116,8 @@ set -g status-left "#[fg=green]s:#S #[fg=yellow]w:#I #[fg=cyan]p:#P"
 #set -g status-right "#[fg=cyan]#(~/bin/battery) #[fg=yellow]#(cat /proc/loadavg|awk '{print $1;}') #[fg=green]%d %b %R"
 #
 #set -g status-right "#[fg=cyan]#(~/bin/battery) #[fg=yellow]#(uptime|awk '{print \$NF;}') #[fg=green]%d %b %R"
-set -g status-right "#[fg=cyan]#(~/bin/battery-osx) #[fg=yellow]#(uptime|awk '{print \$NF;}') #[fg=green]%d %b %R"
+if-shell 'uname | grep -qi Darwin' "set -g status-right \"#[fg=cyan]#(~/bin/battery-osx) #[fg=yellow]#(uptime|awk '{print \$NF;}') #[fg=green]%d %b %R\""
+if-shell 'uname | grep -qi Linux' "set -g status-right \"#[fg=cyan]#(acpi|sed 's/Battery//; s/0://; s/Discharging//; s/Full, //; s/remaining//; s/  , //; s/Charging, /+/; s/ until charged/ /; s/, / /; s/Unknown //; s/ $//;') #[fg=yellow]#(cat /proc/loadavg|awk '{print $1;}') #[fg=green]%d %b %R\""
 set -g status-justify centre
 #set -g status-bg default
 #set -g status-fg cyan
diff --git a/bin/battery-linux b/bin/battery-linux
@@ -0,0 +1,2 @@
+#!/bin/sh
+acpi | sed 's/Battery//; s/0://; s/Discharging//; s/Full, //; s/remaining//; s/  , //; s/Charging, /+/; s/ until charged/ /; s/, / /; s/Unknown //; s/ $//;'