From 5eb25c3a6d2217bbc3b0303c1db90b4559d8142a Mon Sep 17 00:00:00 2001 From: Soispha Date: Wed, 28 Jun 2023 10:43:05 +0200 Subject: Feat(disko): Squash Commit --- hosts/apzu/hardware/default.nix | 6 ++---- hosts/tiamat/hardware/default.nix | 14 +++----------- 2 files changed, 5 insertions(+), 15 deletions(-) (limited to 'hosts') diff --git a/hosts/apzu/hardware/default.nix b/hosts/apzu/hardware/default.nix index ab25c244..1f77e435 100644 --- a/hosts/apzu/hardware/default.nix +++ b/hosts/apzu/hardware/default.nix @@ -7,10 +7,8 @@ nixpkgs.hostPlatform = "x86_64-linux"; - system.fileSystemLayouts = { - enable = true; - mainDisk = "/dev/disk/by-uuid/b4a0500c-43a3-4d00-b544-467c1792eeea"; - efiDisk = "/dev/disk/by-uuid/71E7-AA08"; + soispha.disks = { + disk = "/dev/disk/by-uuid/b4a0500c-43a3-4d00-b544-467c1792eeea"; ssd = true; swap = { uuid = "b4a0500c-43a3-4d00-b544-467c1792eeea"; diff --git a/hosts/tiamat/hardware/default.nix b/hosts/tiamat/hardware/default.nix index bb4596ec..be81253d 100644 --- a/hosts/tiamat/hardware/default.nix +++ b/hosts/tiamat/hardware/default.nix @@ -1,10 +1,4 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { +{modulesPath, ...}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? ./cpu.nix @@ -13,10 +7,8 @@ nixpkgs.hostPlatform = "x86_64-linux"; - system.fileSystemLayouts = { - enable = true; - mainDisk = "/dev/disk/by-uuid/4211a4ff-f2e9-41ed-83ca-712830fd0254"; - efiDisk = "/dev/disk/by-uuid/2BFA-8F0F"; + soispha.disks = { + disk = "/dev/disk/by-uuid/4211a4ff-f2e9-41ed-83ca-712830fd0254"; # TODO ssd = true; swap = { uuid = "4211a4ff-f2e9-41ed-83ca-712830fd0254"; -- cgit 1.4.1