From 952d8b731b49b1c0d5b2759c9da4a3a905bf3bc7 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sat, 3 Oct 2026 02:09:18 +1000 Subject: [PATCH] tweak: host modules --- modules/hosts/hades/default.nix | 31 +++++++++---------- .../hades}/zfs-support.nix | 18 ++++------- modules/hosts/usb/default.nix | 1 - 3 files changed, 21 insertions(+), 29 deletions(-) rename modules/{features/connectivity => hosts/hades}/zfs-support.nix (88%) diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 1bf7075..191df36 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -11,6 +11,9 @@ # modules that comprise the host specific configuration modules = with self.nixosModules; [ + # user modules + serenity + # shared system modules core # shared configuration options user-parts # user variables @@ -18,24 +21,20 @@ # host-specific modules hades-configuration # host specific configuration options below hades-hardware # hardware configuration options for host - zfs-hades # specific zfs configuration for host + zfs-support # zfs support module for hades specific zpool # feature modules - virtualisation - network-proxy - zfs-support - kde-connect - terminal - terminal-emulator - desktop - music - music-production - gaming - multimedia - virtual-reality - - # user modules - serenity + virtualisation # virtual machines + network-proxy # basic dns crypt proxy + kde-connect # phone <-> desktop connectivity + terminal # most terminal programs + terminal-emulator # terminal program for desktops + desktop # most desktop programs + music # music consumption + music-production # music creation + gaming # gaming modules, steam, osu, etc. + multimedia # image and video programs + virtual-reality # configuration for vr setup ]; diff --git a/modules/features/connectivity/zfs-support.nix b/modules/hosts/hades/zfs-support.nix similarity index 88% rename from modules/features/connectivity/zfs-support.nix rename to modules/hosts/hades/zfs-support.nix index 7a88695..575e02b 100644 --- a/modules/features/connectivity/zfs-support.nix +++ b/modules/hosts/hades/zfs-support.nix @@ -37,6 +37,12 @@ kernelPackages = lib.mkForce latestKernelPackage; # adds zfs support at boot supportedFilesystems = [ "zfs" ]; + # zfs boot settings + boot.zfs = { + forceImportRoot = false; + # imports hades specific zpool + extraPools = [ "orcus" ]; + }; }; # adds zfs to system packages @@ -49,16 +55,4 @@ services.zfs.autoScrub.enable = true; }; - flake.nixosModules.zfs-hades = - - { config, pkgs, ... }: - - { - - boot.zfs = { - extraPools = [ "orcus" ]; - forceImportRoot = false; - }; - - }; } diff --git a/modules/hosts/usb/default.nix b/modules/hosts/usb/default.nix index 1560b15..436530d 100644 --- a/modules/hosts/usb/default.nix +++ b/modules/hosts/usb/default.nix @@ -16,7 +16,6 @@ # extra modules to include on host terminal - zfs-support network-proxy # users to include on host