From e863aea052649c39f96d6b9cdec2a60c120bf5d5 Mon Sep 17 00:00:00 2001 From: Toast Date: Sun, 14 Dec 2025 01:07:21 +0100 Subject: [PATCH] Run formatter --- lib/networkManager.nix | 35 +++++++++++++++++------------- machines/WinMax2/configuration.nix | 2 +- roles/server/endlessh.nix | 2 +- roles/server/forgejo.nix | 2 +- roles/server/minecraft.nix | 2 +- roles/server/prometheus.nix | 12 +++++----- roles/server/transmission.nix | 6 ++++- 7 files changed, 36 insertions(+), 25 deletions(-) diff --git a/lib/networkManager.nix b/lib/networkManager.nix index 183501b..b4bfbfe 100644 --- a/lib/networkManager.nix +++ b/lib/networkManager.nix @@ -1,18 +1,23 @@ {lib}: { - /** + /** Make a NetworkManager wifi profile, to be used with ensureProfiles - */ - mkWifiProfile = {id, ssid, priority ? 0, wifi-security}: { - connection = { - inherit id; - type = "wifi"; - autoconnect-priority = priority; - }; - ipv4.method = "auto"; - wifi = { - mode = "infrastructure"; - inherit ssid; - }; - inherit wifi-security; - }; + */ + mkWifiProfile = { + id, + ssid, + priority ? 0, + wifi-security, + }: { + connection = { + inherit id; + type = "wifi"; + autoconnect-priority = priority; + }; + ipv4.method = "auto"; + wifi = { + mode = "infrastructure"; + inherit ssid; + }; + inherit wifi-security; + }; } diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index bdcd084..81f0f44 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -72,7 +72,7 @@ xserver.xkb.layout = lib.mkForce "us"; }; - # Enable bluetooth + # Enable bluetooth hardware.bluetooth = { enable = true; }; diff --git a/roles/server/endlessh.nix b/roles/server/endlessh.nix index 6c56997..b4dcfaa 100755 --- a/roles/server/endlessh.nix +++ b/roles/server/endlessh.nix @@ -1,4 +1,4 @@ -{config,...}: { +{config, ...}: { # I prefer using the go implementation services.endlessh-go = { enable = true; diff --git a/roles/server/forgejo.nix b/roles/server/forgejo.nix index 22dfa17..95210c4 100644 --- a/roles/server/forgejo.nix +++ b/roles/server/forgejo.nix @@ -7,7 +7,7 @@ sops.secrets = let owner = config.services.forgejo.user; group = config.services.forgejo.group; - in{ + in { "forgejoHostKey/private" = { inherit owner group; name = "id_forgejo"; diff --git a/roles/server/minecraft.nix b/roles/server/minecraft.nix index 138c379..9985df0 100644 --- a/roles/server/minecraft.nix +++ b/roles/server/minecraft.nix @@ -95,5 +95,5 @@ in { UMask = "0077"; }; }; - programs.rust-motd.settings.service_status."Minecraft (SkyFactory 5)"= "minecraft-server-sf5"; + programs.rust-motd.settings.service_status."Minecraft (SkyFactory 5)" = "minecraft-server-sf5"; } diff --git a/roles/server/prometheus.nix b/roles/server/prometheus.nix index 999d9c6..fb32f05 100644 --- a/roles/server/prometheus.nix +++ b/roles/server/prometheus.nix @@ -22,10 +22,12 @@ ]; }; services.grafana.provision = { - datasources.settings.datasources = [{ - name = "Prometheus"; - type = "prometheus"; - url = "http://127.0.0.1:${builtins.toString config.services.prometheus.port}"; - }]; + datasources.settings.datasources = [ + { + name = "Prometheus"; + type = "prometheus"; + url = "http://127.0.0.1:${builtins.toString config.services.prometheus.port}"; + } + ]; }; } diff --git a/roles/server/transmission.nix b/roles/server/transmission.nix index a6e7e3c..ce18dbd 100755 --- a/roles/server/transmission.nix +++ b/roles/server/transmission.nix @@ -1,4 +1,8 @@ -{config, pkgs, ...}: let +{ + config, + pkgs, + ... +}: let transmissionUid = toString config.users.users.transmission.uid; transmissionGid = toString config.users.groups.transmission.gid; mountPoint = config.fileSystems."nfs_transmission".mountPoint;