From 23a1f61aaf2144d071025e6e6b618007df648296 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin@aminb.org>
Date: Sat, 4 Feb 2017 22:15:00 -0500
Subject: [PATCH] bspwm and sxhkd config updates

---
 bspwm/.config/bspwm/bspwmrc    | 14 +++++++++++---
 bspwm/.local/bin/toggle_tray   | 16 ----------------
 sxhkd/.config/sxhkd/sxhkdrc    | 13 ++++++++++++-
 sxhkd/.local/bin/toggle-layout |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100755 bspwm/.local/bin/toggle_tray

diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 6601cf8..c7ffee5 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -1,11 +1,16 @@
 #! /bin/sh
 
 sxhkd &
+# sleep .25
+xfce4-panel -d &
+connman-gtk &
+pnmixer &
+sh ~/.fehbg &
 
 bspc monitor -d I II III IV V VI VII VIII IX X
 
 bspc config border_width         2
-bspc config window_gap          12
+bspc config window_gap          10
 #bspc config bottom_padding         32
 
 # bspc config split_ratio          0.52
@@ -16,6 +21,9 @@ bspc config gapless_monocle      true
 bspc rule -a Firefox desktop='^1' follow=on
 bspc rule -a Emacs desktop='^2' state=tiled follow=on
 bspc rule -a Chromium desktop='^4' follow=on
-bspc rule -a Termite state=floating
 bspc rule -a URxvt state=floating
-bspc rule -a qterminal state=floating
+bspc rule -a URxvt:tiled state=tiled       
+bspc rule -a Connman-gtk state=floating
+bspc rule -a Xfce4-panel state=floating
+bspc rule -a TelegramDesktop state=floating      
+bspc rule -a Ec state=floating
diff --git a/bspwm/.local/bin/toggle_tray b/bspwm/.local/bin/toggle_tray
deleted file mode 100755
index c081995..0000000
--- a/bspwm/.local/bin/toggle_tray
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# from https://github.com/kallith/Dotfiles
-
-if [ $(pgrep -cf stalonetray) -gt 0 ]; then
-	wid=$(xdotool search --class stalonetray)
-	if [ "$(xdotool search --onlyvisible --class stalonetray)" != "" ]; then
-		xdotool windowunmap $wid
-	else
-		xdotool windowmap $wid
-		xdotool windowraise $wid
-	fi
-else
-	xdotool search --class stalonetray
-	stalonetray
-fi
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 461d1cd..07ab0e0 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -5,11 +5,21 @@
 # terminal emulator
 super + Return
 	urxvt
+super + shift + Return
+	urxvt -name tiled
 
 # program launcher
 super + space
 	rofi -show run -font "Inconsolata 13"
 
+# rofi-pass
+super + shift + space
+	rofi-pass
+
+# teiler
+super + shift + s
+	teiler
+
 super + z ; t
 	urxvt
 
@@ -27,6 +37,7 @@ super + z ; f
 # emacs
 super + e
 	emacs
+#	emacs -Q -l src/elisp/oremacs/init.el
 
 # stalonetray
 #super + minus
@@ -53,7 +64,7 @@ XF86AudioMute
 #	kbdlight {up,down}
 
 XF86LaunchA
-  toggle-layout
+  /home/amin/.local/bin/toggle-layout
 
 # make sxhkd reload its configuration files:
 super + Escape
diff --git a/sxhkd/.local/bin/toggle-layout b/sxhkd/.local/bin/toggle-layout
index cb259b4..5df7e2f 100755
--- a/sxhkd/.local/bin/toggle-layout
+++ b/sxhkd/.local/bin/toggle-layout
@@ -6,5 +6,5 @@ if [ "$lang" = "us" ]; then
     setxkbmap ir
 else
     setxkbmap us
-    xmodmap $HOME/.Xmodmap
+    #xmodmap $HOME/.Xmodmap
 fi
-- 
2.20.1