refactored

This commit is contained in:
James Patrick 2022-03-04 22:21:58 -05:00
parent 5d72d0aba9
commit abaac8e512

View File

@ -36,19 +36,27 @@
this.systems.zfs.enable = true; this.systems.zfs.enable = true;
networking = {
# This is required for the zfs module as well. Must be unique. Run the following head -c4 /dev/urandom | od -A none -t x4 # This is required for the zfs module as well. Must be unique. Run the following head -c4 /dev/urandom | od -A none -t x4
networking.hostId = "a7a1c3f5"; hostId = "a7a1c3f5";
networking.hostName = "nil"; # Define your hostname. hostName = "nil"; # Define your hostname.
# The global useDHCP flag is deprecated, therefore explicitly set to false here. # 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 # Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour. # replicates the default behaviour.
networking.useDHCP = false; useDHCP = false;
networking.interfaces.enp2s0f0.useDHCP = true; interfaces = {
networking.interfaces.enp5s0.useDHCP = true; enp2s0f0.useDHCP = true;
networking.interfaces.wlp3s0.useDHCP = true; enp5s0.useDHCP = true;
wlp3s0.useDHCP = true;
};
};
boot.initrd.availableKernelModules = [ hardware.firmware = [ pkgs.rtw89-firmware ];
boot = {
initrd = {
availableKernelModules = [
"nvme" "nvme"
"vfat" "vfat"
"xhci_pci" "xhci_pci"
@ -58,33 +66,32 @@
"sdhci_pci" "sdhci_pci"
"cryptd" "cryptd"
]; ];
kernelModules = [ "dm-snapshot" ];
hardware.firmware = [ pkgs.rtw89-firmware ]; };
kernelModules = [ "kvm-amd" ];
boot.initrd.kernelModules = [ "dm-snapshot" ]; extraModulePackages = [ config.boot.kernelPackages.rtw89 ];
boot.kernelModules = [ "kvm-amd" ]; supportedFilesystems = [ "zfs" ];
boot.extraModulePackages = [ config.boot.kernelPackages.rtw89 ]; };
boot.supportedFilesystems = [ "zfs" ];
boot.initrd.luks.devices."crypt" = { boot.initrd.luks.devices."crypt" = {
device = "/dev/disk/by-partlabel/crypt"; device = "/dev/disk/by-partlabel/crypt";
preLVM = true; preLVM = true;
}; };
fileSystems."/" = { fileSystems = {
"/" = {
device = "rpool/root/nixos"; device = "rpool/root/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
"/home" = {
fileSystems."/home" = {
device = "rpool/home"; device = "rpool/home";
fsType = "zfs"; fsType = "zfs";
}; };
"/boot" = {
fileSystems."/boot" = {
device = "/dev/disk/by-partlabel/boot"; device = "/dev/disk/by-partlabel/boot";
fsType = "vfat"; fsType = "vfat";
}; };
};
swapDevices = [{ device = "/dev/partitions/swap"; }]; swapDevices = [{ device = "/dev/partitions/swap"; }];