From 7a50d23dcaab26a4a08a867e0fb78f6167af8b7e Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@technomadic.org>
Date: Mon, 24 Feb 2025 10:28:22 -0700
Subject: [PATCH 1/4] Add some VS Code config

---
 nix/modules/programming/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nix/modules/programming/default.nix b/nix/modules/programming/default.nix
index d9c2604..2cb2252 100644
--- a/nix/modules/programming/default.nix
+++ b/nix/modules/programming/default.nix
@@ -65,7 +65,7 @@
 
   programs = {
     ## This is for pairing with VSCode users, including Ronnie. Would be ideal
-    ## if there were something like Foobits, but that seems effectively dead.
+    ## if there were something like Floobits, but that seems effectively dead.
     vscode = {
       enable = true;
       enableExtensionUpdateCheck = false; # Nervous about these two, see how
@@ -113,6 +113,12 @@
         "editor.fontLigatures" = true;
         "editor.fontSize" = config.lib.local.defaultFont.size;
         "workbench.colorTheme" = "Solarized Dark";
+        ## Projects that don’t keep things formatted should have a
+        ## .vscode/settings.json that overrides this.
+        "editor.formatOnSave" = true;
+        ## This avoids calling out all of my wonderful Unicode content.
+        "editor.unicodeHighlight.includeComments" = false;
+        "editor.unicodeHighlight.includeStrings" = false;
       };
     };
 

From 0273bfcb11357f5d4ef7146e39534471c605c1dc Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@technomadic.org>
Date: Mon, 24 Feb 2025 10:28:40 -0700
Subject: [PATCH 2/4] =?UTF-8?q?Don=E2=80=99t=20override=20the=20shell=20in?=
 =?UTF-8?q?=20Alacritty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems to get in the way of the Nix environment.
---
 nix/modules/shell.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nix/modules/shell.nix b/nix/modules/shell.nix
index edbce79..702a60a 100644
--- a/nix/modules/shell.nix
+++ b/nix/modules/shell.nix
@@ -40,9 +40,6 @@
           normal.family = config.lib.local.defaultFont.monoFamily;
           size = config.lib.local.defaultFont.size;
         };
-        ## Make sure we don’t fall back to different versions on non-NixOS (e.g.
-        ## the ancient Bash 3.2 on darwin).
-        terminal.shell.program = lib.getExe pkgs.bashInteractive;
       };
     };
 

From 2379f680f26b466fe2e672bd0a7896aab7e1e9c8 Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@technomadic.org>
Date: Mon, 24 Feb 2025 10:35:11 -0700
Subject: [PATCH 3/4] Some minor changes

- correct a comment,
- add an entry to my local dictionary
---
 nix/modules/home-configuration.nix | 3 ++-
 nix/modules/nix-configuration.nix  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nix/modules/home-configuration.nix b/nix/modules/home-configuration.nix
index 0b83674..1f1c8b9 100644
--- a/nix/modules/home-configuration.nix
+++ b/nix/modules/home-configuration.nix
@@ -367,7 +367,8 @@
       local = [
         "GitHub"
         "Skitch"
-        "Vizsla"
+        "Rankine" # the temperature scale
+        "Vizsla" # the dog breed
       ];
     };
   };
diff --git a/nix/modules/nix-configuration.nix b/nix/modules/nix-configuration.nix
index 04d278a..7ee5b0e 100644
--- a/nix/modules/nix-configuration.nix
+++ b/nix/modules/nix-configuration.nix
@@ -8,7 +8,7 @@
     registry = {
       ## Set the registry’s Nixpkgs to match this flake’s.
       nixpkgs.flake = nixpkgs;
-      ## Allows `sys#` to reference the templates, devShells, etc. from Flaky
+      ## Allows `env#` to reference the templates, devShells, etc. from Flaky
       ## environments.
       env.to = {
         type = "github";

From b77e1dbdfc63f76c4dff57c2658bd0c37e7f9735 Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@technomadic.org>
Date: Mon, 24 Feb 2025 10:35:53 -0700
Subject: [PATCH 4/4] Codify some more macOS defaults

These are around which updates macOS should automatically install. Previously, I
disabled updates from the App Store, because they are managed by `mas`, and this
just add more settings in that vein.
---
 nix/modules/darwin-configuration.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nix/modules/darwin-configuration.nix b/nix/modules/darwin-configuration.nix
index 8141063..28194df 100644
--- a/nix/modules/darwin-configuration.nix
+++ b/nix/modules/darwin-configuration.nix
@@ -224,5 +224,10 @@
     };
   };
 
+  ## For any of this to work, we need to enable automatic updates in general.
+  system.defaults.CustomSystemPreferences."com.apple.SoftwareUpdate".AutomaticCheckEnabled = true;
+  ## This will automatically install macOS updates, which we want because Nix
+  ## doesn’t manage the OS.
+  system.defaults.CustomSystemPreferences."com.apple.commerce".AutoUpdateRestartRequired = true;
   system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
 }