From af446a46a29c67a04d15d031f0c6a257bbc42231 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 2 Jun 2020 03:50:36 +0200 Subject: [PATCH] Remove gw2 wrapper --- home/games.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/home/games.nix b/home/games.nix index a7b7e307..e27e2e5b 100644 --- a/home/games.nix +++ b/home/games.nix @@ -1,5 +1,4 @@ -{ pkgs, lib, ... }: -{ +{ pkgs, lib, ... }: { dconf.settings."org/gnome/settings-daemon/plugins/media-keys" = { mic-mute = lib.mkForce [ ]; @@ -10,10 +9,10 @@ volume-down = lib.mkForce [ ]; volume-up = lib.mkForce [ ]; }; + home.packages = builtins.attrValues { inherit (pkgs.unfree) steam; inherit (pkgs) minetest; - gw2 = pkgs.buildFHSUserEnv { name = "gw2"; targetPkgs = pkgs: (with pkgs; [ sambaFull ]); @@ -48,24 +47,7 @@ vulkan-loader vulkan-tools ]); - runScript = let - gw2wrapper = pkgs.writeHaskellScript { - name = "gw2wrapper"; - bins = [ pkgs.procps ]; - imports = [ "System.Directory (withCurrentDirectory)" ]; - - } '' - waitForExit = do - sleep "5s" - processes <- ps "aux" |> captureTrim - when - (BS.isInfixOf (encodeUtf8 "GW2.exe") (toStrict processes)) - waitForExit - main = do - withCurrentDirectory "/home/maralorn/GW2" $ exe "./play.sh" - waitForExit - ''; - in "${gw2wrapper}/bin/gw2wrapper"; + runScript = "/home/maralorn/GW2/play.sh"; }; }; }