Spotligh: move from controlcenter to separate module

LnL7 · Feb 21, 2025 · 2362651 · 2362651
1 parent 20d05f8
commit 2362651
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/modules/module-list.nix b/modules/module-list.nix
@@ -15,6 +15,7 @@
   ./system/applications.nix
   ./system/defaults-write.nix
   ./system/defaults/controlcenter.nix
+  ./system/defaults/Spotlight.nix
   ./system/defaults/LaunchServices.nix
   ./system/defaults/NSGlobalDomain.nix
   ./system/defaults/GlobalPreferences.nix

diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix
@@ -38,6 +38,7 @@ let
   ActivityMonitor = defaultsToList "com.apple.ActivityMonitor" cfg.ActivityMonitor;
   WindowManager = defaultsToList "com.apple.WindowManager" cfg.WindowManager;
   controlcenter = defaultsToList "~/Library/Preferences/ByHost/com.apple.controlcenter" cfg.controlcenter;  
+  Spotlight = defaultsToList "~/Library/Preferences/ByHost/com.apple.Spotlight" cfg.Spotlight;  
   CustomUserPreferences = flatten (mapAttrsToList (name: value: defaultsToList name value) cfg.CustomUserPreferences);
   CustomSystemPreferences = flatten (mapAttrsToList (name: value: defaultsToList name value) cfg.CustomSystemPreferences);
 
@@ -95,6 +96,7 @@ in
         CustomUserPreferences
         WindowManager
         controlcenter
+        Spotlight
       ]
       ''
         # Set defaults
@@ -120,6 +122,7 @@ in
         ${concatStringsSep "\n" CustomUserPreferences}
         ${concatStringsSep "\n" WindowManager}
         ${concatStringsSep "\n" controlcenter}
+        ${concatStringsSep "\n" Spotlight}
 
         ${optionalString (length dock > 0) ''
           # Only restart Dock if current user is logged in

diff --git a/modules/system/defaults/Spotlight.nix b/modules/system/defaults/Spotlight.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+
+{
+  options = {
+    system.defaults.Spotlight.MenuItemHidden = lib.mkOption {
+      type = lib.types.nullOr lib.types.bool;
+      default = null;
+      description = ''
+        Apple menu > System Preferences > Control Center > Menu Bar Only > Spotlight
+
+        Show Spotlight in menu bar. Default is null.
+
+        false - "Don't Show in Menu Bar"
+        true  - "Show in Menu Bar"
+      '';
+    };
+  };
+}
diff --git a/modules/system/defaults/controlcenter.nix b/modules/system/defaults/controlcenter.nix
@@ -332,19 +332,6 @@ in
       '';
     };
 
-    system.defaults.controlcenter.Spotlight = lib.mkOption {
-      type = lib.types.nullOr lib.types.bool;
-      default = null;
-      description = ''
-        Apple menu > System Preferences > Control Center > Menu Bar Only > Spotlight
-
-        Show Spotlight in menu bar. Default is null.
-
-        false - "Don't Show in Menu Bar"
-        true  - "Show in Menu Bar"
-      '';
-    };
-
     system.defaults.controlcenter.StageManager = lib.mkOption {
       type = lib.types.nullOr lib.types.bool;
       default = null;

diff --git a/tests/fixtures/system-defaults-write/activate-user.txt b/tests/fixtures/system-defaults-write/activate-user.txt
@@ -678,11 +678,6 @@ defaults write ~/Library/Preferences/ByHost/com.apple.controlcenter 'Sound' $'<?
 <plist version="1.0">
 <integer>8</integer>
 </plist>'
-defaults write ~/Library/Preferences/ByHost/com.apple.Spotlight 'MenuItemHidden' $'<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<true/>
-</plist>'
 defaults write ~/Library/Preferences/ByHost/com.apple.controlcenter 'StageManager' $'<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -698,4 +693,8 @@ defaults write ~/Library/Preferences/ByHost/com.apple.controlcenter 'WiFi' $'<?x
 <plist version="1.0">
 <integer>18</integer>
 </plist>'
-
+defaults write ~/Library/Preferences/ByHost/com.apple.Spotlight 'MenuItemHidden' $'<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<true/>
+</plist>'
diff --git a/tests/system-defaults-write.nix b/tests/system-defaults-write.nix
@@ -130,10 +130,10 @@
   system.defaults.controlcenter.NowPlaying = "always";
   system.defaults.controlcenter.ScreenMirroring = "whenActive";
   system.defaults.controlcenter.Sound = "whenActive";
-  system.defaults.controlcenter.Spotlight = true;
   system.defaults.controlcenter.StageManager = true;
   system.defaults.controlcenter.UserSwitcher = "both";
   system.defaults.controlcenter.WiFi = true;
+  system.defaults.Spotlight.MenuItemHidden = true;
   test = lib.strings.concatMapStringsSep "\n"
     (x: ''
       echo >&2 "checking defaults write in /${x}"