From d540cff07a74120be04db1a57a3016f3b7970031 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Mon, 4 Mar 2024 14:48:16 -0800
Subject: common macos preferences are moved to a module

---
 hosts/common/darwin/macos.nix | 18 ++++++++++++++++++
 hosts/mba/default.nix         | 17 -----------------
 nix/flake/hosts.nix           |  1 +
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 hosts/common/darwin/macos.nix

diff --git a/hosts/common/darwin/macos.nix b/hosts/common/darwin/macos.nix
new file mode 100644
index 0000000..810d64d
--- /dev/null
+++ b/hosts/common/darwin/macos.nix
@@ -0,0 +1,18 @@
+{ ... }: {
+  system.defaults.dock.autohide = true;
+  system.defaults.dock.orientation = "left";
+  system.defaults.dock.showhidden = false;
+  system.defaults.dock.show-recents = false;
+  # don’t rearrange spaces based on the most recent use
+  system.defaults.dock.mru-spaces = false;
+  system.defaults.finder.AppleShowAllExtensions = true;
+  system.defaults.screencapture.location = "~/Documents/screenshots";
+
+  system.defaults.CustomUserPreferences = {
+    "com.apple.desktopservices" = {
+      # Avoid creating .DS_Store files on network or USB volumes
+      DSDontWriteNetworkStores = true;
+      DSDontWriteUSBStores = true;
+    };
+  };
+}
diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix
index 8b22923..6efbddb 100644
--- a/hosts/mba/default.nix
+++ b/hosts/mba/default.nix
@@ -16,23 +16,6 @@
 
   users.users.fcuny.home = "/Users/fcuny";
 
-  system.defaults.dock.autohide = true;
-  system.defaults.dock.orientation = "left";
-  system.defaults.dock.showhidden = false;
-  system.defaults.dock.show-recents = false;
-  # don’t rearrange spaces based on the most recent use
-  system.defaults.dock.mru-spaces = false;
-  system.defaults.finder.AppleShowAllExtensions = true;
-  system.defaults.screencapture.location = "~/Documents/screenshots";
-
-  system.defaults.CustomUserPreferences = {
-    "com.apple.desktopservices" = {
-      # Avoid creating .DS_Store files on network or USB volumes
-      DSDontWriteNetworkStores = true;
-      DSDontWriteUSBStores = true;
-    };
-  };
-
   # Touch ID for sudo auth
   security.pam.enableSudoTouchIdAuth = true;
 
diff --git a/nix/flake/hosts.nix b/nix/flake/hosts.nix
index e84a389..2d655d6 100644
--- a/nix/flake/hosts.nix
+++ b/nix/flake/hosts.nix
@@ -9,6 +9,7 @@ let
       modules = [
         home-manager.darwinModule
         ../../hosts/common/darwin/homebrew.nix
+        ../../hosts/common/darwin/macos.nix
         path
         {
           nixpkgs.overlays = [
-- 
cgit 1.4.1