Add polybar and change bspwm config

4 files changed, 43 insertions, 40 deletions

diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 073109d..f5ba92a 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -3,25 +3,22 @@
 # Started by nixos
 # sxhkd &
 
-bspc monitor -d 1 2 3 4 5 6 7 8 9
+bspc monitor -d 1 2 3 4 5 6 7 8 9 0
 
 bspc config border_width		3
-bspc config window_gap			12
+bspc config window_gap			10
 
 bspc config split_ratio			0.52
 bspc config borderless_monocle	true
 bspc config gapless_monocle		true
 bspc config single_monocle false
 
-bspc config bottom_padding 16
-
-bspc config pointer_modifier mod1
+bspc config pointer_modifier mod4
 
 bspc config remove_unplugged_monitors true
 bspc config remove_disabled_monitors true
 
 # Just some rules
-bspc rule -a evolution desktop=^8
 bspc rule -a firefox desktop=^9
 
 # Colors
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index 7dc55e0..2323340 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -1,15 +1,12 @@
 
-alt + i
+super + i
 	termite
 
-alt + w
-	./Scripts/lc common
-
 # program launcher
-alt + d
+super + d
 	rofi -show drun
 
-alt + semicolon
+super + semicolon
 	Scripts/lc --dmenu
 
 # Sound buttons
@@ -20,32 +17,41 @@ XF86MonBrightnessDown
 	xbacklight -dec 5
 
 XF86AudioRaiseVolume
-	pactl set-sink-volume 0 +5%
+	Scripts/volume volumeup
 
 XF86AudioLowerVolume
-	pactl set-sink-volume 0 -5%
+	Scripts/volume volumedown
 
 XF86AudioMute
-	pactl set-sink-mute 0 toggle
+	Scripts/volume volumetoggle
+
+XF86AudioPlay
+	Scripts/volume playtoggle
+Pause
+	Scripts/volume playtoggle
+XF86AudioPrev
+	Scripts/volume backward
+XF86AudioNext
+	Scripts/volume forward
 
 # quit/restart bspwm
-alt + shift + {e,r}
+super + shift + {e,r}
 	bspc {quit,wm -r}
 
 # close and kill
-alt + shift + q
+super + q
 	bspc node -c
 
-# alternate between the tiled and monocle layout
-alt + m
+# superernate between the tiled and monocle layout
+super + m
 	bspc desktop -l next
 
 # send the newest marked node to the newest preselected node
-alt + y
+super + y
 	bspc node newest.marked.local -n newest.!automatic.local
 
 # swap the current node and the biggest node
-alt + g
+super + g
 	bspc node -s biggest
 
 #
@@ -53,11 +59,11 @@ alt + g
 #
 
 # set the window state
-alt + {t,shift + t,s,f}
+super + {t,shift + t,s,f}
 	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
 
 # set the node flags
-alt + ctrl + {m,x,y,z}
+super + ctrl + {m,x,y,z}
 	bspc node -g {marked,locked,sticky,private}
 
 #
@@ -65,33 +71,33 @@ alt + ctrl + {m,x,y,z}
 #
 
 # focus the node in the given direction
-alt + {_,shift + }{h,j,k,l}
+super + {_,shift + }{h,j,k,l}
 	bspc node -{f,s} {west,south,north,east}
 
 # focus the node for the given path jump
-alt + {p,b,comma,period}
+super + {p,b,comma,period}
 	bspc node -f @{parent,brother,first,second}
 
 # focus the next/previous node in the current desktop
-alt + {_,shift + }c
+super + {_,shift + }c
 	bspc node -f {next,prev}.local
 
 # focus the next/previous desktop in the current monitor
-alt + bracket{left,right}
+super + bracket{left,right}
 	bspc desktop -f {prev,next}.local
 
 # focus the last node/desktop
-alt + {grave,Tab}
+super + {grave,Tab}
 	bspc {node,desktop} -f last
 
 # focus the older or newer node in the focus history
-alt + {_, shift + }o}
+super + {_, shift + }o}
 	bspc wm -h off; \
 	bspc node {newer,older} -f; \
 	bspc wm -h on
 
 # focus or send to the given desktop
-alt + {_,shift + }{1-9,0}
+super + {_,shift + }{1-9,0}
 	bspc {desktop -f,node -d} '^{1-9,10}'
 
 #
@@ -99,19 +105,19 @@ alt + {_,shift + }{1-9,0}
 #
 
 # preselect the direction
-alt + ctrl + {h,j,k,l}
+super + ctrl + {h,j,k,l}
 	bspc node -p {west,south,north,east}
 
 # preselect the ratio
-alt + ctrl + {1-9}
+super + ctrl + {1-9}
 	bspc node -o 0.{1-9}
 
 # cancel the preselection for the focused node
-alt + ctrl + space
+super + ctrl + space
 	bspc node -p cancel
 
 # cancel the preselection for the focused desktop
-alt + ctrl + shift + space
+super + ctrl + shift + space
 	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
 
 #
@@ -119,15 +125,15 @@ alt + ctrl + shift + space
 #
 
 # expand a window by moving one of its side outward
-alt + shift + {Left,Down,Up,Right}
+super + shift + {Left,Down,Up,Right}
 	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
 
 # contract a window by moving one of its side inward
-alt + ctrl + shift + {Left,Down,Up,Right}
+super + ctrl + shift + {Left,Down,Up,Right}
 	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
 
 # move a floating window
-alt + {Left,Down,Up,Right}
+super + {Left,Down,Up,Right}
 	bspc node -v {-20 0,0 20,0 -20,20 0}
 
 
diff --git a/bspwm/.xinitrc b/bspwm/.xinitrc
index c805667..55fba13 100644
--- a/bspwm/.xinitrc
+++ b/bspwm/.xinitrc
@@ -1,8 +1,8 @@
 
-export LOPTS="panel"
+export LOPTS="panel composer gnome-keyring"
 # Launch other stuff
+source ~/.xprofile
 source ~/Scripts/xlaunchrc
 
 sxhkd &
 exec bspwm
-# exec i3
diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
index fe98024..fa0d9ea 100755
--- a/xinit/Scripts/xlaunchrc
+++ b/xinit/Scripts/xlaunchrc
@@ -28,7 +28,7 @@ do
     case $arg in
         panel)
             echo starting panel
-            xfce4-panel &
+            polybar main &
             ;;
         composer)
             echo starting comp