flake.nix                               | 35 +++++--------
 lib/mkSystem.nix                        | 33 ++++++------
 modules/home-manager.nix                |  3 +-
 modules/macos/default.nix               |  7 +++
 modules/macos/system.nix                |  8 +--
 modules/macos/tiling/aerospace.nix      |  4 +-
 modules/macos/tiling/default.nix        | 16 +++++-
 modules/macos/tiling/sketchybar.nix     |  4 +-
 modules/nixos/default.nix               |  8 ++-
 modules/shared/user-system-settings.nix | 21 +++++---
 readme.md                               | 29 ++++++++++-
 users/chloe/configuration.nix           | 10 ++--
 users/chloe/user.nix                    |  2 +-
 users/natalie/configuration.nix         | 18 ++++++-
 users/natalie/desktop/configuration.nix | 14 ++---
 users/natalie/desktop/home.nix          | 88 ++++++++++++++------------------
 users/natalie/home.nix                  | 25 ++++-----
 users/natalie/laptop/configuration.nix  |  6 +--
 users/natalie/laptop/home.nix           | 11 ++--
 users/natalie/packages.nix              |  7 +--
 users/natalie/user.nix                  | 13 +++++
 21 files changed, 210 insertions(+), 152 deletions(-)