flake.lock | 217 ++++++++++------------------- flake.nix | 21 ++- hosts/desktop/configuration.nix | 234 +++++++++++--------------------- hosts/desktop/home.nix | 21 +-- hosts/laptop/configuration.nix | 35 ++--- hosts/laptop/home.nix | 28 +--- hosts/shared/home-programs.nix | 5 +- hosts/shared/packages.nix | 3 +- lib/mkSystem.nix | 135 ++++++++++-------- modules/nixos/ld.nix | 85 ++++++++++++ modules/nixos/services.nix | 11 +- modules/shared/extras.nix | 11 +- modules/shared/home-manager.nix | 8 ++ modules/shared/nix.nix | 2 + 14 files changed, 386 insertions(+), 430 deletions(-)