refactor apps and separate disko disks

format-root app still not working
This commit is contained in:
Noah Masur
2023-02-26 19:53:51 -05:00
parent 3fe6911e2d
commit cb60542980
9 changed files with 125 additions and 60 deletions

View File

@ -10,7 +10,6 @@ nixpkgs.lib.nixosSystem {
specialArgs = { };
modules = [
./hardware-configuration.nix
./disks.nix
../../modules/common
../../modules/nixos
(removeAttrs globals [ "mail.server" ])
@ -21,6 +20,12 @@ nixpkgs.lib.nixosSystem {
server = true;
zfs.enable = true;
disko = {
enableConfig = true;
devices.disks =
import ../../disks/root.nix { disks = [ "/dev/nvme0n1" ]; };
};
# head -c 8 /etc/machine-id
networking.hostId = "600279f4"; # Random ID required for ZFS

View File

@ -12,15 +12,15 @@
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-label/boot";
fsType = "vfat";
};
# fileSystems."/" = {
# device = "/dev/disk/by-label/nixos";
# fsType = "ext4";
# };
#
# fileSystems."/boot" = {
# device = "/dev/disk/by-label/boot";
# fsType = "vfat";
# };
swapDevices = [ ];