From d7622f4d8fbd2ac6b611672e2c856ed7b6f02fe3 Mon Sep 17 00:00:00 2001 From: sinavir Date: Tue, 7 Jan 2025 11:35:06 +0100 Subject: [PATCH] chore(nixfmt): Format all files since nixfmt version changed --- default.nix | 35 ++++++++++++---------- machines/liminix/ap01/wlan.nix | 2 +- machines/nixos/build01/secrets/secrets.nix | 8 +++-- machines/nixos/vault01/networking.nix | 14 ++++----- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/default.nix b/default.nix index a12b21c..d81e870 100644 --- a/default.nix +++ b/default.nix @@ -178,24 +178,27 @@ in devShell = pkgs.mkShell { name = "dgnum-infra"; - packages = [ - (pkgs.nixos-generators.overrideAttrs (_: { - version = "1.8.0-unstable"; - src = sources.nixos-generators; - })) - pkgs.npins + packages = + [ + (pkgs.nixos-generators.overrideAttrs (_: { + version = "1.8.0-unstable"; + src = sources.nixos-generators; + })) + pkgs.npins - # SSO testing - pkgs.kanidm - pkgs.freeradius - pkgs.picocom # for serial access + # SSO testing + pkgs.kanidm + pkgs.freeradius + pkgs.picocom # for serial access - (pkgs.callPackage ./lib/colmena { - colmena = pkgs.callPackage "${sources.colmena}/package.nix" { }; - }) - (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { }) - (pkgs.callPackage "${sources.lon}/nix/packages/lon.nix" { }) - ] ++ git-checks.enabledPackages ++ (builtins.attrValues scripts); + (pkgs.callPackage ./lib/colmena { + colmena = pkgs.callPackage "${sources.colmena}/package.nix" { }; + }) + (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { }) + (pkgs.callPackage "${sources.lon}/nix/packages/lon.nix" { }) + ] + ++ git-checks.enabledPackages + ++ (builtins.attrValues scripts); shellHook = builtins.concatStringsSep "\n" [ git-checks.shellHook diff --git a/machines/liminix/ap01/wlan.nix b/machines/liminix/ap01/wlan.nix index e643017..aede645 100644 --- a/machines/liminix/ap01/wlan.nix +++ b/machines/liminix/ap01/wlan.nix @@ -89,7 +89,7 @@ in hostap-2 = mkWifiSta ( baseParams // clientRadius // externalRadius // radiusKeyMgmt // modernParams ) config.hardware.networkInterfaces.wlan1 secrets-2; - # Oneshot that waits until the hostapd has set the interface in operational state. + # Oneshot that waits until the hostapd has set the interface in operational state. hostap-2-ready = svc.hostapd-ready.build { interface = config.hardware.networkInterfaces.wlan1; }; diff --git a/machines/nixos/build01/secrets/secrets.nix b/machines/nixos/build01/secrets/secrets.nix index 5974c55..f234224 100644 --- a/machines/nixos/build01/secrets/secrets.nix +++ b/machines/nixos/build01/secrets/secrets.nix @@ -2,6 +2,8 @@ # # SPDX-License-Identifier: EUPL-1.2 -(import ../../../../keys).mkSecrets [ "build01" ] [ - "forgejo_runners-token_file" -] +(import ../../../../keys).mkSecrets + [ "build01" ] + [ + "forgejo_runners-token_file" + ] diff --git a/machines/nixos/vault01/networking.nix b/machines/nixos/vault01/networking.nix index f41de3a..c04f8f7 100644 --- a/machines/nixos/vault01/networking.nix +++ b/machines/nixos/vault01/networking.nix @@ -285,15 +285,13 @@ in ]; script = '' if ping -c 1 8.8.8.8 > /dev/null || ping -c 1 1.1.1.1 > /dev/null; then - ${ - lib.concatMapStringsSep "\n " ({ interfaceName, ... }: "networkctl up ${interfaceName}") userVlans - } + ${lib.concatMapStringsSep "\n " ( + { interfaceName, ... }: "networkctl up ${interfaceName}" + ) userVlans} else - ${ - lib.concatMapStringsSep "\n " ( - { interfaceName, ... }: "networkctl down ${interfaceName}" - ) userVlans - } + ${lib.concatMapStringsSep "\n " ( + { interfaceName, ... }: "networkctl down ${interfaceName}" + ) userVlans} fi ''; };