meta: Merge rar container with wine

I'll rename this later, but basically I got tired of the vastly
increased build times due to having multiple containers, and would
rather combine containers where possible.

Although unfortunate, this should still be better than not using
containers at all, and by making the usage of such containers easier,
the probability of using them increases as well.
This commit is contained in:
Donovan Glover 2023-08-31 10:06:51 -04:00
parent cc0500b3ad
commit 8bf12e9f3b
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 14 additions and 56 deletions

View File

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

View File

@ -1,54 +0,0 @@
{
containers.rar = {
privateNetwork = true;
bindMounts = {
"/home/user" = {
hostPath = "/home/user/containers/rar";
isReadOnly = false;
};
};
config = { pkgs, lib, ... }: {
programs = {
fish.enable = true;
neovim.enable = true;
starship.enable = true;
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [ fish ];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
};
environment.systemPackages = with pkgs; [
kitty
rar
unrar
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"rar"
"unrar"
];
system.stateVersion = "22.11";
};
};
}

View File

@ -1,4 +1,10 @@
{ stylix, home-manager, sakaya, pkgs, ... }:
{ stylix
, home-manager
, sakaya
, pkgs
, lib
, ...
}:
{
systemd.tmpfiles.rules = [
@ -83,6 +89,13 @@
wineWowPackages.stagingFull
winetricks
sakaya.packages.${pkgs.system}.sakaya
rar
unrar
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"rar"
"unrar"
];
environment.sessionVariables = {