chore: merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Ahwx 2025-10-03 16:27:47 +02:00
commit 0b5f8d2633
30 changed files with 623 additions and 479 deletions

View file

@ -35,20 +35,20 @@
allowedUDPPorts = [
5201
];
interfaces."ens4s1".allowedTCPPorts = [
# allow everything for local link
{
from = 1;
to = 65354;
}
];
interfaces."ens4s1".allowedUDPPorts = [
# allow everything for local link
{
from = 1;
to = 65354;
}
];
#interfaces."ens4s1".allowedTCPPorts = [
# # allow everything for local link
# {
# from = 0;
# to = 60000;
# }
#];
#interfaces."ens4s1".allowedUDPPorts = [
# # allow everything for local link
# {
# from = 0;
# to = 65536;
# }
#];
};
};
@ -82,6 +82,7 @@
services.zfs = {
autoScrub.enable = true;
autoScrub.interval = "weekly";
trim.enable = true;
};

View file

@ -9,10 +9,11 @@
imports = [
./hardware-configuration.nix
./../../modules/core
# ./../../modules/home/nfs.nix
./../../modules/home/steam.nix
./../../modules/core/virtualization.nix
./../../modules/services/tailscale.nix
./../../modules/services/mpd.nix
./../../modules/services/ollama.nix
];
powerManagement = {
@ -26,17 +27,15 @@
networkmanager.enable = true;
};
systemd.network.networks."99-local" = {
matchConfig.name = "enp68s0";
address = [
"192.168.1.100/24"
];
routes = [
{
Gateway = "172.16.10.1";
GatewayOnLink = false;
}
];
networking = {
interfaces.ens4d1 = {
ipv4.addresses = [
{
address = "192.168.1.101";
prefixLength = 24;
}
];
};
};
liv = {