no more user steam
This commit is contained in:
parent
31e241a3d6
commit
66bdc5730f
@ -4,7 +4,6 @@ inputs:
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(lib.mkAliasOptionModule [ "ezpcusr" "gaming" ] [ "gaming" "enable" ])
|
(lib.mkAliasOptionModule [ "ezpcusr" "gaming" ] [ "gaming" "enable" ])
|
||||||
(lib.mkAliasOptionModule [ "ezpcusr" "flatSteam" ] [ "gaming" "flatSteam" ])
|
|
||||||
(lib.mkAliasOptionModule [ "ezpcusr" "newWine" ] [ "gaming" "newWine" ])
|
(lib.mkAliasOptionModule [ "ezpcusr" "newWine" ] [ "gaming" "newWine" ])
|
||||||
|
|
||||||
(import ./ezpcusr.nix inputs)
|
(import ./ezpcusr.nix inputs)
|
||||||
|
@ -12,21 +12,11 @@ in
|
|||||||
default = false;
|
default = false;
|
||||||
description = "If you want to include wine-staging as new-wine";
|
description = "If you want to include wine-staging as new-wine";
|
||||||
};
|
};
|
||||||
|
|
||||||
flatSteam = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "If you use the flatpak Steam instead of NixOS";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages =
|
home.packages =
|
||||||
let
|
let
|
||||||
steam = pkgs.steam.override { withJava = true; };
|
|
||||||
|
|
||||||
steam-run = steam.run;
|
|
||||||
|
|
||||||
newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
|
newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
|
||||||
newwinetricks = pkgs.winetricks.override { wine = newwine; };
|
newwinetricks = pkgs.winetricks.override { wine = newwine; };
|
||||||
|
|
||||||
@ -37,13 +27,6 @@ in
|
|||||||
oldwine
|
oldwine
|
||||||
oldwinetricks
|
oldwinetricks
|
||||||
sc-controller
|
sc-controller
|
||||||
] ++ lib.optionals (!cfg.flatSteam) [
|
|
||||||
steam
|
|
||||||
steam-run
|
|
||||||
(writeScriptBin "steam-run-native" ''
|
|
||||||
#!${pkgs.stdenv.shell}
|
|
||||||
${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@
|
|
||||||
'')
|
|
||||||
] ++ lib.optionals cfg.newWine [
|
] ++ lib.optionals cfg.newWine [
|
||||||
(
|
(
|
||||||
pkgs.runCommand "new-wine-stuff"
|
pkgs.runCommand "new-wine-stuff"
|
||||||
|
Loading…
Reference in New Issue
Block a user