Compare commits

...

2 Commits

Author SHA1 Message Date
4214ac143d update 2025-04-18 17:47:03 -04:00
5d78c2d6e9 traffic shaping improvements 2025-04-17 18:36:52 -04:00
3 changed files with 20 additions and 12 deletions

View File

@@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
nixos-rebuild switch --flake .#muffin --target-host root@server-public --build-host root@server-public --verbose nixos-rebuild boot --flake .#muffin --target-host root@server-public --build-host root@server-public --verbose

18
flake.lock generated
View File

@@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744145203, "lastModified": 1744940522,
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -200,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744791665, "lastModified": 1745006575,
"narHash": "sha256-PeX0XesV1AsM4e+Rv5jIFC67boZl3MQpyC0RvXZZdF8=", "narHash": "sha256-Vxz8jdb0yNmJRlTZqmIG4nSLpeJl581aQxz/lwAtEMg=",
"owner": "ggml-org", "owner": "ggml-org",
"repo": "llama.cpp", "repo": "llama.cpp",
"rev": "b43d89e311c5e7fbf62e5ec3c0401eb536677267", "rev": "6408210082cc0a61b992b487be7e2ff2efbb9e36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -222,11 +222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744768706, "lastModified": 1744941245,
"narHash": "sha256-7W63qdst98cXE4j/QDF1L3OHz5N5JjcfTVL17a4a3kw=", "narHash": "sha256-tIfmf4UYcbhCtV0CwJkB7S1zrWzodtB/jYyoMvKSvug=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "46be353e058e970480a9c62ee94a0d1ad2f0c569", "rev": "556c14e59b53c7c1d70823919d8a02c763e8a9f1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -29,8 +29,8 @@
systemd.services."traffic-shaping" = systemd.services."traffic-shaping" =
let let
upload_pipe = 20; upload_pipe = 22;
high_prio = 18; high_prio = 20;
low_prio = 2; low_prio = 2;
in in
{ {
@@ -56,6 +56,14 @@
# Direct marked packets to low-priority class # Direct marked packets to low-priority class
${pkgs.iproute2}/bin/tc filter add dev ${eth_interface} parent 1: protocol ip prio 1 handle 1 fw flowid 1:20 ${pkgs.iproute2}/bin/tc filter add dev ${eth_interface} parent 1: protocol ip prio 1 handle 1 fw flowid 1:20
''; '';
ExecStop = pkgs.writeShellScript "tc-stop" ''
${pkgs.iproute2}/bin/tc filter del dev ${eth_interface} parent 1:
${pkgs.iproute2}/bin/tc class del dev ${eth_interface} parent 1: classid 1:20
${pkgs.iproute2}/bin/tc class del dev ${eth_interface} parent 1: classid 1:10
${pkgs.iproute2}/bin/tc class del dev ${eth_interface} parent 1: classid 1:1
${pkgs.iproute2}/bin/tc qdisc del dev ${eth_interface} root
'';
}; };
}; };
} }