diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index bb84321..f007c14 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -13,6 +13,7 @@ in { ./kde.nix ./vinzenz.nix ./ronja.nix + ./gaming.nix ]; options.my.desktop = { @@ -21,6 +22,7 @@ in { kde.enable = lib.mkEnableOption "KDE desktop"; ronja.enable = lib.mkEnableOption "user ronja"; vinzenz.enable = lib.mkEnableOption "user vinzenz"; + gaming.enable = lib.mkEnableOption "gaming with wine"; }; config = lib.mkIf cfg.enable { diff --git a/modules/desktop/gaming.nix b/modules/desktop/gaming.nix new file mode 100644 index 0000000..81382f7 --- /dev/null +++ b/modules/desktop/gaming.nix @@ -0,0 +1,29 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.my.desktop.gaming; +in { + imports = []; + config = lib.mkIf cfg.enable { + hardware.opengl.driSupport32Bit = true; + + environment.systemPackages = with pkgs; [ + wineWowPackages.stagingFull + wineWowPackages.fonts + winetricks + steam + + (lutris.override { + extraPkgs = pkgs: [ + # List package dependencies here + ]; + extraLibraries = pkgs: [ + # List library dependencies here + ]; + }) + ]; + }; +} diff --git a/modules/desktop/ronja.nix b/modules/desktop/ronja.nix index c938443..ef5e71c 100644 --- a/modules/desktop/ronja.nix +++ b/modules/desktop/ronja.nix @@ -33,22 +33,8 @@ in { packages = with pkgs; [ ## Apps - steam telegram-desktop - lutris kdiff3 - wineWowPackages.stagingFull - wineWowPackages.fonts - winetricks - - (lutris.override { - extraPkgs = pkgs: [ - # List package dependencies here - ]; - extraLibraries = pkgs: [ - # List library dependencies here - ]; - }) ]; file.".nanorc".text = '' diff --git a/modules/desktop/vinzenz.nix b/modules/desktop/vinzenz.nix index 94814f0..62bc3a6 100644 --- a/modules/desktop/vinzenz.nix +++ b/modules/desktop/vinzenz.nix @@ -32,7 +32,6 @@ in { packages = with pkgs; [ keepassxc - steam insync telegram-desktop simple-scan @@ -40,7 +39,6 @@ in { element-desktop etcher iotop - radeontop lsof wirelesstools thefuck @@ -53,19 +51,7 @@ in { jetbrains.pycharm-professional kdiff3 docker - wineWowPackages.stagingFull - wineWowPackages.fonts - winetricks youtube-music - - (lutris.override { - extraPkgs = pkgs: [ - # List package dependencies here - ]; - extraLibraries = pkgs: [ - # List library dependencies here - ]; - }) ]; file.".nanorc".text = '' diff --git a/vinzenz-pc2.nix b/vinzenz-pc2.nix index 67162fc..61818a3 100644 --- a/vinzenz-pc2.nix +++ b/vinzenz-pc2.nix @@ -1,19 +1,20 @@ -{...}: { +{pkgs, ...}: { imports = [ ./modules/desktop (import ./modules/hardware "vinzenz-pc2") ]; config = { - my = { - desktop = { - enable = true; - kde.enable = true; - vinzenz.enable = true; - ronja.enable = true; - }; + my.desktop = { + enable = true; + kde.enable = true; + vinzenz.enable = true; + ronja.enable = true; + gaming.enable = true; }; + environment.systemPackages = [pkgs.radeontop]; + users.groups."games" = { members = ["vinzenz" "ronja"]; };