From 9e3eefee6ae0c01ed34f528725e8935b38f1ed0c Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Mon, 3 Jun 2024 10:30:27 -0500
Subject: [PATCH] put win10vm in proper module

---
 modules/virtualization/docker.nix     | 17 +----------------
 modules/virtualization/virtualbox.nix | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/virtualization/docker.nix b/modules/virtualization/docker.nix
index f757dd8..1ccf48c 100644
--- a/modules/virtualization/docker.nix
+++ b/modules/virtualization/docker.nix
@@ -4,22 +4,7 @@
   mkOizysModule,
   ...
 }:
-let
-# TODO: polish this up
- win10vm = pkgs.stdenvNoCC.mkDerivation {
-  name = "win10vm";
-  unpackPhase = "true";
-  buildPhase = "mkdir $out";
-  version = "unstable";
-  desktopItem = pkgs.makeDesktopItem {
-    name = "win10vm";
-    exec = "VBoxManage startvm win10";
-    # icon = ""; # TODO: add windows icon
-    desktopName = "Windows 10 VM";
-  };
-};
-in 
 mkOizysModule config "docker" {
   virtualisation.docker.enable = true;
-  environment.systemPackages = (with pkgs; [ lazydocker]) ++ [ win10vm];
+  environment.systemPackages = with pkgs; [ lazydocker];
 }
diff --git a/modules/virtualization/virtualbox.nix b/modules/virtualization/virtualbox.nix
index 6adf324..ba08eba 100644
--- a/modules/virtualization/virtualbox.nix
+++ b/modules/virtualization/virtualbox.nix
@@ -1,7 +1,23 @@
-{ config, mkOizysModule, ... }:
+{ config, mkOizysModule, pkgs,... }:
+let
+# TODO: polish this up
+ win10vm = pkgs.stdenvNoCC.mkDerivation {
+  name = "win10vm";
+  unpackPhase = "true";
+  buildPhase = "mkdir $out";
+  version = "unstable";
+  desktopItem = pkgs.makeDesktopItem {
+    name = "win10vm";
+    exec = "VBoxManage startvm win10";
+    # icon = ""; # TODO: add windows icon
+    desktopName = "Windows 10 VM";
+  };
+};
+in
 mkOizysModule config "vbox" {
   virtualisation.virtualbox = {
     host.enable = true;
   };
   users.extraGroups.vboxusers.members = [ "daylin" ];
+  environment.systemPackages = [ win10vm ];
 }