From 5cbde2e43f5fe5496a783ce3576f2151f57573aa Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Thu, 5 Sep 2024 00:57:48 -0700 Subject: [PATCH] chore: nf-fmt-nix --- nixos/dnsmasq.nix | 30 ++++++++++++++++-------------- systems/sakuya/default.nix | 6 +++--- systems/sakuya/nixos.nix | 15 +++++++++------ systems/shanghai/default.nix | 6 +++++- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/nixos/dnsmasq.nix b/nixos/dnsmasq.nix index 701c5322..c4d4a3b2 100644 --- a/nixos/dnsmasq.nix +++ b/nixos/dnsmasq.nix @@ -26,23 +26,25 @@ ]; mapDynamic4 = replaceStrings ["10.1.1."] ["0.0.0."]; mapDynamic6 = replaceStrings ["fd0a::"] ["2001::"]; - mkDynamicHostRecords = system: map (mkDynamicHostRecord system) ( - singleton system.access.fqdn - ++ system.access.fqdnAliases - ); + mkDynamicHostRecords = system: + map (mkDynamicHostRecord system) ( + singleton system.access.fqdn + ++ system.access.fqdnAliases + ); mkDynamicHostRecord = system: let address4 = system.network.networks.local.address4 or null; address6 = system.network.networks.local.address6 or null; - in fqdn: - concatStringsSep "," ( - singleton fqdn - ++ optional (address4 != null) - (toString (mapNullable mapDynamic4 address4)) - ++ optional (address6 != null) - (toString (mapNullable mapDynamic6 address6)) - ++ singleton - cfg.dynamic.interface - ); + in + fqdn: + concatStringsSep "," ( + singleton fqdn + ++ optional (address4 != null) + (toString (mapNullable mapDynamic4 address4)) + ++ optional (address6 != null) + (toString (mapNullable mapDynamic6 address6)) + ++ singleton + cfg.dynamic.interface + ); mkHostRecordPair = network: system: let address4 = system.network.networks.${network}.address4 or null; address6 = system.network.networks.${network}.address6 or null; diff --git a/systems/sakuya/default.nix b/systems/sakuya/default.nix index 4790abab..e9f8d18f 100644 --- a/systems/sakuya/default.nix +++ b/systems/sakuya/default.nix @@ -6,9 +6,9 @@ _: { modules = [ ./nixos.nix ]; -deploy = { -hostname = "10.1.1.50"; -}; + deploy = { + hostname = "10.1.1.50"; + }; network.networks = { tail = { #address4 = "100.70.124.79"; diff --git a/systems/sakuya/nixos.nix b/systems/sakuya/nixos.nix index 377fbbf7..89df99af 100644 --- a/systems/sakuya/nixos.nix +++ b/systems/sakuya/nixos.nix @@ -1,8 +1,11 @@ -{ config, meta, ... }: { - +{ + config, + meta, + ... +}: { imports = let inherit (meta) nixos; - in [ + in [ nixos.sops nixos.tailscale ]; @@ -12,9 +15,9 @@ }; fileSystems."/" = { - device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; - }; + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; networking.useNetworkd = true; systemd.network = { diff --git a/systems/shanghai/default.nix b/systems/shanghai/default.nix index 9e87780a..01ba6c39 100644 --- a/systems/shanghai/default.nix +++ b/systems/shanghai/default.nix @@ -1,4 +1,8 @@ -{config, lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.strings) concatStringsSep; dot = concatStringsSep "."; cutie = dot ["cutie" "moe"];