From df311705f893b8e3204d94e0c2a87161cf72097a Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 12 Sep 2024 16:54:45 +1000 Subject: [PATCH] fixed some stuff maybe, i do not understand the ordering of nix code eval --- core/hosts/hades/hardware-config.nix | 33 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/core/hosts/hades/hardware-config.nix b/core/hosts/hades/hardware-config.nix index 6afa725..07aeb36 100644 --- a/core/hosts/hades/hardware-config.nix +++ b/core/hosts/hades/hardware-config.nix @@ -9,6 +9,22 @@ ./disko-config.nix ]; + fileSystems."/" = + { device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + #fileSystems."/boot" = + #{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; + #fsType = "btrfs"; + #options = [ "subvol=@" ]; + #}; + + #boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96"; + + swapDevices = [ ]; + # Enable swap on luks boot = { kernelModules = [ "kvm-intel" ]; @@ -48,23 +64,6 @@ }; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - #fileSystems."/boot" = - #{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; - #fsType = "btrfs"; - #options = [ "subvol=@" ]; - #}; - - #boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96"; - - swapDevices = [ ]; - services.fstrim.enable = true; hardware = {