vskilet/nixos-config
1
0
Fork 0
forked from nyanloutre/nixos-config
Code Issues Pull Requests Releases Wiki Activity

PC-Fixe: migration ZFS miroir

Browse Source
This commit is contained in:
nyanloutre 2019-10-15 21:38:23 +02:00
parent e10c46d37e
commit f5c0934933
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
systems/PC-Fixe/configuration.nix
View File

@ -12,11 +12,15 @@
../common-gui.nix ../common-gui.nix
]; ];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.memtest86.enable = true; boot.loader.grub = {
efiSupport = true;
device = "nodev";
zfsSupport = true;
};
boot.kernelParams = ["acpi_enforce_resources=lax"]; boot.kernelParams = ["acpi_enforce_resources=lax"];
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
boot.supportedFilesystems = [ "zfs" ];
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
@ -36,6 +40,7 @@
security.pki.certificateFiles = [ ./codemasters.pem ]; security.pki.certificateFiles = [ ./codemasters.pem ];
networking.hostName = "paul-fixe"; networking.hostName = "paul-fixe";
networking.hostId = "3a1f739e";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
usb_modeswitch usb_modeswitch
@ -76,5 +81,5 @@
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.passwordAuthentication = false; services.openssh.passwordAuthentication = false;
system.stateVersion = "18.09"; system.stateVersion = "20.03";
} }

14
systems/PC-Fixe/hardware-configuration.nix
View File

@ -8,7 +8,8 @@
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
]; ];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "firewire_ohci" "pata_marvell" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "nvme" "firewire_ohci" "pata_marvell" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" "nct6775" ]; boot.kernelModules = [ "kvm-intel" "nct6775" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -17,12 +18,17 @@
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/509a5842-56fe-40bd-8b00-6bda87e02e5e"; { device = "rpool/root/nixos";
fsType = "ext4"; fsType = "zfs";
};
fileSystems."/home" =
{ device = "rpool/home";
fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A225-07A5"; { device = "/dev/disk/by-uuid/F4EC-57DF";
fsType = "vfat"; fsType = "vfat";
}; };