flake.lock | 184 ++++++++------ flake.nix | 229 ++++++++++-------- lib/mkNeovim.nix | 29 +++ lib/mkSystem.nix | 190 +++++++-------- modules/home-manager.nix | 82 ------- modules/home/default.nix | 93 ++++++++ modules/home/macos/sketchybar.nix | 408 ++++++++++++++++++++++++++++++++ modules/macos/icons.nix | 16 +- modules/macos/mac-app-store.nix | 11 +- modules/macos/system.nix | 37 ++- modules/macos/tiling/aerospace.nix | 54 ++++- modules/macos/tiling/default.nix | 6 +- modules/macos/tiling/sketchybar.nix | 3 +- modules/neovim/default.nix | 140 +++++++++++ modules/nixos/boot.nix | 3 +- modules/nixos/default.nix | 13 +- modules/nixos/ld.nix | 3 +- modules/nixos/nvidia.nix | 12 +- modules/nixos/services.nix | 7 +- modules/nixvim/default.nix | 96 -------- modules/nixvim/icons.nix | 189 --------------- modules/nixvim/keymaps.nix | 42 ---- modules/nixvim/opts.nix | 65 ----- modules/nixvim/plugins/blink.nix | 69 ------ modules/nixvim/plugins/default.nix | 6 - modules/nixvim/plugins/lz-n.nix | 7 - modules/shared/default.nix | 8 +- modules/shared/nix.nix | 10 +- modules/shared/user-system-settings.nix | 8 +- nvim | 13 + readme.md | 20 +- sample.keys | 9 + users/chloe/configuration.nix | 19 +- users/chloe/home.nix | 84 ++++++- users/chloe/paperback/configuration.nix | 5 - users/chloe/paperback/home.nix | 17 ++ users/chloe/sandwich/configuration.nix | 8 +- users/chloe/user.nix | 2 +- users/chloe/vim.nix | 20 ++ users/natalie/configuration.nix | 3 +- users/natalie/desktop/configuration.nix | 39 +-- users/natalie/desktop/hardware-configuration.nix | 24 +- users/natalie/desktop/home.nix | 10 +- users/natalie/home.nix | 3 +- users/natalie/laptop/configuration.nix | 6 +- users/natalie/laptop/home.nix | 8 +- users/natalie/packages.nix | 8 +- users/natalie/user.nix | 2 +- users/natalie/vim.nix | 9 + 49 files changed, 1367 insertions(+), 962 deletions(-)