jordan/dotfiles
Archived
1
0
Fork 0
Code Issues 4 Pull Requests Wiki Activity

Fix filesystem mounts and add tunnel config

Browse Source
This commit is contained in:
Jordan Holt
2023-05-09 23:05:51 +01:00
parent 1d551d6ea7
commit dbcc2b48e7
2 changed files with 81 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
hosts/library/hardware-configuration.nix
View File

@ -8,9 +8,9 @@
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
@ -18,21 +18,11 @@
fsType = "zfs";
};
fileSystems."/home" =
{ device = "rpool/user/home";
fsType = "zfs";
};
fileSystems."/var" =
{ device = "rpool/system/var";
fsType = "zfs";
};
fileSystems."/tmp" =
{ device = "rpool/local/tmp";
fsType = "zfs";
};
fileSystems."/var/log" =
{ device = "rpool/system/var/log";
fsType = "zfs";
@ -44,12 +34,27 @@
};
fileSystems."/var/lib/containers/storage" =
{ device = "rpool/system/var/lib/containers/storage";
{ device = "rpool/system/var/lib-containers-storage";
fsType = "zfs";
};
fileSystems."/nix" =
{ device = "rpool/local/nix";
fsType = "zfs";
};
fileSystems."/tmp" =
{ device = "rpool/local/tmp";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "rpool/user/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E63E-8E75";
{ device = "/dev/disk/by-uuid/F697-F1C0";
fsType = "vfat";
};
@ -58,6 +63,46 @@
fsType = "zfs";
};
fileSystems."/mnt/library/books" =
{ device = "library/books";
fsType = "zfs";
};
fileSystems."/mnt/library/fonts" =
{ device = "library/fonts";
fsType = "zfs";
};
fileSystems."/mnt/library/movies" =
{ device = "library/movies";
fsType = "zfs";
};
fileSystems."/mnt/library/music" =
{ device = "library/music";
fsType = "zfs";
};
fileSystems."/mnt/library/software" =
{ device = "library/software";
fsType = "zfs";
};
fileSystems."/mnt/library/tv" =
{ device = "library/tv";
fsType = "zfs";
};
fileSystems."/mnt/library/videos" =
{ device = "library/videos";
fsType = "zfs";
};
fileSystems."/mnt/library/web" =
{ device = "library/web";
fsType = "zfs";
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -68,4 +113,5 @@
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}