From a28b33a2d9cb3a3e53e7d70c9b574891cf2a8a5d Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 31 Aug 2023 10:10:12 -0400
Subject: [PATCH] meta: Merge iamb container with wine

Similar to the previous commit, I'm trying to reduce build times here.
Containers are great but each one increases the build time by a
non-trivial amount. By limiting the amount of containers and using
virtual machines for things that "absolutely need to be virtualized",
build times overall should be more productive.
---
 containers/default.nix |  1 -
 containers/iamb.nix    | 39 ---------------------------------------
 containers/wine.nix    |  1 +
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 containers/iamb.nix

diff --git a/containers/default.nix b/containers/default.nix
index 02f11c84..c7c98ac0 100644
--- a/containers/default.nix
+++ b/containers/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./dev.nix
-    ./iamb.nix
     ./srb2.nix
     ./wine.nix
   ];
diff --git a/containers/iamb.nix b/containers/iamb.nix
deleted file mode 100644
index fec7dcc0..00000000
--- a/containers/iamb.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stylix, home-manager, ... }:
-
-{
-  containers.iamb = {
-    privateNetwork = true;
-    ephemeral = true;
-    hostAddress = "192.168.100.70";
-    localAddress = "192.168.100.71";
-
-    bindMounts = {
-      "/home/user" = {
-        hostPath = "/home/user/containers/iamb";
-        isReadOnly = false;
-      };
-
-      waylandDisplay = rec {
-        hostPath = "/run/user/1000";
-        mountPoint = hostPath;
-      };
-
-      x11Display = rec {
-        hostPath = "/tmp/.X11-unix";
-        mountPoint = hostPath;
-      };
-    };
-
-    config = { pkgs, ... }: {
-      imports = [
-        stylix.nixosModules.stylix
-        home-manager.nixosModules.home-manager
-        ../setup.nix
-      ];
-
-      environment.systemPackages = with pkgs; [
-        iamb
-      ];
-    };
-  };
-}
diff --git a/containers/wine.nix b/containers/wine.nix
index da8cb665..a64d3bae 100644
--- a/containers/wine.nix
+++ b/containers/wine.nix
@@ -91,6 +91,7 @@
         sakaya.packages.${pkgs.system}.sakaya
         rar
         unrar
+        iamb
       ];
 
       nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [