cleanup modules

1 files changed, 9 insertions, 20 deletions

diff --git a/flake.nix b/flake.nix
index 3418c82..9836895 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,28 +11,17 @@
       flake =
         let
           system = "x86_64-linux";
-          specialArgs = inputs // { inherit system; };
+          specialArgs = inputs;
+          mkSystem = modules: nixpkgs.lib.nixosSystem {
+            inherit specialArgs system;
+            modules = modules;
+          };
         in
         {
-          nixosConfigurations = {
-            nixos-test = nixpkgs.lib.nixosSystem {
-              inherit specialArgs system;
-              modules = [
-                (import ./machines/nixos-test)
-
-                (import ./modules)
-                (import ./modules/users)
-                {
-                  _module.args.nixinate = {
-                    host = "10.49.212.3";
-                    sshUser = "audron";
-                    buildOn = "remote";
-                    substituteOnTarget = true;
-                    hermetic = false;
-                  };
-                }
-              ];
-            };
+          nixosModules = import ./modules;
+          nixosConfigurations = with self.nixosModules; {
+            vultr-image = mkSystem [ common users image vultr ];
+            nixos-test = mkSystem [ (import ./machines/nixos-test) common users ];
           };
         };
       systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];