From 36f58c2b140a94677be6812c57f73af43691fdcd Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 9 Jan 2025 18:48:01 +1000 Subject: [PATCH] tidied and trying mkIf options for per-host modules --- core/modules/default.nix | 5 +++-- hosts/hades/modules/default.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/modules/default.nix b/core/modules/default.nix index a01d7fa..6dc49e6 100755 --- a/core/modules/default.nix +++ b/core/modules/default.nix @@ -1,14 +1,15 @@ -{ ... }: +{ config, lib, ... }: { imports = [ ## Semi-modularised config - ./sync.nix # syncthing settings + ./sync.nix # syncthing and gitwatch settings ./misc.nix # stuff that doesn't work in `/home` :( ./audio.nix # musnix and ... audio ... config ./display.nix # declarations for display management + (lib.mkIf config.networking.hostName."hades" ./zfs) ]; diff --git a/hosts/hades/modules/default.nix b/hosts/hades/modules/default.nix index 074dd88..87d9f55 100755 --- a/hosts/hades/modules/default.nix +++ b/hosts/hades/modules/default.nix @@ -7,7 +7,7 @@ ## Selected host modules for import ./hardware.nix # hardware configuration ./network.nix # network configuration - ./zfs.nix # zfs configuration + #./zfs.nix # zfs configuration ## Additional core modules to import ../../../core/modules/jellyfin.nix # temporary for config purposes