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.
This commit is contained in:
Donovan Glover
2023-08-31 10:10:12 -04:00
parent 8bf12e9f3b
commit a28b33a2d9
3 changed files with 1 additions and 40 deletions

View File

@@ -1,7 +1,6 @@
{ {
imports = [ imports = [
./dev.nix ./dev.nix
./iamb.nix
./srb2.nix ./srb2.nix
./wine.nix ./wine.nix
]; ];

View File

@@ -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
];
};
};
}

View File

@@ -91,6 +91,7 @@
sakaya.packages.${pkgs.system}.sakaya sakaya.packages.${pkgs.system}.sakaya
rar rar
unrar unrar
iamb
]; ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [