refactor

hosts/chidi/default.nix

@@ -9,7 +9,6 @@
 		../../modules/core.nix
 		../../modules/darwin.nix
 		../../modules/darwin-syncthing.nix
-		../../modules/darwin-system.nix
 		../../modules/dock.nix
 		../../modules/homebrew.nix
 		../../modules/syncthing.nix

hosts/jason/default.nix

@@ -7,7 +7,6 @@
 		../../modules/core.nix
 		../../modules/darwin.nix
 		../../modules/darwin-syncthing.nix
-		../../modules/darwin-system.nix
 		../../modules/dock.nix
 		../../modules/homebrew.nix
 		../../modules/syncthing.nix

modules/darwin-system.nix

@@ -1,32 +0,0 @@
-{
-	system.defaults = {
-		NSGlobalDomain = {
-			# null equals "Light"
-			AppleInterfaceStyle = null;
-			AppleShowAllExtensions = true;
-			ApplePressAndHoldEnabled = false;
-			KeyRepeat = 2;
-			InitialKeyRepeat = 15;
-			"com.apple.mouse.tapBehavior" = 1;
-			"com.apple.sound.beep.volume" = 0.0;
-			"com.apple.sound.beep.feedback" = 0;
-		};
-
-		dock = {
-			autohide = true;
-			show-recents = false;
-			launchanim = true;
-			orientation = "bottom";
-			tilesize = 60;
-		};
-
-		finder = {
-			_FXShowPosixPathInTitle = false;
-		};
-
-		trackpad = {
-			Clicking = true;
-			TrackpadThreeFingerDrag = true;
-		};
-	};
-}

modules/darwin.nix

@@ -7,6 +7,37 @@
 	system = {
 		primaryUser = user;
 		stateVersion = constants.stateVersions.darwin;
+
+		defaults = {
+			NSGlobalDomain = {
+				# null equals "Light"
+				AppleInterfaceStyle = null;
+				AppleShowAllExtensions = true;
+				ApplePressAndHoldEnabled = false;
+				KeyRepeat = 2;
+				InitialKeyRepeat = 15;
+				"com.apple.mouse.tapBehavior" = 1;
+				"com.apple.sound.beep.volume" = 0.0;
+				"com.apple.sound.beep.feedback" = 0;
+			};
+
+			dock = {
+				autohide = true;
+				show-recents = false;
+				launchanim = true;
+				orientation = "bottom";
+				tilesize = 60;
+			};
+
+			finder = {
+				_FXShowPosixPathInTitle = false;
+			};
+
+			trackpad = {
+				Clicking = true;
+				TrackpadThreeFingerDrag = true;
+			};
+		};
 	};
 
 	nix = {