Compare commits

...

3 commits

2 changed files with 76 additions and 66 deletions

View file

@ -146,7 +146,7 @@
# Use the systemd-boot EFI boot loader.
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_6_10;
initrd = {
availableKernelModules = [
"nvme"
@ -163,7 +163,6 @@
"apple-mfi-fastcharge"
"zenpower"
];
kernelParams = [ "nvidia_drm.fbdev=1" ];
extraModulePackages = with config.boot.kernelPackages; [
zenpower
cpupower
@ -261,76 +260,85 @@
};
};
systemd.network = {
enable = true;
systemd = {
network = {
enable = true;
# wait-online.extraArgs = [ "--interface=enp4s0" ];
wait-online.anyInterface = true;
# wait-online.extraArgs = [ "--interface=enp4s0" ];
wait-online.anyInterface = true;
links = {
"40-enp4s0" = {
matchConfig = {
Name = "enp4s0";
links = {
"40-enp4s0" = {
matchConfig = {
Name = "enp4s0";
};
linkConfig = {
WakeOnLan = "magic";
};
};
linkConfig = {
WakeOnLan = "magic";
};
netdevs = {
"10-microvm" = {
netdevConfig = {
Kind = "bridge";
Name = "microvm";
};
};
};
networks = {
"40-enp4s0" = {
enable = true;
DHCP = "yes";
domains = [
"internal.horus.nu"
"bedum.horus.nu"
];
dhcpV4Config = {
RouteMetric = 64;
};
matchConfig = {
Name = "enp4s0";
};
};
"40-enp5s0f1" = {
enable = true;
linkConfig = {
RequiredForOnline = "no";
};
matchConfig = {
Name = "enp5s0f1";
};
};
"10-microvm" = {
matchConfig = {
Name = "microvm";
};
addresses = [ { Address = "172.16.0.1/24"; } ];
};
"11-microvm" = {
matchConfig = {
Name = "vm-*";
};
networkConfig = {
Bridge = "microvm";
};
};
};
};
netdevs = {
"10-microvm" = {
netdevConfig = {
Kind = "bridge";
Name = "microvm";
};
};
};
networks = {
"40-enp4s0" = {
enable = true;
DHCP = "yes";
domains = [
"internal.horus.nu"
"bedum.horus.nu"
];
dhcpV4Config = {
RouteMetric = 64;
};
matchConfig = {
Name = "enp4s0";
};
};
"40-enp5s0f1" = {
enable = true;
linkConfig = {
RequiredForOnline = "no";
};
matchConfig = {
Name = "enp5s0f1";
};
};
"10-microvm" = {
matchConfig = {
Name = "microvm";
};
addresses = [ { Address = "172.16.0.1/24"; } ];
};
"11-microvm" = {
matchConfig = {
Name = "vm-*";
};
networkConfig = {
Bridge = "microvm";
};
services = {
ollama = {
after = [ "tailscaled.service" ];
preStart = "${pkgs.coreutils}/bin/sleep 10"; # Tailscale reports ready before getting an IP address
};
};
};
@ -476,6 +484,8 @@
sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
GBM_BACKEND = "nvidia-drm";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
};
};

View file

@ -169,7 +169,7 @@ in
};
};
services = {
kanshi.enable = true;
kanshi.enable = false;
xbanish.enable = false;
wayvnc = {
enable = true;