nix/system/darwin.nix

@@ -5,7 +5,6 @@
   ...
 }:
 {
-  system.configurationRevision = self.rev or self.dirtyRev or null;
 
   environment.systemPackages = with pkgs; [
     home-manager
@@ -26,33 +25,47 @@
     onActivation.upgrade = true;
   };
 
-  system.defaults = {
+  system = {
-    dock.autohide = true;
+    configurationRevision = self.rev or self.dirtyRev or null;
-    finder.FXPreferredViewStyle = "clmv";
+    defaults = {
-    loginwindow.GuestEnabled = false;
+      dock.autohide = true;
-    NSGlobalDomain.AppleICUForce24HourTime = true;
+      finder.FXPreferredViewStyle = "clmv";
-    NSGlobalDomain.AppleInterfaceStyle = "Dark";
+      loginwindow.GuestEnabled = false;
-    NSGlobalDomain.KeyRepeat = 2;
+      NSGlobalDomain = {
-  };
+        AppleICUForce24HourTime = true;
-
+        AppleInterfaceStyle = "Dark";
-  system.activationScripts.applications.text =
+        KeyRepeat = 2;
-    let
-      env = pkgs.buildEnv {
-        name = "system-applications";
-        paths = config.environment.systemPackages;
-        pathsToLink = "/Applications";
       };
-    in
+      trackpad = {
-    pkgs.lib.mkForce ''
+        Clicking = true;
-      # Set up applications
+        TrackpadThreeFingerDrag = true;
-      echo "setting up /Applications..." >&2
+        TrackpadThreeFingerTapGesture = true;
-      rm -rf /Applications/Nix\ Apps
+      };
-      mkdir -p /Applications/Nix\ Apps
+    };
-      find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
+    keyboard = {
-      while read -r src; do
+      enableKeyMapping = true;
-        app_name=$(basename "$src")
+      remapCapsLockToEscape = true;
-        echo "copying $src" >&2
+      swapLeftCtrlAndFn = true;
-        ${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name"
+    };
-      done
+    activationScripts.applications.text =
-    '';
+      let
+        env = pkgs.buildEnv {
+          name = "system-applications";
+          paths = config.environment.systemPackages;
+          pathsToLink = "/Applications";
+        };
+      in
+      pkgs.lib.mkForce ''
+        # Set up applications
+        echo "setting up /Applications..." >&2
+        rm -rf /Applications/Nix\ Apps
+        mkdir -p /Applications/Nix\ Apps
+        find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
+        while read -r src; do
+          app_name=$(basename "$src")
+          echo "copying $src" >&2
+          ${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name"
+        done
+      '';
+  };
 }