diff --git a/pkgs/parrot/default.nix b/pkgs/parrot/default.nix index 19d79a5..22284d2 100644 --- a/pkgs/parrot/default.nix +++ b/pkgs/parrot/default.nix @@ -1,10 +1,14 @@ { + lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, cmake, libopus, + yt-dlp, + ffmpeg, + makeWrapper, }: # yt-dlp and ffmpeg required at runtime rustPlatform.buildRustPackage { @@ -25,7 +29,14 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config cmake + makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/parrot \ + --set PATH ${lib.makeBinPath [ + yt-dlp + ffmpeg + ]}''; cargoSha256 = "sha256-qPyuj5OxHrWz0YbrquCTTKZM3j1poXuioNNvn9z+xDQ="; RUSTC_BOOTSTRAP = 1; diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix index 3c5528c..656efb2 100644 --- a/systems/gerg-desktop/default.nix +++ b/systems/gerg-desktop/default.nix @@ -10,7 +10,6 @@ inputs: { (import ./vfio.nix inputs) (import ./parrot.nix inputs) (import ./spicetify.nix inputs) - #(import ./mining.nix inputs) (import ./zfs inputs) (import ./containers inputs) ]; diff --git a/systems/gerg-desktop/mining.nix b/systems/gerg-desktop/mining.nix deleted file mode 100644 index f3db4aa..0000000 --- a/systems/gerg-desktop/mining.nix +++ /dev/null @@ -1,27 +0,0 @@ -_: { - pkgs, - settings, - ... -}: { - boot = { - kernelModules = ["msr"]; - kernelParams = ["iomem=relaxed" "msr.allow_writes=on"]; - }; - systemd.services.mining = { - enable = true; - path = with pkgs; [t-rex-miner afk-cmds st zsh dbus xmrig]; - wantedBy = ["multi-user.target"]; - wants = ["graphical.target"]; - script = '' - afk-cmds -c /home/${settings.username}/saveme/afk-cmds.json - ''; - environment = { - # PATH="/run/current-system/sw/bin"; missing something with dbus - XAUTHORITY = "/home/${settings.username}/.Xauthority"; - DISPLAY = ":0"; - XDG_DATA_DIRS = "/nix/var/nix/profiles/default/share:/run/current-system/sw/share"; - DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus"; - NO_AT_BRIDGE = "1"; - }; - }; -} diff --git a/systems/gerg-desktop/parrot.nix b/systems/gerg-desktop/parrot.nix index a09aa62..3da061d 100644 --- a/systems/gerg-desktop/parrot.nix +++ b/systems/gerg-desktop/parrot.nix @@ -6,11 +6,10 @@ _: { #discord bot stuff systemd.services.parrot = { enable = true; - path = with pkgs; [parrot yt-dlp ffmpeg]; wantedBy = ["multi-user.target"]; - wants = ["NetworkManager-wait-online.service"]; - after = ["NetworkManager-wait-online.service"]; - script = "parrot"; + wants = ["network-online.target"]; + after = ["network-online.target"]; + script = "${pkgs.parrot}/bin/parrot"; serviceConfig = { EnvironmentFile = config.sops.secrets.discordenv.path; Restart = "on-failure";