From 94d786e1d04042eee5bfff0d275cf1eb3cf5b846 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Thu, 16 May 2024 22:03:46 +1200 Subject: [PATCH] feat(homeModules:gaming): add bottles and wine related pkgs --- home/modules/desktop/gaming/bottles/default.nix | 17 +++++++++++++++++ home/modules/desktop/gaming/default.nix | 1 + home/modules/desktop/gaming/lutris/default.nix | 12 +++++++++++- home/profile/gaming/default.nix | 11 +++++++++-- system/modules/gaming/default.nix | 1 + 5 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 home/modules/desktop/gaming/bottles/default.nix diff --git a/home/modules/desktop/gaming/bottles/default.nix b/home/modules/desktop/gaming/bottles/default.nix new file mode 100644 index 0000000..80e4401 --- /dev/null +++ b/home/modules/desktop/gaming/bottles/default.nix @@ -0,0 +1,17 @@ +{ lib, config, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf; + cfg = config.homeModules.desktop.gaming.bottles; +in + +{ + options.homeModules.desktop.gaming.bottles.enable = mkEnableOption "Enable bottles home-manager modules"; + + config = mkIf cfg.enable { + home.packages = with pkgs; [ + bottles + ]; + }; + +} diff --git a/home/modules/desktop/gaming/default.nix b/home/modules/desktop/gaming/default.nix index 49d170e..24800f5 100644 --- a/home/modules/desktop/gaming/default.nix +++ b/home/modules/desktop/gaming/default.nix @@ -5,6 +5,7 @@ imports = [ ./factorio ./lutris + ./bottles ]; options.homeModules.desktop.gaming = { diff --git a/home/modules/desktop/gaming/lutris/default.nix b/home/modules/desktop/gaming/lutris/default.nix index 8eda024..7985dbc 100644 --- a/home/modules/desktop/gaming/lutris/default.nix +++ b/home/modules/desktop/gaming/lutris/default.nix @@ -9,6 +9,16 @@ in options.homeModules.desktop.gaming.lutris.enable = mkEnableOption "Enable lutris home-manager module"; config = mkIf cfg.enable { - home.packages = [ pkgs.lutris ]; + home.packages = with pkgs; [ + (lutris.override { + extraPkgs = p: [ + p.pixman + p.libjpeg + p.gnome.zenity + p.gamescope + ]; + }) + winetricks + ]; }; } diff --git a/home/profile/gaming/default.nix b/home/profile/gaming/default.nix index 3d97450..92dff77 100644 --- a/home/profile/gaming/default.nix +++ b/home/profile/gaming/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let cfg = config.profiles.gaming; in @@ -11,8 +11,15 @@ in config = lib.mkIf cfg.enable { homeModules.desktop = { gaming = { - lutris.enable = true; + lutris.enable = false; }; }; + home.packages = with pkgs; [ + bottles + winetricks + protontricks + protonup-qt + wineWowPackages.full + ]; }; } diff --git a/system/modules/gaming/default.nix b/system/modules/gaming/default.nix index 7697da2..597245a 100644 --- a/system/modules/gaming/default.nix +++ b/system/modules/gaming/default.nix @@ -28,6 +28,7 @@ in { config = mkIf (elem "gaming" host.function) { hardware.opengl.extraPackages = [ pkgs.gamescope ]; + services.flatpak.enable = true; programs = { steam = { enable = true;