mirror of
https://gerrit.hackerspace.pl/hscloud
synced 2025-01-21 20:33:54 +00:00
cluster/machines: move common LVM support bits into base.nix
Change-Id: I13e5653241a8245bae67cc7e660312484f1dcaca Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1767 Reviewed-by: q3k <q3k@hackerspace.pl>
This commit is contained in:
parent
8edc52e619
commit
b8ccfa8459
3 changed files with 5 additions and 9 deletions
|
@ -10,15 +10,11 @@ rec {
|
|||
system.stateVersion = "19.09";
|
||||
nix.maxJobs = 48;
|
||||
|
||||
boot.initrd.kernelModules = [ "dm-raid" ];
|
||||
|
||||
boot.loader.grub.device = "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_250GB_S3YJNX1M604518E";
|
||||
#fileSystems."/".device = "/dev/disk/by-uuid/b4149083-49fe-4951-a143-aff4cedaf33a";
|
||||
fileSystems."/".device = "/dev/vg-nixos-hscloud/nixos-root";
|
||||
|
||||
environment.etc."lvm/lvm.conf".text = ''
|
||||
devices/issue_discards = 1
|
||||
'';
|
||||
|
||||
hscloud.base = {
|
||||
mgmtIf = "enp130s0f0";
|
||||
|
|
|
@ -10,8 +10,6 @@ rec {
|
|||
system.stateVersion = "22.05";
|
||||
nix.maxJobs = 48;
|
||||
|
||||
boot.initrd.kernelModules = [ "dm-raid" ];
|
||||
|
||||
fileSystems."/".device = "/dev/vg-nixos-hscloud/nixos-root";
|
||||
#services.lvm.enable = true;
|
||||
fileSystems."/boot1" =
|
||||
|
@ -34,9 +32,6 @@ rec {
|
|||
{ devices = [ "nodev" ]; path = "/boot2"; efiSysMountPoint = "/boot2"; }
|
||||
];
|
||||
};
|
||||
environment.etc."lvm/lvm.conf".text = ''
|
||||
devices/issue_discards = 1
|
||||
'';
|
||||
|
||||
|
||||
hscloud.base = {
|
||||
|
|
|
@ -68,11 +68,16 @@ in {
|
|||
boot.kernel.sysctl."net.ipv4.conf.all.rp_filter" = "0";
|
||||
boot.kernel.sysctl."net.ipv4.conf.default.rp_filter" = "0";
|
||||
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ "dm-raid" "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [];
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.cpu.intel.updateMicrocode = true;
|
||||
hardware.cpu.amd.updateMicrocode = true;
|
||||
|
||||
environment.etc."lvm/lvm.conf".text = ''
|
||||
devices/issue_discards = 1
|
||||
'';
|
||||
|
||||
time.timeZone = "Europe/Warsaw";
|
||||
|
||||
|
|
Loading…
Reference in a new issue