From 6aad24d535408dc4def95b4e4baf0da956317eb7 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 24 Sep 2024 23:57:59 -0400 Subject: [PATCH] Separate filesystems config into own file --- system/desktop.nix | 1 + system/hardware/filesystems.nix | 6 ++++++ system/hardware/machines/desktop.nix | 6 ------ system/hardware/machines/lenovo.nix | 6 ------ system/pinebook.nix | 1 + 5 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 system/hardware/filesystems.nix diff --git a/system/desktop.nix b/system/desktop.nix index e569777..7bc07af 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -27,6 +27,7 @@ ./hardware/machines/desktop.nix ./hardware/systemdboot.nix ./hardware/opengl.nix + ./hardware/filesystems.nix ./hardware/nvidia.nix #./hardware/nouveau.nix diff --git a/system/hardware/filesystems.nix b/system/hardware/filesystems.nix new file mode 100644 index 0000000..0777d8c --- /dev/null +++ b/system/hardware/filesystems.nix @@ -0,0 +1,6 @@ +{lib, ...}: { + boot.supportedFilesystems = { + ntfs = true; + zfs = lib.mkForce false; + }; +} diff --git a/system/hardware/machines/desktop.nix b/system/hardware/machines/desktop.nix index a222412..7fdaf19 100644 --- a/system/hardware/machines/desktop.nix +++ b/system/hardware/machines/desktop.nix @@ -49,12 +49,6 @@ in { "kvm-amd" ]; }; - - # Manage supported filesystems - supportedFilesystems = { - ntfs = true; - zfs = lib.mkForce false; - }; }; # Additional entry to boot from the second GPU diff --git a/system/hardware/machines/lenovo.nix b/system/hardware/machines/lenovo.nix index 0da9832..be3a8b4 100644 --- a/system/hardware/machines/lenovo.nix +++ b/system/hardware/machines/lenovo.nix @@ -24,12 +24,6 @@ "kvm-amd" ]; }; - - # Manage supported filesystems - supportedFilesystems = { - ntfs = true; - zfs = lib.mkForce false; - }; }; # Mount everything as necessary diff --git a/system/pinebook.nix b/system/pinebook.nix index e2344b1..40efa76 100644 --- a/system/pinebook.nix +++ b/system/pinebook.nix @@ -30,6 +30,7 @@ ./hardware/machines/pinebook.nix ./hardware/extlinux.nix ./hardware/opengl.nix + ./hardware/filesystems.nix # Services ./services/openssh.nix