September Housekeeping (#6)

* Deprecate Mackup in my setup

Since macOS 14 (Sonoma), Mackup has been broken 😞

See here:
- lra/mackup#1924
- https://www.reddit.com/r/macapps/comments/1f1j41a/avoid_mackup_if_you_are_runing_sonoma_or_later/

There are some workarounds but I am taking this opportunity to just simplify my setup a bit

Most of my settings are not that precious that I rely on Mackup to perfectly replicate between machines; I can just do some manual configuration and get most of the way there

I'm removing references to Mackup and its configuration from this repo in this commit

* Update brewfile

Added new things since last time
- 1password-cli
- Keycastr

* Add setup steps for `.zshrc` and `.gitconfig`/`.gitignore`

I still want a way to "sync" my zshrc and git configuration, so I made a little set of instructions and manual steps to perform for this

Between VS Code tasks and README steps, it's here

* Clean up README

Some little things that annoyed me:

- Minor copy edits
- No longer need Obsidian symlink; we're using Obsidian Sync so the iCloud setup is unneeded

mackup/.gitconfig → .gitconfig

@@ -18,7 +18,7 @@
 [tag]
 	forceSignAnnotated = false
 [core]
-	excludesfile = ~/.gitignore
+	excludesfile = ~/.gitignore_global
 [pager]
 	branch = false
 [pull]

.vscode/tasks.json

@@ -4,18 +4,39 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Update Brewfile",
+      "label": "📝 Update Brewfile",
       "detail": "Dump currently-installed Homebrew packages into Brewfile and remove entries that are not installed",
       "group": "build",
       "type": "shell",
       "command": "brew bundle dump -f"
     },
     {
-      "label": "Mackup Backup",
-      "detail": "Backup settings with Mackup",
+      "label": "📝 Update repo: git",
+      "detail": "Copy git configuration from local machine to dotfiles repo",
       "group": "build",
       "type": "shell",
-      "command": "mackup backup"
+      "command": "cp ~/.gitconfig ~/Code/dotfiles/.gitconfig && cp ~/.gitignore_global ~/Code/dotfiles/.gitignore_global"
+    },
+    {
+      "label": "💻 Update Mac: git",
+      "detail": "Copy git configuration from dotfiles repo to local machine",
+      "group": "build",
+      "type": "shell",
+      "command": "cp ~/Code/dotfiles/.gitconfig ~/.gitconfig && cp ~/Code/dotfiles/.gitignore_global ~/.gitignore_global"
+    },
+    {
+      "label": "📝 Update repo: zshrc",
+      "detail": "Copy zsh configuration from local machine to dotfiles repo",
+      "group": "build",
+      "type": "shell",
+      "command": "cp ~/.zshrc ~/Code/dotfiles/.zshrc"
+    },
+    {
+      "label": "💻 Update Mac: zshrc",
+      "detail": "Copy zsh configuration from dotfiles repo to local machine",
+      "group": "build",
+      "type": "shell",
+      "command": "cp ~/Code/dotfiles/.zshrc ~/.zshrc"
     }
   ]
 }

Brewfile

@@ -32,11 +32,9 @@ brew "hivemind"
 brew "jasper"
 brew "shared-mime-info"
 brew "libheif"
-brew "libffi"
-brew "[email protected]"
 brew "libraw"
 brew "imagemagick"
-brew "mackup"
+brew "libffi"
 brew "mas"
 brew "nginx"
 brew "node"
@@ -47,6 +45,7 @@ brew "postgresql@12"
 brew "pyenv"
 brew "[email protected]"
 brew "[email protected]"
+brew "[email protected]"
 brew "qt"
 brew "ruby-build"
 brew "rbenv"
@@ -57,6 +56,7 @@ brew "youtube-dl"
 brew "zsh-git-prompt"
 brew "tidbyt/tidbyt/pixlet"
 cask "1password"
+cask "1password-cli"
 cask "authy"
 cask "bartender"
 cask "descript"
@@ -67,6 +67,7 @@ cask "freeze"
 cask "github"
 cask "google-chrome"
 cask "iterm2"
+cask "keycastr"
 cask "logitech-options"
 cask "menumeters"
 cask "monitorcontrol"