From d52b9096e5ee7131e4c3290b5eb653d6edb20faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Sep 2024 12:46:09 +0200 Subject: [PATCH 1/4] enable zfs settings by default --- nixosModules/clanCore/default.nix | 1 + nixosModules/{ => clanCore}/zfs.nix | 0 nixosModules/flake-module.nix | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) rename nixosModules/{ => clanCore}/zfs.nix (100%) diff --git a/nixosModules/clanCore/default.nix b/nixosModules/clanCore/default.nix index cb469bee3..2ad8a5bf8 100644 --- a/nixosModules/clanCore/default.nix +++ b/nixosModules/clanCore/default.nix @@ -18,5 +18,6 @@ ./vm.nix ./wayland-proxy-virtwl.nix ./zerotier + ./zfs.nix ]; } diff --git a/nixosModules/zfs.nix b/nixosModules/clanCore/zfs.nix similarity index 100% rename from nixosModules/zfs.nix rename to nixosModules/clanCore/zfs.nix diff --git a/nixosModules/flake-module.nix b/nixosModules/flake-module.nix index 32ff61eae..22797f8d4 100644 --- a/nixosModules/flake-module.nix +++ b/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 From d3d2dd02778eca94b985098ebe11389c174a774c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Sep 2024 13:57:21 +0200 Subject: [PATCH 2/4] disable info pages --- nixosModules/clanCore/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixosModules/clanCore/default.nix b/nixosModules/clanCore/default.nix index 2ad8a5bf8..de72f2ea0 100644 --- a/nixosModules/clanCore/default.nix +++ b/nixosModules/clanCore/default.nix @@ -20,4 +20,6 @@ ./zerotier ./zfs.nix ]; + # Work around for https://github.com/NixOS/nixpkgs/issues/124215 + documentation.info.enable = lib.mkDefault false; } From ff2a9a110fc7bb6a97f49e5f582abaf96358637e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Sep 2024 13:57:32 +0200 Subject: [PATCH 3/4] switch to systemd-initrd --- nixosModules/clanCore/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixosModules/clanCore/default.nix b/nixosModules/clanCore/default.nix index de72f2ea0..a242dab51 100644 --- a/nixosModules/clanCore/default.nix +++ b/nixosModules/clanCore/default.nix @@ -1,3 +1,4 @@ +{ lib, config, ... }: { imports = [ ./backups.nix @@ -20,6 +21,12 @@ ./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; } From 885d073fbcc5cbdfdf309a3eff71fa07f21f50e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Sep 2024 13:58:10 +0200 Subject: [PATCH 4/4] disable ldso32 stub to save eval time --- nixosModules/clanCore/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixosModules/clanCore/default.nix b/nixosModules/clanCore/default.nix index a242dab51..e7ebe87a9 100644 --- a/nixosModules/clanCore/default.nix +++ b/nixosModules/clanCore/default.nix @@ -29,4 +29,7 @@ # 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; }