chore: merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Ahwx 2025-07-26 21:51:50 +02:00
commit ca6f78393a
2 changed files with 13 additions and 7 deletions

View file

@ -60,10 +60,16 @@
trim.enable = true;
};
# boot.zfs.extraPools = [ "terrabite" ];
boot.zfs.extraPools = [ "spinners" ];
# fileSystems."/terrabite/main" = {
# device = "terrabite/main";
# fsType = "zfs";
# };
fileSystems = {
"/spinners/rootvol" = {
device = "terrabite/rootvol";
fsType = "zfs";
};
"/spinners/ahwx" = {
device = "terrabite/ahwx";
fsType = "zfs";
};
};
}

View file

@ -2,8 +2,8 @@
{
imports =
[ (import ./docker.nix) ]
++ [ (import ./immich.nix) ]
++ [ (import ./nextcloud.nix) ]
# ++ [ (import ./immich.nix) ]
# ++ [ (import ./nextcloud.nix) ]
++ [ (import ./home-assistant.nix) ]
++ [ (import ./monitoring.nix) ]
++ [ (import ./smart-monitoring.nix) ]