From a080a07b21666826f8586ba0c13dfc1be6970023 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 1 Jan 2020 19:21:15 -0700 Subject: [PATCH] core: don't import file systems In order not to conflict with different kinds of configurations, i.e. nixos disk images, don't have core profile import file-systems. Instead declare `fileSystems` individually in host profiles. --- hosts/hp500281.nix | 15 +++++++++++++++ local/file-systems.nix | 3 --- profiles/core.nix | 1 - 3 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 local/file-systems.nix diff --git a/hosts/hp500281.nix b/hosts/hp500281.nix index 6fab0de5..c07a197f 100644 --- a/hosts/hp500281.nix +++ b/hosts/hp500281.nix @@ -11,6 +11,21 @@ in ../users/nrd ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/5c0bf17c-6df1-4618-88f8-48a4249adb30"; + fsType = "xfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/B361-1241"; + fsType = "vfat"; + }; + + fileSystems."/srv" = { + device = "/dev/disk/by-uuid/2a21bc0b-f30a-4001-8976-f39adf805daa"; + fsType = "xfs"; + }; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" diff --git a/local/file-systems.nix b/local/file-systems.nix deleted file mode 100644 index 837cf6e2..00000000 --- a/local/file-systems.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - fileSystems = {}; -} diff --git a/profiles/core.nix b/profiles/core.nix index 960e9d16..850f4e9d 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -17,7 +17,6 @@ in imports = [ ../local/locale.nix - ../local/file-systems.nix ];