From 0413498c5b0797d1c5000ec1e88bc1828e6de3db Mon Sep 17 00:00:00 2001
From: Marcus Crane <marcus@utf9k.net>
Date: Mon, 8 Jan 2024 13:39:02 +1300
Subject: [PATCH] Rearrange some scripts

Signed-off-by: Marcus Crane <marcus@utf9k.net>
---
 run_after_configure_dock-darwin.sh.tmpl      |  1 +
 run_once_01_packages-darwin.sh.tmpl          | 11 +++++++----
 run_once_03_atuin.sh => run_once_02_atuin.sh |  0
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename run_once_03_atuin.sh => run_once_02_atuin.sh (100%)

diff --git a/run_after_configure_dock-darwin.sh.tmpl b/run_after_configure_dock-darwin.sh.tmpl
index 4924fc5..82ec9b5 100644
--- a/run_after_configure_dock-darwin.sh.tmpl
+++ b/run_after_configure_dock-darwin.sh.tmpl
@@ -10,6 +10,7 @@ set -eufo pipefail
   "/Applications/Plexamp.app"
   "/Applications/Obsidian.app"
   "/Applications/TraktCasts.app"
+  "/Applications/iA Writer.app"
 }}
 
 {{ if .workmode }}{{ $apps = append $apps "/Applications/Slack.app" }}{{ end }}
diff --git a/run_once_01_packages-darwin.sh.tmpl b/run_once_01_packages-darwin.sh.tmpl
index 3009f90..eded76a 100644
--- a/run_once_01_packages-darwin.sh.tmpl
+++ b/run_once_01_packages-darwin.sh.tmpl
@@ -10,7 +10,6 @@ tap "homebrew/cask-fonts"
 tap "homebrew/cask-versions"
 
 # Community taps
-tap "common-fate/granted"
 tap "espanso/espanso"
 tap "go-task/tap"
 tap "jdx/tap"
@@ -18,10 +17,16 @@ tap "railwaycat/emacsmacport"
 tap "vectordotdev/brew"
 tap "yt-dlp/taps"
 
+# Work taps
+{{ if .workmode }}
+tap "common-fate/granted"
+{{ end }}
+
 # my own projects
 tap "marcus-crane/tap"
 brew "khinsider"
 brew "spanner"
+cask "october", args: { force: true } # Hey, that's me!
 
 # cli tools
 brew "angle-grinder"
@@ -29,7 +34,6 @@ brew "aria2"
 brew "autoconf"
 brew "automake"
 brew "bash"
-brew "bat"
 brew "bison"
 brew "cmake"
 brew "comby"
@@ -65,6 +69,7 @@ brew "jq"
 brew "libiconv"
 brew "librdkafka"
 brew "libxmlsec1"
+brew "moreutils"
 brew "mpv"
 brew "mtr"
 brew "neomutt"
@@ -135,8 +140,6 @@ cask "iterm2", args: { force: true }
 cask "keka", args: { force: true }
 cask "kekaexternalhelper", args: { force: true }
 cask "obsidian", args: { force: true }
-cask "october", args: { force: true } # Hey, that's me!
-cask "postgres-unofficial", args: { force: true }
 cask "plexamp", args: { force: true }
 cask "pycharm", args: { force: true }
 cask "raycast", args: { force: true }
diff --git a/run_once_03_atuin.sh b/run_once_02_atuin.sh
similarity index 100%
rename from run_once_03_atuin.sh
rename to run_once_02_atuin.sh