refactor: more spliting up of config and cleanup

modules/darwin/default.nix

···
     ./brew # homebrew the package manager
     ./hardware # hardware config - i.e. keyboard
     ./prefrences # system preferences
+    ./security # security settings to keep the system secure
     ./services # services exclusive to nix-darwin
 
     ./activation.nix # run when we start the system

modules/darwin/non-native.nix

···
-{
-  # Customize settings that not supported by nix-darwin directly
-  # see the source code of this project to get more undocumented options:
-  #    https://github.com/rgcr/m-cli
-  #
-  # All custom entries can be found by running `defaults read` command.
-  # or `defaults read xxx` to read a specific domain.
-  system.defaults.CustomUserPreferences = {
-    NSGlobalDomain = {
-      # Add a context menu item for showing the Web Inspector in web views
-      WebKitDeveloperExtras = true;
-    };
-
-    "com.apple.desktopservices" = {
-      # Avoid creating .DS_Store files on network or USB volumes
-      DSDontWriteNetworkStores = true;
-      DSDontWriteUSBStores = true;
-    };
-
-    "com.apple.spaces" = {
-      "spans-displays" = 0; # Display have seperate spaces
-    };
-
-    "com.apple.WindowManager" = {
-      EnableStandardClickToShowDesktop = 0; # Click wallpaper to reveal desktop
-      StandardHideDesktopIcons = 0; # Show items on desktop
-      HideDesktop = 0; # Do not hide items on desktop & stage manager
-      StageManagerHideWidgets = 0;
-      StandardHideWidgets = 0;
-    };
-
-    "com.apple.screensaver" = {
-      # Require password immediately after sleep or screen saver begins
-      askForPassword = 1;
-      askForPasswordDelay = 0;
-    };
-
-    "com.apple.screencapture" = {
-      location = "~/Pictures/screenshots";
-      type = "png";
-    };
-
-    "com.apple.AdLib" = {
-      allowApplePersonalizedAdvertising = false;
-    };
-
-    # Prevent Photos from opening automatically when devices are plugged in
-    "com.apple.ImageCapture".disableHotPlug = true;
-
-    # modified from https://github.com/nmasur/dotfiles/blob/275863795317f8ce65486b138c1fb4eb6dbd65f8/modules/darwin/system.nix#L134-L148
-    # "com.apple.dock".persistent-apps = let
-    #   dockText = app: "<dict><key>tile-data</key><dict><key>file-data</key><dict><key>_CFURLString</key><string>'${app}'</string><key>_CFURLStringType</key><integer>0</integer></dict></dict></dict>";
-    # in
-    #   map dockText [
-    #     "/Applications/Arc.app"
-    #     "/Users/isabel/Applications/Home Manager Apps/WezTerm.app"
-    #     "/Users/isabel/Applications/Home Manager Apps/Discord.app"
-    #     "${pkgs.obsidian}/Applications/Obsidian.app"
-    #   ];
-  };
-}

modules/darwin/prefrences/default.nix

···
-#  All the configuration options are documented here: https://daiderd.com/nix-darwin/manual/index.html#sec-options
-#  Incomplete list of macOS `defaults` commands: https://macos-defaults.com/
+# All the configuration options are documented here: https://daiderd.com/nix-darwin/manual/index.html#sec-options
+# Incomplete list of macOS `defaults` commands: https://macos-defaults.com/
+#
+# This pertains to anything prefixed with CustomUserPreferences
+# Customize settings that not supported by nix-darwin directly
+# see the source code of this project to get more undocumented options:
+#    https://github.com/rgcr/m-cli
+#
+# All custom entries can be found by running `defaults read` command.
+# or `defaults read xxx` to read a specific domain.
 {
   imports = [
-    ./clock.nix
-    ./dock.nix
-    ./finder.nix
-    ./login.nix
-    ./misc.nix
-    ./sound.nix
-    ./theme.nix
+    ./clock.nix # Settings for the clock in the menu bar
+    ./dock.nix # Settings for the dock
+    ./finder.nix # Settings for Finder (file manager)
+    ./images.nix # Screensaver, screenshots etc
+    ./login.nix # Settings for the login screen
+    ./misc.nix # Miscellaneous settings
+    ./sound.nix # Sound settings
+    ./theme.nix # Theme settings
+    ./wm.nix # Window manager settings
   ];
 }

modules/darwin/prefrences/dock.nix

