diff --git a/flake.nix b/flake.nix index 829ef80..fd5fc5b 100644 --- a/flake.nix +++ b/flake.nix @@ -22,16 +22,6 @@ inherit (oslib) osdb; zig-env = zig2nix.outputs.zig-env.${system} { zig = zig2nix.outputs.packages.${system}.zig.master.bin; }; - - # hello-vm = oslib.mkVM { - # name = "hello"; - # uuid = "c0c49ae7-6fe4-4c39-a8ae-c80c6b689344"; - # arch = "x86_64"; - # isos.beforeInstall = [ - # { index = 1; file = "${osdb.windows."6.1.7601".professional.x86_64.installer}/out.iso"; } - # { index = 2; file = "${osdb.windows."6.1.7601".professional.x86_64.unattend}/out.iso"; } - # ]; - # }; in { mkFlake = config: flake-utils.lib.eachDefaultSystem(system: @@ -39,7 +29,7 @@ vm = oslib.mkVM { inherit (config) name uuid; inherit (config.os) arch; - beforeInstall = [ + isos.beforeInstall = [ { index = 1; file = "${osdb.${config.os.name}.${config.os.version}.${config.os.edition}.${config.os.arch}.installer}/out.iso"; } { index = 2; file = "${osdb.${config.os.name}.${config.os.version}.${config.os.edition}.${config.os.arch}.unattend}/out.iso"; } ]; @@ -53,10 +43,6 @@ }); apps = { - # hello-start-vm = flake-utils.lib.mkApp { - # drv = hello-vm.start-vm; - # exePath = ""; - # }; default = zig-env.app-no-root [] "zig build run -- \"$@\""; }; diff --git a/server/flakes/windows/test/flake.lock b/server/flakes/windows/test/flake.lock index f1aadac..8052ddb 100644 --- a/server/flakes/windows/test/flake.lock +++ b/server/flakes/windows/test/flake.lock @@ -126,11 +126,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1719259701, - "narHash": "sha256-gl+QC6wnvXbH+oJwqek7N64IPAkKmYwdGp5VjH7bweI=", + "lastModified": 1719259792, + "narHash": "sha256-XX8MuiwtbYvIfb2M7l7gG5wT8Lp5HFS7KMuWEtENnF0=", "ref": "refs/heads/master", - "rev": "0a2dd279027547fc4494d9b2931298bc2b35024e", - "revCount": 4, + "rev": "19ab6d3c7058aa553843e4cb5282e4d970d0e4fd", + "revCount": 5, "type": "git", "url": "https://git.jeevio.xyz/jeeves/oslib" },