yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nixosModules/clanCore: support nix-darwin

Browse Source
This commit is contained in:
Michael Hoang
2025-04-12 17:11:34 +02:00
parent f336f6514c
commit 5e61a6e41d
13 changed files with 173 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
nixosModules/clanCore/default.nix
View File

@@ -1,23 +1,26 @@
{ _class, lib, ... }:
{
imports = [
./backups.nix
./defaults.nix
./facts
./inventory
./meta/interface.nix
./metadata.nix
./networking.nix
./nixos-facter.nix
./nix-settings.nix
./options.nix
./outputs.nix
./schema.nix
./sops.nix
./vars
./vm.nix
./wayland-proxy-virtwl.nix
./zerotier
./zfs.nix
];
imports =
[
./backups.nix
./defaults.nix
./facts
./inventory
./meta/interface.nix
./metadata.nix
./networking.nix
./nix-settings.nix
./options.nix
./outputs.nix
./schema.nix
./sops.nix
./vars
]
++ lib.optionals (_class == "nixos") [
./nixos-facter.nix
./vm.nix
./wayland-proxy-virtwl.nix
./zerotier
./zfs.nix
];
}

27
nixosModules/clanCore/defaults.nix
View File

@@ -1,10 +1,27 @@
{
_class,
lib,
config,
pkgs,
...
}:
{
imports = lib.optional (_class == "nixos") (
lib.mkIf config.clan.core.enableRecommendedDefaults {
# 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);
# Don't install the /lib/ld-linux.so.2 stub. This saves one instance of nixpkgs.
environment.ldso32 = null;
environment.systemPackages = [
pkgs.nixos-facter # for `clan machines update-hardware-config --backend nixos-facter`
];
}
);
options.clan.core.enableRecommendedDefaults = lib.mkOption {
type = lib.types.bool;
description = ''
@@ -20,11 +37,6 @@
};
config = lib.mkIf config.clan.core.enableRecommendedDefaults {
# 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);
# This disables the HTML manual and `nixos-help` command but leaves
# `man configuration.nix`
documentation.doc.enable = lib.mkDefault false;
@@ -32,9 +44,6 @@
# 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;
environment.systemPackages = [
# essential debugging tools for networked services
pkgs.dnsutils
@@ -43,8 +52,6 @@
pkgs.jq
pkgs.htop
pkgs.nixos-facter # for `clan machines update-hardware-config --backend nixos-facter`
pkgs.gitMinimal
];
};

39
nixosModules/clanCore/networking.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, ... }:
{
_class,
config,
lib,
...
}:
{
options.clan.core = {
networking = {
@@ -96,23 +101,25 @@
]
)
];
config = lib.mkIf config.clan.core.enableRecommendedDefaults {
# conflicts with systemd-resolved
networking.useHostResolvConf = false;
config = lib.optionalAttrs (_class == "nixos") (
lib.mkIf config.clan.core.enableRecommendedDefaults {
# conflicts with systemd-resolved
networking.useHostResolvConf = false;
# Allow PMTU / DHCP
networking.firewall.allowPing = true;
# Allow PMTU / DHCP
networking.firewall.allowPing = true;
# The notion of "online" is a broken concept
# https://github.com/systemd/systemd/blob/e1b45a756f71deac8c1aa9a008bd0dab47f64777/NEWS#L13
systemd.services.NetworkManager-wait-online.enable = false;
systemd.network.wait-online.enable = false;
# The notion of "online" is a broken concept
# https://github.com/systemd/systemd/blob/e1b45a756f71deac8c1aa9a008bd0dab47f64777/NEWS#L13
systemd.services.NetworkManager-wait-online.enable = false;
systemd.network.wait-online.enable = false;
systemd.network.networks."99-ethernet-default-dhcp".networkConfig.MulticastDNS = lib.mkDefault true;
systemd.network.networks."99-wireless-client-dhcp".networkConfig.MulticastDNS = lib.mkDefault true;
networking.firewall.allowedUDPPorts = [ 5353 ]; # Multicast DNS
systemd.network.networks."99-ethernet-default-dhcp".networkConfig.MulticastDNS = lib.mkDefault true;
systemd.network.networks."99-wireless-client-dhcp".networkConfig.MulticastDNS = lib.mkDefault true;
networking.firewall.allowedUDPPorts = [ 5353 ]; # Multicast DNS
# Use networkd instead of the pile of shell scripts
networking.useNetworkd = lib.mkDefault true;
};
# Use networkd instead of the pile of shell scripts
networking.useNetworkd = lib.mkDefault true;
}
);
}

