test

nixos/desktop/configuration.nix

@@ -1,8 +1,7 @@
 {
   pkgs,
   allowUnfree,
-  buildMachines,
-  trustedUsers,
+  builder,
   sshExtraConfig,
   ...
 }: {
@@ -22,7 +21,7 @@
   nixpkgs.config.allowUnfree = allowUnfree;
 
   nix.settings = {
-    trusted-users = trustedUsers;
+    trusted-users = builder.trustedUsers;
     experimental-features = ["nix-command" "flakes"];
   };
 
@@ -31,6 +30,6 @@
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
 
-  # nix.buildMachines = buildMachines;
+  # nix.buildMachines = builder.buildMachines;
   system.stateVersion = "25.05";
 }

nixos/macos/darwin.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
-  trustedUsers,
+  builder,
+  terminal,
   ...
 }: {
   # List packages installed in system profile. To search by name, run:
@@ -17,11 +18,11 @@
 
   # Necessary for using flakes on this system.
   nix.settings.experimental-features = "nix-command flakes";
-  nix.settings.trusted-users = trustedUsers;
+  nix.settings.trusted-users = builder.trustedUsers;
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true; # default shell on catalina
-  # programs.fish.enable = true;
+  programs.fish.enable = true;
 
   # $ darwin-rebuild changelog
   system.stateVersion = 5;
@@ -32,6 +33,7 @@
   users.users.lsoriano = {
     name = "lsoriano";
     home = "/Users/lsoriano";
+    shell = pkgs.${terminal.termShell};
   };
 
   home-manager.users.lsoriano = import ../../home/macos/home.nix;