From b9ad3d7604a9b7517483c47a6c991dde6d1156fb Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 9 Aug 2023 17:16:20 +0200
Subject: shell: disable compinit in one place across platforms

---
 system/settings/darwin.nix         | 2 --
 system/settings/programs/shell.nix | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'system')

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;
       }
     );
-- 
cgit 1.4.1