final final yt-block fixes
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{ pkgs
|
||||
, ...
|
||||
}: let
|
||||
python = pkgs.python3.withPackages (ps: with ps; [pkgs.python311Packages.cryptography]);
|
||||
python = pkgs.python3.withPackages (ps: with ps; [ pkgs.python311Packages.cryptography pkgs.python311Packages.psutil ]);
|
||||
python_script = pkgs.writeText "main-py" (builtins.readFile ./main.py);
|
||||
read-helper = pkgs.callPackage ./read-helper.nix {};
|
||||
in pkgs.writeShellApplication {
|
||||
|
||||
@@ -8,6 +8,7 @@ import json
|
||||
import base64
|
||||
import subprocess
|
||||
import time
|
||||
import psutil
|
||||
|
||||
YT_TIME_MAX = 60 # in min
|
||||
STATE_FILE = "/etc/yt_block_state"
|
||||
@@ -247,13 +248,9 @@ def unblock_yt():
|
||||
print("running: iptables -X YTBLOCK")
|
||||
|
||||
def kill_mc():
|
||||
try:
|
||||
output = subprocess.check_output(['bash', '-c', "ps fax | grep minecraft"])
|
||||
for line in output.decode().split("\n"):
|
||||
if line.find("java") != -1:
|
||||
kill_line(line)
|
||||
except Exception as e:
|
||||
print("killing failed", e)
|
||||
for proc in psutil.process_iter():
|
||||
if "org.prismlauncher.EntryPoint" in proc.cmdline():
|
||||
os.system(f"kill {proc.pid}")
|
||||
|
||||
def kill_line(line):
|
||||
print("line:", line)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
yt_block = pkgs.callPackage ./app.nix {};
|
||||
in {
|
||||
@@ -14,6 +14,8 @@ in {
|
||||
};
|
||||
environment.systemPackages = [ yt_block ];
|
||||
|
||||
boot.extraModulePackages = [ (pkgs.callPackage ./unkillable-process-kernel-module.nix {}) ];
|
||||
boot.extraModulePackages = [ (pkgs.callPackage ./unkillable-process-kernel-module.nix {
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
}) ];
|
||||
boot.kernelModules = [ "unkillable" ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user