router0-dmz0: lots of formattign and exposed host fixes

This commit is contained in:
steveej 2024-01-18 23:35:54 +01:00
parent 2c84e79f4a
commit 9ad9b97298
2 changed files with 491 additions and 461 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,5 @@
{lib, ...}: let { lib, ... }:
let
stage1Modules = [ stage1Modules = [
"aesni_intel" "aesni_intel"
"kvm_amd" "kvm_amd"
@ -10,34 +11,26 @@
"usbcore" "usbcore"
"xhci_hcd" "xhci_hcd"
"usbnet"
"snd_usb_audio"
"usbhid" "usbhid"
"snd_usbmidi_lib"
"cdc_mbim"
"cdc_ncm"
"usb_storage" "usb_storage"
"cdc_wdm"
"uvcvideo"
"btusb"
"xhci_pci" "xhci_pci"
"cdc_ether"
"uas" "uas"
]; ];
in { in
{
# TASK: new device # TASK: new device
hardware.opinionatedDisk = { hardware.opinionatedDisk = {
enable = true; enable = true;
encrypted = true; encrypted = true;
diskId = "nvme-WD_BLACK_SN850X_4000GB_2227DT443901"; diskId = "nvme-WD_BLACK_SN850X_4000GB_2227DT443901";
earlyDiskIdOverride = "usb-JMicron_Generic_0123456789ABCDEF-0:0"; earlyDiskIdOverride = "usb-JMicron_Generic_0123456789ABCDEF-0:0";
}; };
# boot.loader.grub.device = lib.mkForce "/dev/disk/by-id/usb-JMicron_Generic_0123456789ABCDEF-0:0"; # boot.loader.grub.device = lib.mkForce "/dev/disk/by-id/usb-JMicron_Generic_0123456789ABCDEF-0:0";
# see https://linrunner.de/tlp/ # see https://linrunner.de/tlp/
services.tlp = { services.tlp = {
enable = true; enable = false;
settings = { settings = {
CPU_DRIVER_OPMODE_ON_AC = "active"; CPU_DRIVER_OPMODE_ON_AC = "active";
CPU_DRIVER_OPMODE_ON_BAT = "passive"; CPU_DRIVER_OPMODE_ON_BAT = "passive";
@ -81,7 +74,7 @@ in {
# #DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan"; # #DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan";
# #DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi"; # #DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi";
SATA_LINKPWR_ON_AC = "maax_performance"; SATA_LINKPWR_ON_AC = "max_performance";
SATA_LINKPWR_ON_BAT = "min_power"; SATA_LINKPWR_ON_BAT = "min_power";
}; };
}; };
@ -91,16 +84,16 @@ in {
enable = true; enable = true;
levels = [ levels = [
# ["level auto" 0 60] # ["level auto" 0 60]
[0 0 60] [ 0 0 60 ]
[1 60 65] [ 1 60 65 ]
[1 65 75] [ 1 65 75 ]
[2 75 78] [ 2 75 78 ]
[3 78 80] [ 3 78 80 ]
[4 80 82] [ 4 80 82 ]
[5 82 84] [ 5 82 84 ]
[6 84 86] [ 6 84 86 ]
[7 86 88] [ 7 86 88 ]
["level full-speed" 88 999] [ "level full-speed" 88 999 ]
]; ];
extraArgs = [ extraArgs = [