From 98c151aff6b2fc04c8520bf32a71260e7c80fa9f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 28 May 2020 08:47:55 -0500
Subject: [PATCH] More sway configuration

---
 apps/de/bspwm/wallpapers       |  2 +-
 apps/de/mako/config            |  2 ++
 apps/de/sway/config            |  1 +
 bin/is_wayland                 |  2 +-
 env/desktop/sway/config.d/main | 12 ++++++------
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/de/bspwm/wallpapers b/apps/de/bspwm/wallpapers
index d5a1bcd..be8102e 100755
--- a/apps/de/bspwm/wallpapers
+++ b/apps/de/bspwm/wallpapers
@@ -1,2 +1,2 @@
 #!/bin/sh
-feh --no-fehbg --bg-scale '/home/daniel/.home/.wallpaper'
+feh --no-fehbg --bg-fill '/home/daniel/.home/../img/walls/530895_souredapple_clouds.png' 
diff --git a/apps/de/mako/config b/apps/de/mako/config
index 70ef95b..5ac66b0 100644
--- a/apps/de/mako/config
+++ b/apps/de/mako/config
@@ -6,6 +6,8 @@ font=iosevka-lyte 11
 progress-color=source #33333388
 # format="<b>%s</b>
 default-timeout=15000
+# history=1
+# max-history=100
 
 [urgency="high"]
 background-color=#f92672
diff --git a/apps/de/sway/config b/apps/de/sway/config
index af3a56f..b138baa 100644
--- a/apps/de/sway/config
+++ b/apps/de/sway/config
@@ -158,6 +158,7 @@ client.focused          #66d9ef #66d9ef #66d9ef #66d9ef #66d9ef
 client.focused_inactive #111111 #111111 #ffffff #111111 #111111
 client.unfocused        #111111 #111111 #ffffff #111111 #111111
 
+exec mako
 exec_always makoctl reload
 exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded."
 
diff --git a/bin/is_wayland b/bin/is_wayland
index f0a1759..60c9321 100755
--- a/bin/is_wayland
+++ b/bin/is_wayland
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-loginctl show-session "$(loginctl | grep "$(whoami)" | tail -n 1 | field 1)" -p Type | grep -i wayland >/dev/null
+loginctl show-session "$(loginctl | grep "$(whoami)" | head -n 1 | field 1)" -p Type | grep -i wayland >/dev/null
diff --git a/env/desktop/sway/config.d/main b/env/desktop/sway/config.d/main
index 4efb49a..e7a3927 100644
--- a/env/desktop/sway/config.d/main
+++ b/env/desktop/sway/config.d/main
@@ -1,12 +1,12 @@
-output DP-1 res 3440x1440@100Hz pos 0     0
-output DP-3 res 2560x1440@60Hz  pos -1440 0 transform 270
-output DP-4 res 2560x1440@60Hz  pos 3440  0 transform 270
+output DP-1 res 3440x1440@100Hz pos 1440 560
+output DP-2 res 2560x1440@60Hz  pos 0    0   transform 90
+output DP-4 res 2560x1440@60Hz  pos 4880 0   transform 270
 workspace 1 output DP-1
 workspace 2 output DP-1
 workspace 3 output DP-1
 workspace 4 output DP-4
 workspace 5 output DP-4
 workspace 6 output DP-4
-workspace 7 output DP-3
-workspace 8 output DP-3
-workspace 9 output DP-3
+workspace 7 output DP-2
+workspace 8 output DP-2
+workspace 9 output DP-2