jt/conf
1
0
Fork 0
Code Issues Activity

Henna ZFS

Browse source
This commit is contained in:
Jarkko Toivanen 2023-05-21 21:01:33 +03:00
parent 0903c40883
commit 7bf87488ae
Signed by: jt
GPG key ID: 9151B109B73ECAD5
2 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nixos/henna/configuration.nix
View file

@ -6,53 +6,36 @@
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.opengl.driSupport = true; hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages = with pkgs; [
mesa.drivers
rocm-opencl-icd
rocm-opencl-runtime
];
boot = { boot = {
loader = { loader = {
grub = { grub = {
enable = true; enable = true;
version = 2;
device = "/dev/sda"; device = "/dev/sda";
memtest86.enable = true; memtest86.enable = true;
enableCryptodisk = true;
}; };
}; };
kernelParams = [ kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
"radeon.si_support=0" supportedFilesystems = [ "zfs" ];
"radeon.cik_support=0" zfs.requestEncryptionCredentials = true;
"amdgpu.si_support=1"
"amdgpu.cik_support=1"
];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback.out v4l2loopback.out
]; ];
kernelModules = [ kernelModules = [
"v4l2loopback" "v4l2loopback"
]; ];
initrd.kernelModules = [
"nouveau"
];
initrd.luks.devices."luks-2bd7a13f-62b5-4c44-822b-e836ebb84c01".keyFile = "/crypto_keyfile.bin";
# Enable swap on luks
initrd.luks.devices."luks-aa357d98-202a-46e5-9171-fbe19261cec6".device = "/dev/disk/by-uuid/aa357d98-202a-46e5-9171-fbe19261cec6";
initrd.luks.devices."luks-aa357d98-202a-46e5-9171-fbe19261cec6".keyFile = "/crypto_keyfile.bin";
initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
extraModprobeConfig = '' extraModprobeConfig = ''
options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
''; '';
kernelParams = [ "zfs.zfs_arc_max=268435456" ];
}; };
networking.hostName = "henna";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.hostName = "henna";
networking.hostId = "92f409ff";
time.timeZone = "Europe/Helsinki"; time.timeZone = "Europe/Helsinki";
i18n.defaultLocale = "fi_FI.UTF-8"; i18n.defaultLocale = "fi_FI.UTF-8";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
LC_ADDRESS = "fi_FI.UTF-8"; LC_ADDRESS = "fi_FI.UTF-8";

14
nixos/henna/hardware-configuration.nix
View file

@ -8,20 +8,24 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/884ee2db-1e35-4d38-86d7-6d7937129df6"; { device = "juures";
fsType = "ext4"; fsType = "zfs";
}; };
boot.initrd.luks.devices."luks-2bd7a13f-62b5-4c44-822b-e836ebb84c01".device = "/dev/disk/by-uuid/2bd7a13f-62b5-4c44-822b-e836ebb84c01"; fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5823-85C0";
fsType = "vfat";
};
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/36ae9159-8d42-4cf9-a7a4-37330a96b188"; } [ { device = "/dev/disk/by-uuid/56644356-389c-4b99-9a49-6fddb7dec763"; }
{ device = "/dev/disk/by-uuid/6dc6f2c6-4850-4f91-befc-4eaf68e7fd07"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking