fixes
This commit is contained in:
parent
57b1e97cad
commit
2f3d239dec
4 changed files with 3 additions and 79 deletions
|
|
@ -10,12 +10,6 @@ in {
|
|||
options.gaming = {
|
||||
enable = mkEnableOption "Enable gaming stuff";
|
||||
|
||||
newWine = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "If you want to include wine-staging as new-wine";
|
||||
};
|
||||
|
||||
steamService = mkOption {
|
||||
type = types.bool;
|
||||
description = "Enable running steam as a service";
|
||||
|
|
@ -35,48 +29,10 @@ in {
|
|||
STAGING_RT_PRIORITY_SERVER = 90;
|
||||
};
|
||||
|
||||
home.packages = let
|
||||
newwine = pkgs.winePackages.waylandFull.override {
|
||||
wineBuild = "wineWow";
|
||||
wineRelease = "staging";
|
||||
};
|
||||
newwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
|
||||
pathAdd = "${newwine}/bin:" + old.pathAdd;
|
||||
postInstall = ''
|
||||
sed -i \
|
||||
-e '2i PATH="${pathAdd}"' \
|
||||
"$out/bin/winetricks"
|
||||
'';
|
||||
});
|
||||
|
||||
oldwine = pkgs.wineWowPackages.waylandFull;
|
||||
oldwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
|
||||
pathAdd = "${oldwine}/bin:" + old.pathAdd;
|
||||
postInstall = ''
|
||||
sed -i \
|
||||
-e '2i PATH="${pathAdd}"' \
|
||||
"$out/bin/winetricks"
|
||||
'';
|
||||
});
|
||||
in
|
||||
with pkgs;
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
oldwine
|
||||
oldwinetricks
|
||||
|
||||
sc-controller
|
||||
]
|
||||
++ lib.optionals cfg.newWine [
|
||||
(
|
||||
pkgs.runCommand "new-wine-stuff"
|
||||
{} ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${newwine}/bin/wine $out/bin/new-wine
|
||||
ln -s ${newwine}/bin/winecfg $out/bin/new-winecfg
|
||||
ln -s ${newwinetricks}/bin/winetricks $out/bin/new-winetricks
|
||||
''
|
||||
)
|
||||
]
|
||||
++ lib.optional cfg.steamService (pkgs.writeShellScriptBin "steam" "${pkgs.systemd}/bin/systemctl --user start steam");
|
||||
|
||||
systemd.user.services.scc = mkIf cfg.scService {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue