From 1bfdcaa96c2643427957b1040032b45622b59e3d Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 22 Jun 2023 12:51:35 -0400 Subject: [PATCH] containers(wine): Migrate to setup.nix --- containers/wine.nix | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/containers/wine.nix b/containers/wine.nix index 403aa1bc..fa2eebe7 100644 --- a/containers/wine.nix +++ b/containers/wine.nix @@ -1,4 +1,5 @@ containers.wine = { +{ stylix, home-manager, ... }: { privateNetwork = true; ephemeral = true; @@ -34,6 +35,9 @@ config = { pkgs, ... }: { imports = [ + stylix.nixosModules.stylix + home-manager.nixosModules.home-manager + ../setup.nix ../modules/pipewire.nix ]; @@ -43,7 +47,6 @@ starship.enable = true; }; - users = { defaultUserShell = pkgs.fish; mutableUsers = false; @@ -57,39 +60,12 @@ environment = { shells = with pkgs; [ fish ]; - - variables = { - TERM = "xterm-kitty"; - }; - - defaultPackages = [ ]; }; environment.systemPackages = with pkgs; [ - kitty wineWowPackages.stagingFull winetricks ]; - - environment.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"; - }; - - services.xserver.enable = true; - - hardware.opengl = { - enable = true; - driSupport32Bit = true; - }; - - system.stateVersion = "22.11"; }; }; }