updating module format and additional settings

flake.nix

@@ -93,9 +93,7 @@
       nix-darwin.lib.darwinSystem {
         modules = [
           host1Base
-          ./modules/darwin/homebrew.nix
+          ./modules/darwin/default.nix
-          ./modules/darwin/services.nix
-          ./modules/darwin/nixpackages.nix
           inputs.nix-homebrew.darwinModules.nix-homebrew
           {
             nix-homebrew = {
@@ -124,6 +122,7 @@
               programs.fish.enable = (userVars.userA.shell == "fish");
               imports = [
                 ./modules/home/${userVars.userA.username}/dotfiles.nix
+                ./modules/home/${userVars.userA.username}/appearance.nix
               ];
             };
           }
@@ -155,6 +154,7 @@
               programs.fish.enable = (userVars.userB.shell == "fish");
               imports = [
                 ./modules/home/${userVars.userB.username}/dotfiles.nix
+                ./modules/home/${userVars.userB.username}/appearance.nix
               ];
             };
           }

modules/darwin/apps/default.nix

@@ -0,0 +1,8 @@
+# reference other modules
+{
+  imports = [
+    ./homebrew.nix
+    ./nixpackages.nix
+    ./services.nix
+  ];
+}

modules/darwin/apps/services.nix

@@ -4,7 +4,4 @@
   # Example: Tailscale, other system services
   services.nix-daemon.enable = true;
   services.tailscale.enable = true;
-
-  # Example: you could also place security/pam or other service configs here:
-  security.pam.enableSudoTouchIdAuth = true;
 }

modules/darwin/default.nix

@@ -0,0 +1,8 @@
+# reference other modules
+{
+  imports = [
+    ./apps/default.nix
+    ./system/default.nix
+    ./security/default.nix
+  ];
+}

modules/darwin/security/default.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+{
+  # Enable TouchID for PAM auth: you could also place security/pam or other service configs here:
+  security.pam.enableSudoTouchIdAuth = true;
+}

modules/darwin/system/appearance.nix

@@ -0,0 +1,35 @@
+{ config, pkgs, lib, ... }:
+{  
+  # If you also want to do e.g. Dock preferences from the same user-level file:
+  system.defaults.dock = {
+    autohide = true;
+    orientation = "bottom";
+    persistent-apps = [
+      /Applications/Safari.app
+      /System/Applications/Utilities/Terminal.app
+      # Add your persistent apps here
+    ];
+    persistent-others = [
+      # Add your persistent others here
+      "~/Documents"
+      "~/code"
+    ];
+    show-recents = false;
+    tilesize = 36; # Set the icon size on the dock; default is 64
+  };
+
+
+system.defaults.NSGlobalDomain = {
+    AppleInterfaceStyle = "Dark";     # "Dark" or "Light" - Darkmode all the things
+    AppleHighlightColor = "Purple";   # Set highlight color
+    # Add more NSGlobalDomain settings here
+  };
+
+  system.defaults.loginwindow = {
+    GuestEnabled = false; # Disable guest account
+    AdminHostInfo = "HostName"; # Show hostname on login window
+    AdminHostInfoTime = true; # Show time on login window
+    LoginwindowText = "Super Awesome Mac"; # Set login window text
+    # Add more loginwindow settings here
+    };
+}

modules/darwin/system/default.nix

@@ -0,0 +1,8 @@
+# reference other modules
+{
+  imports = [
+    ./appearance.nix
+    ./finder.nix
+    ./system.nix
+  ];
+}

modules/darwin/system/finder.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Finder Settings
+  system.defaults.finder = {
+    FXPreferredViewStyle = "Nlsv";    # Set default view style to list view
+    NewWindowTarget = "PfHm";         # Set default new window target to home folder
+    ShowMountedServersOnDesktop = true; # Show mounted servers on desktop
+    ShowPathbar = true;               # Show path bar
+    # Add more Finder settings here
+    };
+}

modules/darwin/system/system.nix

@@ -0,0 +1,64 @@
+{ config, pkgs, lib, ... }:
+
+{
+  system.nixpkgsRelease = "unstable"; # Use the unstable channel for latest Nixpkgs. Stable packages update less frequently, for stable use "24.11"
+  
+  # system.defaults.loginwindow = {
+  #   GuestEnabled = false; # Disable guest account
+  #   AdminHostInfo = "HostName"; # Show hostname on login window
+  #   AdminHostInfoTime = true; # Show time on login window
+  #   LoginwindowText = "Super Awesome Mac"; # Set login window text
+  #   # Add more loginwindow settings here
+  #   };
+  
+  system.defaults.screencapture = {
+    location = "~/Documents/Screenshots"; # Set default screenshot location
+    # Add more screencapture settings here
+    };
+
+  # # Finder Settings
+  # system.defaults.finder = {
+  #   FXPreferredViewStyle = "Nlsv";    # Set default view style to list view
+  #   NewWindowTarget = "PfHm";         # Set default new window target to home folder
+  #   ShowMountedServersOnDesktop = true; # Show mounted servers on desktop
+  #   ShowPathbar = true;               # Show path bar
+  #   # Add more Finder settings here
+  #   };
+
+  # system.defaults.NSGlobalDomain = {
+  #   AppleInterfaceStyle = "Dark";     # "Dark" or "Light" - Darkmode all the things
+  #   AppleHighlightColor = "Purple";   # Set highlight color
+  #   # Add more NSGlobalDomain settings here
+  # };
+
+  # # If you also want to do e.g. Dock preferences from the same user-level file:
+  # system.defaults.dock = {
+  #   autohide = true;
+  #   orientation = "bottom";
+  #   persistent-apps = [
+  #     /Applications/Safari.app
+  #     /System/Applications/Utilities/Terminal.app
+  #     # Add your persistent apps here
+  #   ];
+  #   persistent-others = [
+  #     # Add your persistent others here
+  #     "~/Documents"
+  #     "~/code"
+  #   ];
+  #   show-recents = false;
+  #   tilesize = 36; # Set the icon size on the dock; default is 64
+  # };
+
+  system.default.tracpad = {
+    tracpadThreeFingerDrag = true;
+    FirstClickThreshold = 1;
+    SecondClickThreshold = 1;
+    # Set up your trackpad preferences here
+  };
+
+  system.keyboard = {
+    swapLeftCtrlAndFn = true;
+    # Set up your keyboard preferences here
+  };
+  # You can add more Mac defaults here as well...
+}