modules/darwin/homebrew.nix

@@ -30,14 +30,17 @@
       };
       brews = [
         "trash" # Delete files and folders to trash instead of rm
+        "openjdk" # Required by Apache Directory Studio
       ];
       casks = [
         "1password" # 1Password will not launch from Nix on macOS
+        "apache-directory-studio" # Packaging on Nix is not available for macOS
         # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
         "keybase" # GUI on Nix not available for macOS
         # "logitech-g-hub" # Mouse and keyboard management
         "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
+        # "obsidian" # Obsidian packaging on Nix is not available for macOS
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
         # "steam" # Not packaged for Nix
         # "epic-games" # Not packaged for Nix

modules/darwin/system.nix

@@ -112,6 +112,13 @@
         # Disable trackpad tap to click
         trackpad.Clicking = false;
 
+        # universalaccess = {
+
+        #   # Zoom in with Control + Scroll Wheel
+        #   closeViewScrollWheelToggle = true;
+        #   closeViewZoomFollowsFocus = true;
+        # };
+
         # Where to save screenshots
         screencapture.location = "~/Downloads";
 
@@ -172,14 +179,9 @@
               ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
             KeyboardShortcuts_joinEventShortcut =
               ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
-            timeFormat = ''"12-hour"'';
           };
         };
 
-        CustomSystemPreferences = {
-
-        };
-
       };
 
       # Settings that don't have an option in nix-darwin