From a3aacb7415f889e6f32d7b12fac665c793a5c42f Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Fri, 27 Sep 2024 09:39:04 -0500
Subject: [PATCH 1/2] minor inconsequential updates

---
 create-cron-job.sh      | 11 -----------
 run-distro-de-script.sh |  3 +++
 sway/config             | 13 +++++++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100755 create-cron-job.sh

diff --git a/create-cron-job.sh b/create-cron-job.sh
deleted file mode 100755
index 1a84803..0000000
--- a/create-cron-job.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -e
-GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
-(
-    crontab -l 2>/dev/null
-    echo "* * * * * $GIT_DIR/commit.sh"
-) | crontab -
-
-############################################################################
-# NOTE: commit signing must be turned off, or not require any interaction. #
-############################################################################
diff --git a/run-distro-de-script.sh b/run-distro-de-script.sh
index 5215b2b..836ee7c 100755
--- a/run-distro-de-script.sh
+++ b/run-distro-de-script.sh
@@ -4,12 +4,15 @@ command_exists() { type "$1" &>/dev/null; }
 
 cd distro-specific-scripts/
 distro=""
+
 if command_exists "pacman"; then
     distro="arch"
 elif command_exists "dnf" || command_exists "rpm-ostree"; then
     distro="fedora"
 elif command_exists "xbps-install"; then
     distro="void"
+else
+    exit
 fi
 
 ./${distro}-${XDG_CURRENT_DESKTOP}.sh
diff --git a/sway/config b/sway/config
index 5a71bca..d6a780e 100644
--- a/sway/config
+++ b/sway/config
@@ -137,6 +137,7 @@ exec waybar
 # Workspaces:
 #
     # Switch to workspace
+<<<<<<< Updated upstream
     bindsym $mod+1 exec "~/.config/sway/switch-workspace.sh 1"
     bindsym $mod+2 exec "~/.config/sway/switch-workspace.sh 2"
     bindsym $mod+3 exec "~/.config/sway/switch-workspace.sh 3"
@@ -147,6 +148,18 @@ exec waybar
     bindsym $mod+8 exec "~/.config/sway/switch-workspace.sh 8"
     bindsym $mod+9 exec "~/.config/sway/switch-workspace.sh 9"
     bindsym $mod+0 exec "~/.config/sway/switch-workspace.sh 10"
+=======
+    bindsym $mod+1 exec '~/.config/sway/switch-workspace.sh 1'
+    bindsym $mod+2 exec '~/.config/sway/switch-workspace.sh 2'
+    bindsym $mod+3 exec '~/.config/sway/switch-workspace.sh 3'
+    bindsym $mod+4 exec '~/.config/sway/switch-workspace.sh 4'
+    bindsym $mod+5 exec '~/.config/sway/switch-workspace.sh 5'
+    bindsym $mod+6 exec '~/.config/sway/switch-workspace.sh 6'
+    bindsym $mod+7 exec '~/.config/sway/switch-workspace.sh 7'
+    bindsym $mod+8 exec '~/.config/sway/switch-workspace.sh 8'
+    bindsym $mod+9 exec '~/.config/sway/switch-workspace.sh 9'
+    bindsym $mod+0 exec '~/.config/sway/switch-workspace.sh 10'
+>>>>>>> Stashed changes
     bindsym $mod+equal workspace side
     # Move focused container to workspace
     bindsym $mod+Shift+1 move container to workspace number 1

From 6cddb84903ef28ca4e072557321be07260bc043d Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Fri, 27 Sep 2024 09:40:00 -0500
Subject: [PATCH 2/2] fix the merge conflict. i already did this, why did it
 not get committed

---
 sway/config | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/sway/config b/sway/config
index d6a780e..5a71bca 100644
--- a/sway/config
+++ b/sway/config
@@ -137,7 +137,6 @@ exec waybar
 # Workspaces:
 #
     # Switch to workspace
-<<<<<<< Updated upstream
     bindsym $mod+1 exec "~/.config/sway/switch-workspace.sh 1"
     bindsym $mod+2 exec "~/.config/sway/switch-workspace.sh 2"
     bindsym $mod+3 exec "~/.config/sway/switch-workspace.sh 3"
@@ -148,18 +147,6 @@ exec waybar
     bindsym $mod+8 exec "~/.config/sway/switch-workspace.sh 8"
     bindsym $mod+9 exec "~/.config/sway/switch-workspace.sh 9"
     bindsym $mod+0 exec "~/.config/sway/switch-workspace.sh 10"
-=======
-    bindsym $mod+1 exec '~/.config/sway/switch-workspace.sh 1'
-    bindsym $mod+2 exec '~/.config/sway/switch-workspace.sh 2'
-    bindsym $mod+3 exec '~/.config/sway/switch-workspace.sh 3'
-    bindsym $mod+4 exec '~/.config/sway/switch-workspace.sh 4'
-    bindsym $mod+5 exec '~/.config/sway/switch-workspace.sh 5'
-    bindsym $mod+6 exec '~/.config/sway/switch-workspace.sh 6'
-    bindsym $mod+7 exec '~/.config/sway/switch-workspace.sh 7'
-    bindsym $mod+8 exec '~/.config/sway/switch-workspace.sh 8'
-    bindsym $mod+9 exec '~/.config/sway/switch-workspace.sh 9'
-    bindsym $mod+0 exec '~/.config/sway/switch-workspace.sh 10'
->>>>>>> Stashed changes
     bindsym $mod+equal workspace side
     # Move focused container to workspace
     bindsym $mod+Shift+1 move container to workspace number 1