From 356b26e690a8807a7ea4225cba3813a3d5ab12be Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 23 Apr 2025 08:00:16 +0200 Subject: [PATCH] chore: treefmt --- checks/syncthing/sops/machines/introducer/key.json | 2 +- checks/syncthing/sops/machines/peer1/key.json | 2 +- checks/syncthing/sops/machines/peer2/key.json | 2 +- checks/syncthing/sops/users/admin/key.json | 5 ++++- clanModules/syncthing/roles/introducer.nix | 5 ++--- clanModules/syncthing/roles/peer.nix | 3 +-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/checks/syncthing/sops/machines/introducer/key.json b/checks/syncthing/sops/machines/introducer/key.json index e4c21e122..057e51b3e 100755 --- a/checks/syncthing/sops/machines/introducer/key.json +++ b/checks/syncthing/sops/machines/introducer/key.json @@ -3,4 +3,4 @@ "publickey": "age1dtyyp6t7hy570sd0vqleges2hve8jn8pfk2dnnxm9x7c6ultn9yssh0mjh", "type": "age" } -] \ No newline at end of file +] diff --git a/checks/syncthing/sops/machines/peer1/key.json b/checks/syncthing/sops/machines/peer1/key.json index 36ef5042f..752d34e0f 100755 --- a/checks/syncthing/sops/machines/peer1/key.json +++ b/checks/syncthing/sops/machines/peer1/key.json @@ -3,4 +3,4 @@ "publickey": "age12xw22jdyk23halj5vafkxhne9uecux0umumcse6vee2eux55wg0qxagw6a", "type": "age" } -] \ No newline at end of file +] diff --git a/checks/syncthing/sops/machines/peer2/key.json b/checks/syncthing/sops/machines/peer2/key.json index 9e2765f69..2fa919222 100755 --- a/checks/syncthing/sops/machines/peer2/key.json +++ b/checks/syncthing/sops/machines/peer2/key.json @@ -3,4 +3,4 @@ "publickey": "age19202wv5mesd4pyvk96rtkqf0tm9hvhwscuxuwxlmhc3v9mtszgxsl500j6", "type": "age" } -] \ No newline at end of file +] diff --git a/checks/syncthing/sops/users/admin/key.json b/checks/syncthing/sops/users/admin/key.json index e337dccd1..e408aa96b 100644 --- a/checks/syncthing/sops/users/admin/key.json +++ b/checks/syncthing/sops/users/admin/key.json @@ -1 +1,4 @@ -{"publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", "type": "age"} \ No newline at end of file +{ + "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "type": "age" +} diff --git a/clanModules/syncthing/roles/introducer.nix b/clanModules/syncthing/roles/introducer.nix index cbc978c54..bdd61dbe9 100644 --- a/clanModules/syncthing/roles/introducer.nix +++ b/clanModules/syncthing/roles/introducer.nix @@ -1,6 +1,5 @@ -{ config , pkgs, lib, ... }: -let -in { +{ ... }: +{ imports = [ ../shared.nix ]; diff --git a/clanModules/syncthing/roles/peer.nix b/clanModules/syncthing/roles/peer.nix index 032644536..0da082825 100644 --- a/clanModules/syncthing/roles/peer.nix +++ b/clanModules/syncthing/roles/peer.nix @@ -12,8 +12,7 @@ in ../shared.nix ]; clan.syncthing.introducer = lib.strings.removeSuffix "\n" ( - if builtins.pathExists introducerId - then + if builtins.pathExists introducerId then builtins.readFile introducerId else throw "${introducerId} does not exists. Please run `clan vars generate ${introducer}` to generate the introducer device id"