From 66bdc5730f2569d6dc3070581812202e287e5303 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Fri, 8 Oct 2021 22:19:32 -0700 Subject: [PATCH] no more user steam --- home-manager/modules/default.nix | 1 - home-manager/modules/gaming.nix | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix index 54f146b..f6d5622 100644 --- a/home-manager/modules/default.nix +++ b/home-manager/modules/default.nix @@ -4,7 +4,6 @@ inputs: { imports = [ (lib.mkAliasOptionModule [ "ezpcusr" "gaming" ] [ "gaming" "enable" ]) - (lib.mkAliasOptionModule [ "ezpcusr" "flatSteam" ] [ "gaming" "flatSteam" ]) (lib.mkAliasOptionModule [ "ezpcusr" "newWine" ] [ "gaming" "newWine" ]) (import ./ezpcusr.nix inputs) diff --git a/home-manager/modules/gaming.nix b/home-manager/modules/gaming.nix index 5084e7a..9771e38 100644 --- a/home-manager/modules/gaming.nix +++ b/home-manager/modules/gaming.nix @@ -12,21 +12,11 @@ in default = false; 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 { home.packages = let - steam = pkgs.steam.override { withJava = true; }; - - steam-run = steam.run; - newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; }); newwinetricks = pkgs.winetricks.override { wine = newwine; }; @@ -37,13 +27,6 @@ in oldwine oldwinetricks 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 [ ( pkgs.runCommand "new-wine-stuff"