From d26f8971d02684caf6e89e88d2611ab80d7612c0 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Thu, 6 Jul 2023 12:21:45 -0400
Subject: [PATCH 1/4] Fix bash formatting

---
 bash/bash_login.host | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bash/bash_login.host b/bash/bash_login.host
index fd3902d91..7335d8745 100644
--- a/bash/bash_login.host
+++ b/bash/bash_login.host
@@ -2,16 +2,16 @@
 
 ## Configure static SSH Agent
 export SSH_AUTH_SOCK="$HOME/.spool/ssh-agent.sock"
-if [ -e $SSH_AUTH_SOCK ]; then
-	rm $SSH_AUTH_SOCK
+if [ -e "$SSH_AUTH_SOCK" ]; then
+	rm "$SSH_AUTH_SOCK"
 fi
-if [ -e "$HOME/.spool/ssh-agent.env "]; then
+if [ -e "$HOME/.spool/ssh-agent.env" ]; then
 	rm "$HOME/.spool/ssh-agent.env"
 fi
 if [[ "$(pgrep ssh-agent)" ]]; then
 	pkill ssh-agent
 fi
-. "$HOME/scripts/ssh-agent.sh"
+. ${HOME}/scripts/ssh-agent.sh
 
 # Static/predictable Sway socket
 export SWAYSOCK="$HOME/.spool/sway-ipc.sock"

From 8b1506e545f4a445c1af7156c95d94dd2d450a6d Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Thu, 6 Jul 2023 12:22:15 -0400
Subject: [PATCH 2/4] Wrong place to run ssh-agent

---
 bash/bashrc.host | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/bash/bashrc.host b/bash/bashrc.host
index 736360d03..c5a623978 100644
--- a/bash/bashrc.host
+++ b/bash/bashrc.host
@@ -4,15 +4,5 @@
 export EDITOR="flatpak run io.neovim.nvim"
 
 export SSH_AUTH_SOCK="$HOME/.spool/ssh-agent.sock"
-if [ -z "$SSH_AGENT_PID" ]; then
-    if [ -f "$HOME/.spool/ssh-agent.env" ]; then
-        source "$HOME/.spool/ssh-agent.env" >/dev/null
-    else
-        if [ ! -f "$SSH_AUTH_SOCK" ]; then
-            touch "$SSH_AUTH_SOCK"
-        fi
-        $HOME/scripts/ssh-agent.sh
-    fi
-fi
 
 echo "This is the host OS. You probably want to open a Distrobox."

From 1b013f0aea1eb1d7e62665afc4115e779e2726b5 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Thu, 6 Jul 2023 12:27:35 -0400
Subject: [PATCH 3/4] Start ssh-agent in sway config

---
 sway/autostart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sway/autostart b/sway/autostart
index ad371d298..261650bac 100644
--- a/sway/autostart
+++ b/sway/autostart
@@ -5,6 +5,9 @@
 # Background utilities
 ################################################################################
 
+# Start ssh-agent
+exec "${HOME}/scripts/ssh-agent.sh" &
+
 # Automatically restore last used output configuration
 # TODO: Need to add fail-safe to script in case the outputs are unavailable
 exec ${HOME}/scripts/distrobox/debian/displays.sh &

From ae72619ae9c043f660560f63fe868c048f8314f4 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Thu, 6 Jul 2023 12:27:49 -0400
Subject: [PATCH 4/4] Fix formatting

---
 sway/autostart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sway/autostart b/sway/autostart
index 261650bac..49b138e97 100644
--- a/sway/autostart
+++ b/sway/autostart
@@ -10,11 +10,11 @@ exec "${HOME}/scripts/ssh-agent.sh" &
 
 # Automatically restore last used output configuration
 # TODO: Need to add fail-safe to script in case the outputs are unavailable
-exec ${HOME}/scripts/distrobox/debian/displays.sh &
+exec "${HOME}/scripts/distrobox/toolbox/displays.sh" &
 
 # Enable automatic color temperature change
-exec ${HOME}/scripts/distrobox/debian/gammastep.pl &
-exec ${HOME}/.local/bin/wl-gammactl -c -1.000 -b 2.000 -g 0.500 -m DP-1 &
+exec "${HOME}/scripts/distrobox/debian/gammastep.pl" &
+exec "${HOME}/.local/bin/wl-gammactl" -c -1.000 -b 2.000 -g 0.500 -m DP-1 &
 
 # Window transparency
 exec systemctl --user restart sway-transparency.service &
@@ -69,4 +69,4 @@ exec flatpak run com.github.Murmele.Gittyup &
 exec flatpak run com.github.Eloston.UngoogledChromium --app="https://papillon.john.me.tz" --socket=wayland --ozone-platform=wayland --enable-reatures=UseOzonePlatform &
 
 # Assign workspaces to outputs
-exec $HOME/scripts/sway/arrange.pl &
+exec "${HOME}/scripts/sway/arrange.pl" &