2 files changed, 5 insertions, 4 deletions
diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix
index 6b6f3aae..ac5dbf15 100644
--- a/system/settings/darwin.nix
+++ b/system/settings/darwin.nix
@@ -28,8 +28,6 @@
 
   programs.zsh = {
     enable = true;
-    enableCompletion = false; # Causes >2s startup time, overlaps home-manager config
-    enableBashCompletion = true;
     loginShellInit = ''
       source /System/Library/Templates/Data/private/etc/zprofile
     '';
diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix
index c0e50690..62d51230 100644
--- a/system/settings/programs/shell.nix
+++ b/system/settings/programs/shell.nix
@@ -8,9 +8,12 @@
       promptInit = "";
     }
     // (
+      # Either of these will call `compinit`, causing >2s startup time
+      # Do it in home-manager instead
       if pkgs.stdenv.isDarwin
-      then { }
-      else {
+      then {
+        enableCompletion = false;
+      } else {
         enableGlobalCompInit = false;
       }
     );