From a03963d1f7480b0e55f89142b8c01be4bd44ead5 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 4 Apr 2024 12:19:41 -0400 Subject: [PATCH] meta: Merge wine module with desktop Makes it easier to just import the desktop module and use everything we want. --- modules/desktop.nix | 4 ++++ modules/wine.nix | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 modules/wine.nix diff --git a/modules/desktop.nix b/modules/desktop.nix index 89ae3107..0f5504a2 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -15,11 +15,15 @@ in options.modules.desktop = { japanese = mkEnableOption "Japanese support (fcitx, anki, kanjidraw, etc.)"; bloat = mkEnableOption "GUI applications like Logseq"; + wine = mkEnableOption "wine support"; }; config = with cfg; { + hardware.opengl.driSupport32Bit = mkIf wine true; + programs = { hyprland.enable = true; + cdemu.enable = mkIf wine true; thunar = { enable = true; diff --git a/modules/wine.nix b/modules/wine.nix deleted file mode 100644 index e97e4e61..00000000 --- a/modules/wine.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - hardware.opengl.driSupport32Bit = true; - programs.cdemu.enable = true; -}