diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 664322d..f1e7387 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam]; + path = with pkgs; [udisks bash auto-mount steam]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 2ebcef8..b35973b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -25,7 +25,7 @@ ../../../disko/shodan - # ./auto-mount.nix + ./auto-mount.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 37a8ef2..7872cb4 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -3,11 +3,6 @@ stdenv, system, pkgs, - jq, - coreutils, - udisks, - toybox, - util-linux, writeShellApplication, }: writeShellApplication @@ -16,7 +11,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; + runtimeInputs = [pkgs.steam]; text = '' set -euo pipefail @@ -76,7 +71,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi