From 45aab7c55480effff57341131177243404c0f332 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sun, 6 Jul 2025 12:47:41 -0700
Subject: various fixes for nix 25.05

---
 nix/machines/darwin-shared.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'nix/machines')

diff --git a/nix/machines/darwin-shared.nix b/nix/machines/darwin-shared.nix
index e19b7cc..978b43a 100644
--- a/nix/machines/darwin-shared.nix
+++ b/nix/machines/darwin-shared.nix
@@ -34,6 +34,8 @@
     };
   };
 
+  system.primaryUser = "fcuny";
+
   system.defaults = {
     dock = {
       autohide = true;
@@ -62,9 +64,13 @@
     SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true;
   };
 
-  system.activationScripts.postUserActivation.text = ''
-    mkdir -p ~/Documents/screenshots
-  '';
+  # TODO:  - The `system.activationScripts.postUserActivation` option has
+  #     been removed, as all activation now takes place as `root`. Please
+  #     restructure your custom activation scripts appropriately,
+  #     potentially using `sudo` if you need to run commands as a user.
+  # system.activationScripts.postUserActivation.text = ''
+  #   mkdir -p ~/Documents/screenshots
+  # '';
 
   fonts.packages = with pkgs; [
     source-code-pro
@@ -76,9 +82,7 @@
   };
 
   # Touch ID for sudo auth
-  security.pam.enableSudoTouchIdAuth = true;
-
-  services.nix-daemon.enable = true;
+  security.pam.services.sudo_local.touchIdAuth = true;
 
   environment.shells = [ pkgs.fish ];
 
-- 
cgit v1.2.3