zuckerberg/nix-config
zuckerberg/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Activity

bcachefs rootfs on helios64

Browse Source
This commit is contained in:
Zuckerberg 2022-04-06 19:45:36 -04:00
parent c8bf265f83
commit f386bc8871
4 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
machines/storage/s0/hardware-configuration.nix
View File

@ -8,31 +8,39 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "usb_storage" ]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = [ "dm-snapshot" ]; "ahci"
"usb_storage"
"bcache"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = boot.initrd.luks.devices."enc-pv1".device = "/dev/disk/by-uuid/36c4fab0-ea98-4ebc-9612-893f8f61c228";
{ device = "/dev/mapper/vg-root"; boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/514231c1-5934-401f-80e1-e3b6b62dc9d5";
fsType = "btrfs"; boot.initrd.luks.devices."enc-pv3".device = "/dev/disk/by-uuid/f45abe73-d0c6-446f-b28c-7a96a3f87851";
options = [ "subvol=root" ]; boot.initrd.luks.devices."enc-pv4".device = "/dev/disk/by-uuid/953efe14-af9f-4fb5-a658-417ec02dbdda";
}; boot.initrd.luks.devices."enc-pv5".device = "/dev/disk/by-uuid/e8e40fd0-92d9-416b-b4aa-609d1ce64f42";
fileSystems."/home" = fileSystems."/" =
{ device = "/dev/mapper/vg-root"; { device = "/dev/mapper/enc-pv1:/dev/mapper/enc-pv2:/dev/mapper/enc-pv3:/dev/mapper/enc-pv4:/dev/mapper/enc-pv5";
fsType = "btrfs"; fsType = "bcachefs";
options = [ "subvol=home" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/DF1E-0D0D"; { device = "/dev/disk/by-uuid/8F7E-53C4";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [ ];
[ { device = "/dev/mapper/vg-swap"; }
]; # The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
networking.useDHCP = lib.mkDefault false;
networking.interfaces.eth0.useDHCP = lib.mkDefault true;
networking.interfaces.eth1.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
} }

15
machines/storage/s0/helios64/default.nix
View File

@ -9,17 +9,18 @@
boot.kernelParams = lib.mkAfter [ boot.kernelParams = lib.mkAfter [
"console=ttyS2,115200n8" "console=ttyS2,115200n8"
"earlyprintk"
"earlycon=uart8250,mmio32,0xff1a0000" "earlycon=uart8250,mmio32,0xff1a0000"
]; ];
# disabled because, when enabled, bcachefs wants a different but still adequate kernel # Required for rootfs on sata
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_16; boot.initrd.availableKernelModules = [
"pcie-rockchip-host"
"phy-rockchip-pcie"
"phy-rockchip-usb"
];
# bcachefs kernel is 5.15. but need a patch that is only in 5.16 # bcachefs kernel is 5.15. but need patches that are only in 5.16+
# Patch the device tree to add support for getting the cpu thermal temp # Patch the device tree to add support for getting the cpu thermal temp
hardware.deviceTree.enable = true; hardware.deviceTree.enable = true;
hardware.deviceTree.overlays = [ hardware.deviceTree.kernelPackage = pkgs.linux_latest;
./helios64-cpu-temp.dtbo
];
} }

BIN
machines/storage/s0/helios64/helios64-cpu-temp.dtbo
View File

Binary file not shown.

17
machines/storage/s0/helios64/helios64-cpu-temp.dts
View File

@ -1,17 +0,0 @@
/* rk3399-kobol-helios64.dts */
/dts-v1/;
/ {
model = "Kobol Helios64";
compatible = "kobol,helios64\0rockchip,rk3399";
fragment@0 {
target-path = "/";
__overlay__ {
tsadc@ff260000 {
status = "okay";
rockchip,hw-tshut-mode = <0x01>;
rockchip,hw-tshut-polarity = <0x01>;
};
};
};
};