flake.nix                       | 67 ++++++++++++------------------
 lib/mkSystem.nix                | 70 ++++++++++++++++++++++++++++++++
 modules/shared/extras.nix       |  5 ---
 modules/shared/home-manager.nix |  8 ----
 modules/shared/modules.nix      | 13 ------
 modules/shared/vars.nix         | 23 -----------
 6 files changed, 95 insertions(+), 91 deletions(-)