From dc2b1ce01fbc036e06441297fca979ad26e13468 Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sage@sagev.space>
Date: Tue, 9 Apr 2024 07:17:26 -0400
Subject: [PATCH] Wrap firefox launch in bash

Re-enable dconf diff viewing
---
 fake_home/.bin/ffx.sh |  2 +-
 fake_home/.zshrc      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fake_home/.bin/ffx.sh b/fake_home/.bin/ffx.sh
index 0804590..55f3ac0 100755
--- a/fake_home/.bin/ffx.sh
+++ b/fake_home/.bin/ffx.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 kill $(pgrep firefox)
-gnome-terminal -e "$HOME/.bin/update-firefox.sh && MOZ_ENABLE_WAYLAND=1 setsid $HOME/.bin/firefox-developer-edition/firefox-bin"
+gnome-terminal -- bash -c "$HOME/.bin/update-firefox.sh && MOZ_ENABLE_WAYLAND=1 setsid $HOME/.bin/firefox-developer-edition/firefox-bin"
 test -f "$HOME/.aws.exp" && bash -c "sleep 10; $HOME/.aws.exp" &> "$HOME/.aws.exp.log"
 
 wait
diff --git a/fake_home/.zshrc b/fake_home/.zshrc
index 3402696..93e46aa 100644
--- a/fake_home/.zshrc
+++ b/fake_home/.zshrc
@@ -204,15 +204,15 @@ function sync-dconf {
     rm $HOME/.tmp/dconf-dump &> /dev/null
     scp -P 11275 'sage@sagev.space:~/dconf-dump' $HOME/.tmp/dconf-dump
     dconf-dump > $HOME/.tmp/current-dconf-dump
-    # if ! git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump &> /dev/null; then
-    #     echo
-    #     echo "Incoming conf changes:"
-    #     echo
-    #     git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump
-    #     echo
-    #     bash -c 'read -p "Press enter to continue, or Ctrl-C to cancel."' || return 1
-    #     echo "Applying changes..."
-    # fi
+    if ! git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump &> /dev/null; then
+        echo
+        echo "Incoming conf changes:"
+        echo
+        git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump
+        echo
+        bash -c 'read -p "Press enter to continue, or Ctrl-C to cancel."' || return 1
+        echo "Applying changes..."
+    fi
     dconf load / < $HOME/.tmp/dconf-dump || return 1
     push-dconf
 }