defaults: move com.apple.smb.server to /activate

Currently fails with permission errors.

2 files changed, 23 insertions, 17 deletions

diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index b868b0c..25d84ec 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -58,6 +58,7 @@ in
       ${cfg.activationScripts.nix.text}
       ${cfg.activationScripts.applications.text}
       ${cfg.activationScripts.etc.text}
+      ${cfg.activationScripts.defaults.text}
       ${cfg.activationScripts.launchd.text}
       ${cfg.activationScripts.nix-daemon.text}
       ${cfg.activationScripts.time.text}
@@ -96,7 +97,7 @@ in
 
       ${cfg.activationScripts.checks.text}
       ${cfg.activationScripts.extraUserActivation.text}
-      ${cfg.activationScripts.defaults.text}
+      ${cfg.activationScripts.userDefaults.text}
       ${cfg.activationScripts.userLaunchd.text}
 
       ${cfg.activationScripts.postUserActivation.text}
diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix
index eca78b6..e1ec96c 100644
--- a/modules/system/defaults-write.nix
+++ b/modules/system/defaults-write.nix
@@ -3,7 +3,6 @@
 with lib;
 
 let
-
   cfg = config.system.defaults;
 
   isFloat = x: isString x && builtins.match "^[+-]?([0-9]*[.])?[0-9]+$" x != null;
@@ -30,26 +29,32 @@ let
   trackpad = defaultsToList "com.apple.AppleMultitouchTrackpad" cfg.trackpad;
   trackpadBluetooth = defaultsToList "com.apple.driver.AppleBluetoothMultitouch.trackpad" cfg.trackpad;
 
+  mkIfAttrs = list: mkIf (any (attrs: attrs != {}) list);
 in
 
 {
-  options = {
-  };
-
   config = {
 
-    system.activationScripts.defaults.text = ''
-      # Set defaults
-      echo "writing defaults..." >&2
-
-      ${concatStringsSep "\n" NSGlobalDomain}
-      ${concatStringsSep "\n" LaunchServices}
-      ${concatStringsSep "\n" dock}
-      ${concatStringsSep "\n" finder}
-      ${concatStringsSep "\n" smb}
-      ${concatStringsSep "\n" trackpad}
-      ${concatStringsSep "\n" trackpadBluetooth}
-    '';
+    system.activationScripts.defaults.text = mkIfAttrs [ smb ]
+      ''
+        # Set defaults
+        echo >&2 "system defaults..."
+        ${concatStringsSep "\n" smb}
+      '';
+
+    system.activationScripts.userDefaults.text = mkIfAttrs
+      [ NSGlobalDomain LaunchServices dock finder trackpad trackpadBluetooth ]
+      ''
+        # Set defaults
+        echo >&2 "user defaults..."
+
+        ${concatStringsSep "\n" NSGlobalDomain}
+        ${concatStringsSep "\n" LaunchServices}
+        ${concatStringsSep "\n" dock}
+        ${concatStringsSep "\n" finder}
+        ${concatStringsSep "\n" trackpad}
+        ${concatStringsSep "\n" trackpadBluetooth}
+      '';
 
   };
 }