tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Some more fw16 fixes

Browse source
This commit is contained in:
Tristan D. 2024-06-20 20:47:43 +02:00
parent 0efa653058
commit ea9ef50418
Signed by: tristan
SSH key fingerprint: SHA256:WtyH40TFEIklkqijla5j9zqbuMV3mE/vC9DA/xVbJZA
2 changed files with 34 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
systems/nixos-fw16/default.nix
View file

@ -74,10 +74,8 @@
extraModulePackages = [ ]; extraModulePackages = [ ];
}; };
services.btrfs.autoScrub.enable = true;
networking = { networking = {
hostName = "nixos-f16"; hostName = "nixos-fw16";
extraHosts = '' extraHosts = ''
192.168.0.75 monitor.oekonzept.de 192.168.0.75 monitor.oekonzept.de
192.168.0.151 rosa.oekonzept.de 192.168.0.151 rosa.oekonzept.de
@ -100,7 +98,7 @@
176.9.242.147 fe3f3294-c93a-4aca-895e-abe6c858dbd5-llama-cpp.redvau.lt 176.9.242.147 fe3f3294-c93a-4aca-895e-abe6c858dbd5-llama-cpp.redvau.lt
''; '';
interfaces = { interfaces = {
enp5s0f4u1u1c2 = { eth0 = {
useDHCP = false; useDHCP = false;
ipv4.addresses = [ ipv4.addresses = [
{ {
@ -128,15 +126,15 @@
# This manually configures the automatically created network-adresses service to be more flexible # This manually configures the automatically created network-adresses service to be more flexible
# regarding booting without the the device being available on boot # regarding booting without the the device being available on boot
# It prevents slow timeouts & errors on boot while preserving Plug & Play ability # It prevents slow timeouts & errors on boot while preserving Plug & Play ability
network-addresses-enp5s0f4u1u1c2.unitConfig = { network-addresses-eth0.unitConfig = {
ConditionPathExists = "/sys/class/net/enp5s0f4u1u1c2"; ConditionPathExists = "/sys/class/net/eth0";
BindsTo = lib.mkForce null; BindsTo = lib.mkForce null;
}; };
}; };
}; };
services.udev.extraRules = '' services.udev.extraRules = ''
ACTION=="add", KERNEL=="enp5s0f4u1u1c2", TAG+="systemd", ENV{SYSTEMD_WANTS}="network-addresses-enp5s0f4u1u1c2.service" ACTION=="add", KERNEL=="eth0", TAG+="systemd", ENV{SYSTEMD_WANTS}="network-addresses-eth0.service"
ACTION=="remove", KERNEL=="enp5s0f4u1u1c2", RUN+="${pkgs.systemd}/bin/systemctl stop network-addresses-enp5s0f4u1u1c2.service" ACTION=="remove", KERNEL=="eth0", RUN+="${pkgs.systemd}/bin/systemctl stop network-addresses-eth0.service"
SUBSYSTEM=="pci", ATTR{power/control}="auto" SUBSYSTEM=="pci", ATTR{power/control}="auto"
ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
''; '';

57
systems/nixos-fw16/disks.nix
View file

@ -6,7 +6,6 @@
, inputs , inputs
, ... , ...
}: { }: {
# bcachefs format \ # bcachefs format \
# --metadata_replicas=2 \ # --metadata_replicas=2 \
# --data_replicas=1 \ # --data_replicas=1 \
@ -18,22 +17,24 @@
boot = { boot = {
supportedFilesystems = [ "bcachefs" "vfat" ]; supportedFilesystems = [ "bcachefs" "vfat" ];
initrd.supportedFilesystems = [ "bcachefs" "vfat" ]; initrd.supportedFilesystems = [ "bcachefs" "vfat" ];
initrd.luks.devices = lib.attrsets.mergeAttrsList initrd.luks.devices =
(lib.lists.forEach [ lib.attrsets.mergeAttrsList
"crypt_ssd_4t_data" (
"crypt_ssd_4t_swap" lib.lists.forEach [
"crypt_ssd_2t_data" "crypt_ssd_4t_data"
"crypt_ssd_2t_swap" "crypt_ssd_4t_swap"
] "crypt_ssd_2t_data"
(drive: { "crypt_ssd_2t_swap"
"${drive}" = { ]
device = "/dev/disk/by-partlabel/${drive}"; (drive: {
allowDiscards = true; "${drive}" = {
bypassWorkqueues = true; device = "/dev/disk/by-partlabel/${drive}";
# crypttabExtraOpts = [ "nofail" ]; allowDiscards = true;
}; bypassWorkqueues = true;
}) # crypttabExtraOpts = [ "nofail" ];
); };
})
);
}; };
fileSystems = fileSystems =
@ -52,19 +53,17 @@
]; ];
in in
{ {
"/" = "/" = {
{ device = "/dev/mapper/crypt_ssd_4t_data";
device = "UUID=f89215ba-3313-42d3-8f68-051ad2453870"; fsType = "bcachefs";
fsType = "bcachefs"; options = [ "relatime" ];
options = [ "relatime" ]; };
};
"/boot" = "/boot" = {
{ device = "/dev/disk/by-uuid/05A2-6A8A";
device = "/dev/disk/by-uuid/05A2-6A8A"; fsType = "vfat";
fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ];
options = [ "fmask=0022" "dmask=0022" ]; };
};
"/mnt/ServerF" = { "/mnt/ServerF" = {
# device = "//srv-nas-01.local/Server_F"; # device = "//srv-nas-01.local/Server_F";