From 637d89896a060c77731bbe746f884e2982d63991 Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com>
Date: Sun, 25 Mar 2018 16:25:53 -0400
Subject: [PATCH] Realms-related and other changes to Sway recipes

---
 meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb     | 4 ++--
 meta-citadel/recipes-sway/sgstatus/sgstatus_0.1.0.bb | 4 ++--
 meta-citadel/recipes-sway/sway/files/config          | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb b/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb
index c3d2d32..d82f8ab 100644
--- a/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb
+++ b/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb
@@ -8,10 +8,10 @@ inherit cargo
 # how to get sgmenu could be as easy as but default to a git checkout:
 # SRC_URI += "crate://crates.io/sgmenu/0.1.0"
 SRC_URI += "git://github.com/subgraph/sgmenu;protocol=https"
-SRCREV = "67b2105944771207b8735305bed9226136711467"
+SRCREV = "00a379f414095946a5ccad177d609df8f8cf05cc"
 S = "${WORKDIR}/git"
 CARGO_SRC_DIR=""
-PV_append = ".AUTOINC+67b2105944"
+PV_append = ".AUTOINC+00a379f414"
 
 # please note if you have entries that do not begin with crate://
 # you must change them to how that package can be fetched
diff --git a/meta-citadel/recipes-sway/sgstatus/sgstatus_0.1.0.bb b/meta-citadel/recipes-sway/sgstatus/sgstatus_0.1.0.bb
index 80b0381..8bd14f5 100644
--- a/meta-citadel/recipes-sway/sgstatus/sgstatus_0.1.0.bb
+++ b/meta-citadel/recipes-sway/sgstatus/sgstatus_0.1.0.bb
@@ -8,10 +8,10 @@ inherit cargo
 # how to get sgstatus could be as easy as but default to a git checkout:
 # SRC_URI += "crate://crates.io/sgstatus/0.1.0"
 SRC_URI += "git://github.com/subgraph/sgstatus;protocol=https"
-SRCREV = "e166f472f58dbbe615e7d83032fadaf00a4b71be"
+SRCREV = "a39d5627de38507458fd4f6a5f624ae5faaf797c"
 S = "${WORKDIR}/git"
 CARGO_SRC_DIR=""
-PV_append = ".AUTOINC+e166f472f5"
+PV_append = ".AUTOINC+a39d5627de"
 
 # please note if you have entries that do not begin with crate://
 # you must change them to how that package can be fetched
diff --git a/meta-citadel/recipes-sway/sway/files/config b/meta-citadel/recipes-sway/sway/files/config
index e3cbd43..e5a638a 100644
--- a/meta-citadel/recipes-sway/sway/files/config
+++ b/meta-citadel/recipes-sway/sway/files/config
@@ -16,9 +16,9 @@ set $up k
 set $right l
 
 # Your preferred terminal emulator - script command to appease pty requirement of machinectl
-set $term /usr/bin/sgmenu -c '/run/appimg/run-in-image gnome-terminal'
+set $term /usr/bin/sgmenu -c '/usr/bin/realms run -- gnome-terminal'
 set $citadelterm gnome-terminal
-set $filemanager /usr/bin/sgmenu -c '/run/appimg/run-in-image nautilus'
+set $filemanager /usr/bin/sgmenu -c '/usr/bin/realms run -- nautilus'
 set $lockscreen swaylock --scaling fill -i /usr/share/backgrounds/gnome/Dark_Ivy.jpg
 
 # Your preferred application launcher
@@ -27,7 +27,7 @@ set $menu /usr/bin/sgmenu -d
 ### Output configuration
 #
 # Default wallpaper 
-output * bg /usr/share/backgrounds/gnome/Waterfalls.jpg fill
+output * bg /usr/share/backgrounds/gnome/Flowerbed.jpg fill
 
 #
 # Example configuration:
@@ -222,6 +222,7 @@ smart_gaps on
 #
 # Startup Commands:
 #
+exec systemctl --user restart pulseaudio.service
 exec /usr/bin/start-pulseaudio-x11
 exec /usr/libexec/gsd-power
 exec /usr/libexec/gsd-sound
@@ -240,7 +241,7 @@ bar {
     }
     status_command /usr/libexec/sgstatus
 
-	icon_theme Paper
+    icon_theme Paper
 }
 
 include /etc/sway/config.d/*