Merge pull request 'better nixos defaults' (#2106) from better-defaults into main

nixosModules/clanCore/default.nix

@@ -1,3 +1,4 @@
+{ lib, config, ... }:
 {
   imports = [
     ./backups.nix
@@ -18,5 +19,17 @@
     ./vm.nix
     ./wayland-proxy-virtwl.nix
     ./zerotier
+    ./zfs.nix
   ];
+
+  # Use systemd during boot as well except:
+  # - systems with raids as this currently require manual configuration: https://github.com/NixOS/nixpkgs/issues/210210
+  # - for containers we currently rely on the `stage-2` init script that sets up our /etc
+  boot.initrd.systemd.enable = lib.mkDefault (!config.boot.swraid.enable && !config.boot.isContainer);
+
+  # Work around for https://github.com/NixOS/nixpkgs/issues/124215
+  documentation.info.enable = lib.mkDefault false;
+
+  # Don't install the /lib/ld-linux.so.2 stub. This saves one instance of nixpkgs.
+  environment.ldso32 = null;
 }

nixosModules/flake-module.nix

@@ -3,12 +3,10 @@
   flake.nixosModules = {
     hidden-ssh-announce.imports = [ ./hidden-ssh-announce.nix ];
     bcachefs.imports = [ ./bcachefs.nix ];
-    zfs.imports = [ ./zfs.nix ];
     installer.imports = [
       ./installer
       self.nixosModules.hidden-ssh-announce
       self.nixosModules.bcachefs
-      self.nixosModules.zfs
     ];
     clanCore.imports = [
       inputs.sops-nix.nixosModules.sops