From 8b122b8b482bbae40c7434f765938c01b17b470c Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 30 Aug 2018 17:26:05 +0100
Subject: [PATCH] update pkgs, dirs, add trayer for system tray, adapt bar to
 automatically pad for trayers icons

---
 dirs.sh          |  5 ++---
 pkgs.sh          | 14 +++++++++++---
 x/.local/bin/bar |  5 ++++-
 x/.xinitrc       |  6 ++----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/dirs.sh b/dirs.sh
index e0650ff..df73377 100644
--- a/dirs.sh
+++ b/dirs.sh
@@ -1,7 +1,6 @@
-mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,newsboat,tmux}
+mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,tmux}
 mkdir -pv ~/.mutt
 mkdir -pv ~/.gnupg
 mkdir -pv ~/.vim/{ftplugin,after/ftplugin,autoload,bundle,spell,pack/plugins/{opt,start}}
-mkdir -pv ~/.{local/bin,config/{i3,i3status}}
-mkdir -pv ~/.{ncmpcpp,config/mpd}
+mkdir -pv ~/.local/bin
 chmod 700 ~/.gnupg
diff --git a/pkgs.sh b/pkgs.sh
index cad0345..4cee859 100644
--- a/pkgs.sh
+++ b/pkgs.sh
@@ -1,9 +1,14 @@
 sudo apt-get install \
 	bash-completion \
 	build-essential \
+	curl \
 	dunst \
 	firefox-esr \
 	git \
+	imagemagick\
+	khal \
+	khard \
+	libnotify-bin \
 	man-db \
 	msmtp \
 	mutt  \
@@ -14,13 +19,16 @@ sudo apt-get install \
 	pass \
 	pinentry-qt \
 	psmisc \
-	tmux \
+	slop \
 	stow \
 	suckless-tools \
+	tmux \
 	unzip \
+	vdirsyncer \
 	vim \
 	w3m \
 	x11-xserver-utils  \
-	xinit \
-	xautolock
+	xautolock \
+	xinit
+
 mkdir -p ~/projects
diff --git a/x/.local/bin/bar b/x/.local/bin/bar
index 33e1fa4..c1a061b 100755
--- a/x/.local/bin/bar
+++ b/x/.local/bin/bar
@@ -13,9 +13,12 @@ if ip -br a | grep -q '^wlp'; then
 	fi
 fi
 
+eval $(xdotool search --onlyvisible trayer getwindowgeometry --shell)
+
 echo \
 	"W $wlan"\
 	"♪ $(pactl list sinks | grep -Po "(?<=Volume: front)[^%]*" | grep -o "100$") |"\
 	"⚡$bat"\
 	"Dsk: $(df -h | grep '/$' | awk '{print $4"/"$2}') |"\
-	"$(date +"%Y-%m-%d %H:%M:%S")"
+	"$(date +"%Y-%m-%d %H:%M:%S") "\
+	"$(printf "% $(((WIDTH-2)/10))s")"
diff --git a/x/.xinitrc b/x/.xinitrc
index 5007142..7966201 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,10 +1,8 @@
 #!/bin/bash
-PATH=$PATH:~/.local/bin
-
 #To fix java applications in tiling (e.g. arduino)
 export _JAVA_AWT_WM_NONREPARENTING=1
-xautolock -locker ~/.local/bin/lock.sh &
 dunst &
+trayer --align right --widthtype request --SetPartialStrut false --height 22 &
 
 eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources
@@ -17,4 +15,4 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 while true; do xsetroot -name "$(bar)"; sleep 1m; done &
-while true; do dwm >dwm.log 2>&1; done
+while true; do dwm 1>/tmp/dwm.log 2>&1; done
-- 
2.20.1