LnL7/nix-darwin
1
1
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-08-16 16:10:39 +03:00
Code Issues Projects Releases Wiki Activity

refactor: rename clock option menuExtraClock

Browse Source
This commit is contained in:
Hraban Luyat 2023-05-15 13:18:38 -04:00
parent f6b7489ddb
commit f1a562eef1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/defaults-write.nix
View File

@ -29,7 +29,7 @@ let
GlobalPreferences = defaultsToList ".GlobalPreferences" cfg.".GlobalPreferences";
LaunchServices = defaultsToList "com.apple.LaunchServices" cfg.LaunchServices;
NSGlobalDomain = defaultsToList "-g" cfg.NSGlobalDomain;
clock = defaultsToList "com.apple.menuextra.clock" cfg.clock;
menuExtraClock = defaultsToList "com.apple.menuextra.clock" cfg.menuExtraClock;
dock = defaultsToList "com.apple.dock" cfg.dock;
finder = defaultsToList "com.apple.finder" cfg.finder;
magicmouse = defaultsToList "com.apple.AppleMultitouchMouse" cfg.magicmouse;
@ -81,7 +81,7 @@ in
GlobalPreferences
LaunchServices
NSGlobalDomain
clock
menuExtraClock
dock
finder
magicmouse
@ -103,7 +103,7 @@ in
${concatStringsSep "\n" GlobalPreferences}
${concatStringsSep "\n" LaunchServices}
${concatStringsSep "\n" clock}
${concatStringsSep "\n" menuExtraClock}
${concatStringsSep "\n" dock}
${concatStringsSep "\n" finder}
${concatStringsSep "\n" magicmouse}

14
modules/system/defaults/clock.nix
View File

@ -5,7 +5,7 @@ with lib;
{
options = {
system.defaults.clock.IsAnalog = mkOption {
system.defaults.menuExtraClock.IsAnalog = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
@ -13,7 +13,7 @@ with lib;
'';
};
system.defaults.clock.Show24Hour = mkOption {
system.defaults.menuExtraClock.Show24Hour = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
@ -21,7 +21,7 @@ with lib;
'';
};
system.defaults.clock.ShowAMPM = mkOption {
system.defaults.menuExtraClock.ShowAMPM = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
@ -29,7 +29,7 @@ with lib;
'';
};
system.defaults.clock.ShowDayOfMonth = mkOption {
system.defaults.menuExtraClock.ShowDayOfMonth = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
@ -37,7 +37,7 @@ with lib;
'';
};
system.defaults.clock.ShowDayOfWeek = mkOption {
system.defaults.menuExtraClock.ShowDayOfWeek = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
@ -45,7 +45,7 @@ with lib;
'';
};
system.defaults.clock.ShowDate = mkOption {
system.defaults.menuExtraClock.ShowDate = mkOption {
type = types.nullOr (types.enum [ 0 1 2 ]);
default = null;
description = ''
@ -59,7 +59,7 @@ with lib;
'';
};
system.defaults.clock.ShowSeconds = mkOption {
system.defaults.menuExtraClock.ShowSeconds = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''

6
tests/system-defaults-write.nix
View File

@ -37,9 +37,9 @@
system.defaults.NSGlobalDomain."com.apple.springing.delay" = 0.0;
system.defaults.NSGlobalDomain."com.apple.swipescrolldirection" = true;
system.defaults.".GlobalPreferences"."com.apple.sound.beep.sound" = "/System/Library/Sounds/Funk.aiff";
system.defaults.clock.Show24Hour = false;
system.defaults.clock.ShowDayOfWeek = true;
system.defaults.clock.ShowDate = 2;
system.defaults.menuExtraClock.Show24Hour = false;
system.defaults.menuExtraClock.ShowDayOfWeek = true;
system.defaults.menuExtraClock.ShowDate = 2;
system.defaults.dock.appswitcher-all-displays = false;
system.defaults.dock.autohide-delay = 0.24;
system.defaults.dock.orientation = "left";