From 502b8214fa1dbf9840a50af9fe7f7a4792364c05 Mon Sep 17 00:00:00 2001
From: Christian Emmer <10749361+emmercm@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:53:50 -0700
Subject: [PATCH] 4/5/2024

---
 .20_git.bash | 2 ++
 settings.sh  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.20_git.bash b/.20_git.bash
index dbdde87..554d944 100644
--- a/.20_git.bash
+++ b/.20_git.bash
@@ -1,6 +1,7 @@
 # Don't use the git from macOS, use the Homebrew version instead
 if [[ -x "$(command -v brew)" && ! -f "$(brew --prefix)/bin/git" ]]; then
     brew install git
+    brew link --overwrite git
 fi
 
 if [[ ! -x "$(command -v git)" ]]; then
@@ -35,6 +36,7 @@ __git_funcs() {
     done
 
     gempty() {
+        git reset
         git commit --allow-empty --message='Empty commit'
     }
 
diff --git a/settings.sh b/settings.sh
index f7d6d8d..fe5261a 100755
--- a/settings.sh
+++ b/settings.sh
@@ -34,6 +34,7 @@ if [[ "${OSTYPE:-}" == "darwin"* ]]; then
     defaults write .GlobalPreferences com.apple.sound.beep.feedback -bool true
 
     # ***** Settings > Focus *****
+    # TODO: remove DND schedules / disable DND
 
     # ***** Settings > Screen Time *****
 
@@ -78,7 +79,7 @@ if [[ "${OSTYPE:-}" == "darwin"* ]]; then
     # Magnification: off
     defaults write com.apple.dock magnification -bool false
     # Position on screen: bottom
-    defaults write com.apple.dock orientation -string bottom
+    defaults write com.apple.dock orientation -string "bottom"
     # Automatically hide and show the dock: false
     defaults write com.apple.dock autohide -bool false
     # Show indicators for open applications: true
@@ -131,6 +132,8 @@ if [[ "${OSTYPE:-}" == "darwin"* ]]; then
     # Turn off text replacements (requires restart?)
     defaults write .GlobalPreferences WebAutomaticTextReplacementEnabled -bool false
     # TODO: keyboard brightness
+    # macOS Sonoma v14 "redesigned insertion point"
+    sudo defaults write /Library/Preferences/FeatureFlags/Domain/UIKit.plist redesigned_text_cursor -dict-add Enabled -bool YES
 
     # ***** Settings > Mouse *****
     defaults write .GlobalPreferences com.apple.mouse.scaling -1