From 3b4a6d9f9360693c689269fca6dcd731efceffab Mon Sep 17 00:00:00 2001 From: twoneis Date: Sat, 25 May 2024 04:30:33 +0200 Subject: [PATCH] added filesystems again this way --- devices/akarso/default.nix | 1 - devices/akarso/hardware-config.nix | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/devices/akarso/default.nix b/devices/akarso/default.nix index 9fab4c7..a597523 100644 --- a/devices/akarso/default.nix +++ b/devices/akarso/default.nix @@ -2,7 +2,6 @@ imports = [ ./hardware-config.nix ./options.nix - ./disko.nix ]; networking.hostName = "akarso"; diff --git a/devices/akarso/hardware-config.nix b/devices/akarso/hardware-config.nix index 8842b65..cb4d017 100644 --- a/devices/akarso/hardware-config.nix +++ b/devices/akarso/hardware-config.nix @@ -3,11 +3,34 @@ initrd = { availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; kernelModules = [ ]; + luks.devices.cryptroot.device = "/dev/disk/by-uuid/A7FE-359B"; }; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; }; + fileSystems = { + "/boot" = { + device = "/dev/disk/by-uuid/A7FE-359B"; + fsType = "vfat"; + }; + "/" = { + device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; + fsType = "btrfs"; + options = [ "subvol=root" "compress=zstd" "noatime" ]; + }; + "/nix" = { + device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; + fsType = "btrfs"; + options = [ "subvol=nix" "compress=zstd" "noatime" ]; + }; + "/persist" = { + device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; + fsType = "btrfs"; + options = [ "subvol=persist" "compress=zstd" "noatime" ]; + }; + }; + networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";