49
nixosModules/clanCore/nix-settings.nix
View File

@@ -1,27 +1,38 @@
{ lib, config, ... }:
{
_class,
lib,
config,
...
}:
# Taken from:
# https://github.com/nix-community/srvos/blob/main/nixos/common/nix.nix
lib.mkIf config.clan.core.enableRecommendedDefaults {
# Fallback quickly if substituters are not available.
nix.settings.connect-timeout = 5;
{
imports = lib.optional (_class == "nixos") (
lib.mkIf config.clan.core.enableRecommendedDefaults {
nix.daemonCPUSchedPolicy = lib.mkDefault "batch";
nix.daemonIOSchedClass = lib.mkDefault "idle";
nix.daemonIOSchedPriority = lib.mkDefault 7;
}
);
# Enable flakes
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
config = lib.mkIf config.clan.core.enableRecommendedDefaults {
# Fallback quickly if substituters are not available.
nix.settings.connect-timeout = 5;
# The default at 10 is rarely enough.
nix.settings.log-lines = lib.mkDefault 25;
# Enable flakes
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# Avoid disk full issues
nix.settings.max-free = lib.mkDefault (3000 * 1024 * 1024);
nix.settings.min-free = lib.mkDefault (512 * 1024 * 1024);
# The default at 10 is rarely enough.
nix.settings.log-lines = lib.mkDefault 25;
nix.daemonCPUSchedPolicy = lib.mkDefault "batch";
nix.daemonIOSchedClass = lib.mkDefault "idle";
nix.daemonIOSchedPriority = lib.mkDefault 7;
# Avoid disk full issues
nix.settings.max-free = lib.mkDefault (3000 * 1024 * 1024);
nix.settings.min-free = lib.mkDefault (512 * 1024 * 1024);
# Avoid copying unnecessary stuff over SSH
nix.settings.builders-use-substitutes = true;
# Avoid copying unnecessary stuff over SSH
nix.settings.builders-use-substitutes = true;
};
}

1
nixosModules/clanCore/nixos-facter.nix
View File

@@ -6,6 +6,7 @@ let
hwConfig = "${directory}/machines/${machineName}/hardware-configuration.nix";
in
{
_class = "nixos";
facter.reportPath = lib.mkIf (builtins.pathExists facterJson) facterJson;
warnings =
lib.optionals

18
nixosModules/clanCore/vars/default.nix
View File

@@ -1,4 +1,5 @@
{
_class,
lib,
config,
pkgs,
@@ -14,13 +15,16 @@ let
};
in
{
imports = [
./public/in_repo.nix
./secret/fs.nix
./secret/password-store.nix
./secret/sops
./secret/vm.nix
];
imports =
[
./public/in_repo.nix
./secret/fs.nix
./secret/sops
./secret/vm.nix
]
++ lib.optionals (_class == "nixos") [
./secret/password-store.nix
];
options.clan.core.vars = lib.mkOption {
description = ''
Generated Variables

2
nixosModules/clanCore/vars/secret/password-store.nix
View File

@@ -52,6 +52,8 @@ let
in
{
_class = "nixos";
options.clan.vars.password-store = {
secretLocation = lib.mkOption {
type = lib.types.path;

2
nixosModules/clanCore/vm.nix
View File

@@ -122,6 +122,8 @@ let
vmConfig = extendModules { modules = [ vmModule ]; };
in
{
_class = "nixos";
options = {
clan.virtualisation = {
cores = lib.mkOption {

1
nixosModules/clanCore/wayland-proxy-virtwl.nix
View File

@@ -5,6 +5,7 @@
...
}:
{
_class = "nixos";
options = {
# maybe upstream this?
services.wayland-proxy-virtwl = {

2
nixosModules/clanCore/zfs.nix
View File

@@ -1,5 +1,7 @@
{ lib, config, ... }:
{
_class = "nixos";
# Use the same default hostID as the NixOS install ISO and nixos-anywhere.
# This allows us to import zfs pool without using a force import.
# ZFS has this as a safety mechanism for networked block storage (ISCSI), but