refactor: get rid of vars and move common to modules

2024-11-22 23:15:13 -05:00 · 2024-11-22 23:15:13 -05:00 · c43560ff95
commit c43560ff95
parent e8fff0bbd3
35 changed files with 411 additions and 427 deletions
--- a/lib/flake/default.nix
+++ b/lib/flake/default.nix
@ -32,15 +32,16 @@ inputs: rec {
  mkNixOS = {
    extraModules ? [],
    cudaSupport ? false,
+    mainUser ? "matt",
  }:
    inputs.nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
-      specialArgs = inputs;
+      specialArgs = inputs // {inherit mainUser;};
      modules =
        [
          (allowModularOverrides {inherit system cudaSupport;})
+          inputs.home-manager.nixosModules.home-manager
          {home-manager.extraSpecialArgs = specialArgs;}
-          ../../common
        ]
        ++ extraModules;
    };