extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2024-11-22 08:14:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

containers: merge default.nix with wine.nix

Browse Source 
It turns out that I shouldn't actually need graphical container support
for most containers, which might also improve build times with multiple
containers.
This commit is contained in:
Donovan Glover 2024-10-11 12:27:50 -04:00
parent f12d57c8f8
commit 11c555d2c5
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 52 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
containers/default.nix
View File

@ -1,46 +0,0 @@
{ nix-config, ... }:
{
imports = with nix-config.nixosModules; [
shell
desktop
system
stylix
fonts
];
home-manager.sharedModules = with nix-config.homeModules; [
fish
git
gtk
kitty
neovim
xresources
yazi
];
nixpkgs.overlays = builtins.attrValues nix-config.overlays;
environment = {
variables = {
TERM = "xterm-kitty";
};
sessionVariables = {
WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
XDG_RUNTIME_DIR = "/run/user/1000";
DISPLAY = ":0";
QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
SDL_IM_MODULE = "fcitx";
GLFW_IM_MODULE = "ibus";
};
};
hardware.graphics.enable = true;
}

66
containers/wine.nix
View File

@ -14,6 +14,58 @@ let
sakayaPort = 39493;
in
{
imports = with nix-config.nixosModules; [
shell
desktop
system
stylix
fonts
];
home-manager.sharedModules = with nix-config.homeModules; [
fish
git
gtk
kitty
neovim
xresources
yazi
];
nixpkgs.overlays = builtins.attrValues nix-config.overlays;
environment = {
systemPackages =
(with pkgs; [
wineWowPackages.waylandFull
winetricks
])
++ [ sakaya ];
variables = {
TERM = "xterm-kitty";
};
sessionVariables = {
WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
XDG_RUNTIME_DIR = "/run/user/1000";
DISPLAY = ":0";
QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
SDL_IM_MODULE = "fcitx";
GLFW_IM_MODULE = "ibus";
LC_ALL = "ja_JP.UTF-8";
TZ = "Asia/Tokyo";
};
};
hardware.graphics.enable = true;
networking = {
nat.forwardPorts = singleton {
destination = "192.168.100.49:${sakayaPort}";
@ -39,18 +91,4 @@ in
wantedBy = [ "multi-user.target" ];
};
environment = {
systemPackages =
(with pkgs; [
wineWowPackages.waylandFull
winetricks
])
++ [ sakaya ];
sessionVariables = {
LC_ALL = "ja_JP.UTF-8";
TZ = "Asia/Tokyo";
};
};
}

1
modules/containers.nix
View File

@ -67,7 +67,6 @@ in
{ ... }:
{
imports = [
../containers
../containers/wine.nix
];
};