From 1c6708bad5ab0a045f185e3ab757231fc5ab50bd Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Sun, 29 Jun 2025 15:06:42 +0800 Subject: [PATCH] feat(wine): use bottles --- config/hosts/imxyy-nix/home.nix | 1 - modules/desktop/wine.nix | 25 +++++++++++++++++++++++++ overlays/default.nix | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 modules/desktop/wine.nix diff --git a/config/hosts/imxyy-nix/home.nix b/config/hosts/imxyy-nix/home.nix index 1339991..296dcd8 100644 --- a/config/hosts/imxyy-nix/home.nix +++ b/config/hosts/imxyy-nix/home.nix @@ -158,7 +158,6 @@ "bin" "workspace" - "WineApps" "Virt" ".cache" diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix new file mode 100644 index 0000000..98efc26 --- /dev/null +++ b/modules/desktop/wine.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + ... +}: +lib.my.makeSwitch { + inherit config; + default = true; + optionName = "wine"; + optionPath = [ + "desktop" + "wine" + ]; + config' = { + my.home.home.packages = with pkgs; [ + wineWayland + proton-ge-custom + bottles + ]; + my.persist.homeDirs = [ + ".local/share/bottles" + ]; + }; +} diff --git a/overlays/default.nix b/overlays/default.nix index 005a9b0..c919b5c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,6 +7,7 @@ infuse prev { cage.__output.patches.__append = [ ./cage-specify-output-name.patch ]; matrix-synapse.__assign = final.stable.matrix-synapse; + bottles.__input.removeWarningPopup.__assign = true; qq.__output.preInstall.__append = '' gappsWrapperArgs+=( --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--wayland-text-input-version=3}}"