mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-21 07:40:14 +00:00
Code Activity

Merge pull request #1377 from zhaofengli/fix-custom-user-preferences-merging

Browse source 
Fix merging of system.defaults.CustomUserPreferences
This commit is contained in:
Michael Hoang 2025-03-15 13:46:20 +09:00 • committed by GitHub
commit 9175b4bb5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/system/defaults/CustomPreferences.nix
View file

@ -2,10 +2,25 @@
with lib; with lib;
{ let
valueType = with lib.types; nullOr (oneOf [
bool
int
float
str
path
(attrsOf valueType)
(listOf valueType)
]) // {
description = "plist value";
};
defaultsType = types.submodule {
freeformType = valueType;
};
in {
options = { options = {
system.defaults.CustomUserPreferences = mkOption { system.defaults.CustomUserPreferences = mkOption {
type = types.attrs; type = defaultsType;
default = { }; default = { };
example = { example = {
"NSGlobalDomain" = { "TISRomanSwitchState" = 1; }; "NSGlobalDomain" = { "TISRomanSwitchState" = 1; };
@ -20,7 +35,7 @@ with lib;
}; };
system.defaults.CustomSystemPreferences = mkOption { system.defaults.CustomSystemPreferences = mkOption {
type = types.attrs; type = defaultsType;
default = { }; default = { };
example = { example = {
"NSGlobalDomain" = { "TISRomanSwitchState" = 1; }; "NSGlobalDomain" = { "TISRomanSwitchState" = 1; };

8
tests/fixtures/system-defaults-write/activate-user.txt vendored
View file

@ -543,6 +543,14 @@ defaults write NSGlobalDomain 'TISRomanSwitchState' $'<?xml version="1.0" encodi
<plist version="1.0"> <plist version="1.0">
<integer>1</integer> <integer>1</integer>
</plist>' </plist>'
defaults write com.apple.Safari 'NSUserKeyEquivalents' $'<?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">
<dict>
<key>Quit Safari</key>
<string>@^q</string>
</dict>
</plist>'
defaults write com.apple.Safari 'com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled' $'<?xml version="1.0" encoding="UTF-8"?> defaults write com.apple.Safari 'com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled' $'<?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"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">

26
tests/system-defaults-write.nix
View file

@ -1,6 +1,25 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
imports = [
{
system.defaults.CustomUserPreferences = {
"NSGlobalDomain" = { "TISRomanSwitchState" = 1; };
"com.apple.Safari" = {
"com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" =
true;
};
};
}
{
system.defaults.CustomUserPreferences = {
"com.apple.Safari" = {
"NSUserKeyEquivalents"."Quit Safari" = "@^q"; # Option-Cmd-Q
};
};
}
];
system.defaults.NSGlobalDomain.AppleShowAllFiles = true; system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
system.defaults.NSGlobalDomain.AppleEnableMouseSwipeNavigateWithScrolls = false; system.defaults.NSGlobalDomain.AppleEnableMouseSwipeNavigateWithScrolls = false;
system.defaults.NSGlobalDomain.AppleEnableSwipeNavigateWithScrolls = false; system.defaults.NSGlobalDomain.AppleEnableSwipeNavigateWithScrolls = false;
@ -109,13 +128,6 @@
system.defaults.WindowManager.EnableTiledWindowMargins = true; system.defaults.WindowManager.EnableTiledWindowMargins = true;
system.defaults.WindowManager.StandardHideWidgets = true; system.defaults.WindowManager.StandardHideWidgets = true;
system.defaults.WindowManager.StageManagerHideWidgets = true; system.defaults.WindowManager.StageManagerHideWidgets = true;
system.defaults.CustomUserPreferences = {
"NSGlobalDomain" = { "TISRomanSwitchState" = 1; };
"com.apple.Safari" = {
"com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" =
true;
};
};
system.defaults.controlcenter.BatteryShowPercentage = true; system.defaults.controlcenter.BatteryShowPercentage = true;
system.defaults.controlcenter.Sound = false; system.defaults.controlcenter.Sound = false;
system.defaults.controlcenter.Bluetooth = true; system.defaults.controlcenter.Bluetooth = true;