···
 {
-  system.defaults.dock = {
-    autohide = true;
-    autohide-delay = 0.0; # autohide delay
-    autohide-time-modifier = 1.0; # autohide animation duration
+  system.defaults = {
+    dock = {
+      autohide = true;
+      autohide-delay = 0.0; # autohide delay
+      autohide-time-modifier = 1.0; # autohide animation duration
 
-    orientation = "bottom"; # dock position
-    tilesize = 1; # dock icon size
+      orientation = "bottom"; # dock position
+      tilesize = 1; # dock icon size
 
-    static-only = false; # show running apps
-    show-recents = false; # disable recent apps
-    showhidden = false; # show hidden apps
-    mru-spaces = false; # disable recent spaces
+      static-only = false; # show running apps
+      show-recents = false; # disable recent apps
+      showhidden = false; # show hidden apps
+      mru-spaces = false; # disable recent spaces
 
-    # customize Hot Corners
-    # wvous-tl-corner = 2; # top-left - Mission Control
-    # wvous-tr-corner = 13; # top-right - Lock Screen
-    # wvous-bl-corner = 3; # bottom-left - Application Windows
-    # wvous-br-corner = 4; # bottom-right - Desktop
+      # customize Hot Corners
+      # wvous-tl-corner = 2; # top-left - Mission Control
+      # wvous-tr-corner = 13; # top-right - Lock Screen
+      # wvous-bl-corner = 3; # bottom-left - Application Windows
+      # wvous-br-corner = 4; # bottom-right - Desktop
+    };
   };
+
+  # CustomUserPreferences = {
+  #   modified from https://github.com/nmasur/dotfiles/blob/275863795317f8ce65486b138c1fb4eb6dbd65f8/modules/darwin/system.nix#L134-L148
+  #   "com.apple.dock".persistent-apps = let
+  #     dockText = app: "<dict><key>tile-data</key><dict><key>file-data</key><dict><key>_CFURLString</key><string>'${app}'</string><key>_CFURLStringType</key><integer>0</integer></dict></dict></dict>";
+  #   in
+  #     map dockText [
+  #       "/Applications/Arc.app"
+  #       "/Users/isabel/Applications/Home Manager Apps/WezTerm.app"
+  #       "/Users/isabel/Applications/Home Manager Apps/Discord.app"
+  #       "${pkgs.obsidian}/Applications/Obsidian.app"
+  #     ];
+  # };
 }

modules/darwin/prefrences/images.nix

···
+{
+  system.defaults.CustomUserPreferences = {
+    "com.apple.screensaver" = {
+      # Require password immediately after sleep or screen saver begins
+      askForPassword = 1;
+      askForPasswordDelay = 0;
+    };
+
+    "com.apple.screencapture" = {
+      location = "~/Pictures/screenshots";
+      type = "png";
+    };
+
+    # Prevent Photos from opening automatically when devices are plugged in
+    "com.apple.ImageCapture".disableHotPlug = true;
+  };
+}

modules/darwin/prefrences/misc.nix

···
 {
-  system.defaults.NSGlobalDomain = {
-    NSAutomaticCapitalizationEnabled = false; # disable auto capitalization
-    NSAutomaticDashSubstitutionEnabled = false; # disable auto dash substitution
-    NSAutomaticPeriodSubstitutionEnabled = false; # disable auto period substitution
-    NSAutomaticQuoteSubstitutionEnabled = false; # disable auto quote substitution
-    NSAutomaticSpellingCorrectionEnabled = false; # disable auto spelling correction
-    NSNavPanelExpandedStateForSaveMode = true; # expand save panel by default
-    NSNavPanelExpandedStateForSaveMode2 = true; # ^
+  system.defaults = {
+    NSGlobalDomain = {
+      # Add a context menu item for showing the Web Inspector in web views
+      WebKitDeveloperExtras = true;
+
+      NSAutomaticCapitalizationEnabled = false; # disable auto capitalization
+      NSAutomaticDashSubstitutionEnabled = false; # disable auto dash substitution
+      NSAutomaticPeriodSubstitutionEnabled = false; # disable auto period substitution
+      NSAutomaticQuoteSubstitutionEnabled = false; # disable auto quote substitution
+      NSAutomaticSpellingCorrectionEnabled = false; # disable auto spelling correction
+      NSNavPanelExpandedStateForSaveMode = true; # expand save panel by default
+      NSNavPanelExpandedStateForSaveMode2 = true; # ^
+    };
+  };
+
+  CustomUserPreferences."com.apple.desktopservices" = {
+    # Avoid creating .DS_Store files on network or USB volumes
+    DSDontWriteNetworkStores = true;
+    DSDontWriteUSBStores = true;
   };
 }

modules/darwin/prefrences/wm.nix

···
+{
+  system.defaults.CustomUserPreferences = {
+    "com.apple.spaces" = {
+      "spans-displays" = 0; # Display have seperate spaces
+    };
+
+    "com.apple.WindowManager" = {
+      EnableStandardClickToShowDesktop = 0; # Click wallpaper to reveal desktop
+      StandardHideDesktopIcons = 0; # Show items on desktop
+      HideDesktop = 0; # Do not hide items on desktop & stage manager
+      StageManagerHideWidgets = 0;
+      StandardHideWidgets = 0;
+    };
+  };
+}

modules/darwin/security.nix

···
-{
-  security.pam.enableSudoTouchIdAuth = true;
-
-  # Apple menu > System Preferences > Security and firewall
-  # Drops incoming requests via ICMP such as ping requests. Default is 0.
-  system.defaults.alf.stealthenabled = 1; # enabled
-}

modules/darwin/security/ads.nix

···
+{
+  system.defaults.CustomUserPreferences."com.apple.AdLib".allowApplePersonalizedAdvertising = false;
+}

modules/darwin/security/default.nix

···
+{
+  imports = [
+    ./ads.nix # remove ads
+    ./firewall.nix # firewall
+    ./pam.nix # pam security settings
+  ];
+}

modules/darwin/security/firewall.nix

···
+{
+  system.defaults.alf = {
+    allowdownloadsignedenabled = 0;
+    allowsignedenabled = 1;
+    globalstate = 0;
+    loggingenabled = 0;
+
+    # Apple menu > System Preferences > Security and firewall
+    # Drops incoming requests via ICMP such as ping requests. Default is 0.
+    stealthenabled = 1;
+  };
+}

modules/darwin/security/pam.nix

···
+{
+  security.pam.enableSudoTouchIdAuth = true;
+}