sway: refactor base config

* use new custom 'gui' runlevel to launch kanshi/waybar
* remove oguri (for now)

2 files changed, 9 insertions, 11 deletions

diff --git a/.config/sway/binds.conf b/.config/sway/binds.conf
index 40728e5..ea8487e 100644
--- a/.config/sway/binds.conf
+++ b/.config/sway/binds.conf
@@ -32,7 +32,7 @@ bindsym $mod+Shift+e exec swaynag \
     -b 'poweroff' 'daos poweroff' \
     -b 'reboot' 'doas reboot'
 
-bindsym $mod+Shift+p exec $HOME/.dotfiles/bin/lock
+bindsym $mod+Shift+backspace exec lock
 
 bindsym $mod+Shift+s mode "screengrab"
 mode "screengrab" {
@@ -117,7 +117,7 @@ bindsym $mod+Bracketright splith
 
 # Make the current focus fullscreen
 bindsym $mod+f fullscreen
-bindsym $mod+Shift+f exec pkill -USR1 waybar
+bindsym $mod+Shift+f fullscreen global
 # Hide the topbar (also gets you more space)
 bindsym $mod+Shift+t bar mode toggle topbar; default_border pixel
 
diff --git a/.config/sway/config b/.config/sway/config
index ef764c0..8aea166 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,14 +1,15 @@
 # vim: ft=i3 fdm=marker
 
-output * scale 1
-exec doas /etc/init.d/kanshi restart
-
-# output * max_render_time 1
-# output * adaptive_sync on
+exec doas rc gui
 
 exec_always kanshictl reload
-exec_always exec sh -c 'pkill oguri && oguri'
+output * scale 1
+output * max_render_time 1
+output * adaptive_sync on
+output * bg $HOME/Pictures/IMG_20180616_170559.jpg fill
+output 'Dell Inc. DELL U2518D 3C4YP87AAK3L' bg $HOME/Pictures/IMG_20180506_171549.jpg fill
 
+# exec_always sh -c 'sleep 2 ; killall oguri ; oguri'
 exec light -S 80
 exec redshift
 exec mako
@@ -91,6 +92,3 @@ client.urgent $urgent2 $urgent $text $indicator $urgent
 
 # include config.d/*
 include "`uname -n`"
-
-exec_always kanshictl reload
-exec_always doas /etc/init.d/waybar restart