Merge branch 'master' of https://github.com/heyjoeway/heyjoeway.github.io

Author: heyjoeway

src/feeds/meta/080525_0912PM/post.md

@@ -1 +1,4 @@
-please dear god (i got docker images working for this site!) 
+---
+hideHome: true
+---
+please dear god (i got docker images working for this site! [and maybe local auto-updates now?]) 

src/feeds/misc/081825_0856AM/post.md

@@ -0,0 +1,4 @@
+---
+hideHome: true
+---
+the best way to check if a repo is dead is to see how long non-bot PRs have been sitting idle

src/feeds/misc/091225_1156AM/post.md

@@ -0,0 +1,4 @@
+---
+hideHome: true
+---
+nearly every time I've gone shopping for the past 6 months the flag is at half mast, and I can't help but think now "great, what the FUCK could it be this time" 

src/feeds/misc/092625_0805PM/post.md

@@ -0,0 +1,4 @@
+---
+hideHome: true
+---
+desktop linux will never be taken seriously unless some organization develops an mdm solution instead of yet another desktop environment

src/routes/articles/notes-linux/+page.svx

@@ -65,7 +65,6 @@ echo "Unattended-Upgrade::Automatic-Reboot-WithUsers \"true\";" > /etc/apt/apt.c
 
 ```bash
 curl -fsSL https://get.docker.com | sh
-apt install -y docker-compose
 docker run --detach --name watchtower --restart unless-stopped --volume /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower
 ```
 

watchChanges.sh

@@ -19,6 +19,7 @@ EOF
     git config --unset-all http.https://github.com/.extraheader
     git config user.email "$GIT_EMAIL"
     git config user.name "$GIT_NAME"
+    git config pull.rebase false
 fi
 
 trap 'rm -f "$ASKPASS_SCRIPT"' EXIT
@@ -55,6 +56,7 @@ check_and_push_local_changes() {
                 echo "No local changes for 5 minutes. Pushing changes..."
                 git add -A
                 git commit -m "Auto-commit"
+                git_with_creds pull
                 git_with_creds push
                 break
             fi
@@ -87,4 +89,4 @@ if ! eval "$GIT_CREDS_PRESENT"; then
 else
     echo "Watching for changes in the directory..."
 fi
-watch_directory
+watch_directory