3 files changed, 67 insertions, 8 deletions
diff --git a/user/marvin.nix b/user/marvin.nix
index 098b5f61..c74e621c 100644
--- a/user/marvin.nix
+++ b/user/marvin.nix
@@ -73,4 +73,71 @@
     };
   };
 
+  targets.darwin.defaults = {
+    NSGlobalDomain = {
+      AppleKeyboardUIMode = 2;
+      ApplePressAndHoldEnabled = false;
+      AppleShowScrollBars = "Always";
+    };
+    "com.apple.controlcenter" = {
+      "NSStatusItem Visible Sound" = true;
+      "NSStatusItem Visible FocusModes" = true;
+    };
+    "com.apple.dock" = {
+      autohide = true;
+      autohide-delay = 0.05;
+      autohide-time-modifier = 0.12;
+      expose-animation-duration = 0.5;
+      launchanim = false;
+      mineffect = "scale";
+      minimize-to-application = true;
+      scroll-to-open = true;
+      show-process-indicators = false;
+      static-only = true;
+    };
+    "com.apple.finder" = {
+      _FXSortFoldersFirst = true;
+      AppleShowAllExtensions = true;
+      FXDefaultSearchScope = "SCcf"; # current folder
+      FXEnableExtensionChangeWarning = false;
+      FXPreferredViewStyle = "clmv"; # column view
+      FXRemoveOldTrashItems = true;
+      NewWindowTarget = "Home";
+      NSDocumentSaveNewDocumentsToCloud = false;
+    };
+    "com.apple.menuextra.clock" =
+      let
+        # if-space = 0;
+        always = 1;
+        never = 2;
+      in
+      {
+        Show24Hour = true;
+        ShowDate = never;
+      };
+    "com.apple.hitoolbox" = {
+      AppleFnUsageType = "Do Nothing";
+    };
+    "com.apple.multitouchtouchpad" = {
+      TrackpadThreeFingerTapGesture = 2; # Lookup
+    };
+    "com.apple.mouse" = {
+      linear = true;
+    };
+    "com.apple.safari" = {
+      ShowFullURLInSmartSearchField = true;
+    };
+    "com.apple.screensaver" = {
+      askForPasswordDelay = 60;
+    };
+    "com.apple.siri" = {
+      StatusMenuVisible = false;
+    };
+    "com.apple.textedit" = {
+      RichText = false;
+    };
+    "com.apple.timemachine" = {
+      DoNotOfferNewDisksForBackup = true;
+    };
+  };
 }
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index 24da1604..13b0ea5c 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -9,7 +9,6 @@
     stylelint
   ] ++ (with pkgs; [
     flyctl
-    prettierd
     personal.htmlformat
   ]);
   home.shellAliases = {
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index cf519354..72c2ee52 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -188,13 +188,6 @@ in
           license = pkgs.lib.licenses.gpl3;
         };
       };
-      apheleia = self.melpaPackages.apheleia.overrideAttrs
-        (old: {
-          patchPhase = ''
-            substituteInPlace apheleia-formatters.el \
-              --replace-fail '"prettier"' '"prettierd"'
-          '';
-        });
       treemacs-nerd-icons = self.melpaPackages.treemacs-nerd-icons.overrideAttrs (old: {
         src = pkgs.fetchFromGitHub {
           owner = "aaronmiller";