From 0fb4ae72c5754761fd7666e4274f4beef0484c32 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 2 Jan 2025 16:20:21 -0500 Subject: Switch to alejandra for nix formatting I mostly wanted a formatter that would format `inherit` blocks vertically, because otherwise they are super hard to read when diffing or even just editing. Both alejandra and the new nixos/nixfmt format verically like this, but alejandra has slightly better format (I guess) and for some reason nixfmt did not respect my `GLOBIGNORE` setting when doing `nixfmt **/*.nix` so it was trying to format stuff in `_/nix`, and failed. So anyway I went with alejandra. - https://github.com/kamadorueda/alejandra - https://discourse.nixos.org/t/enforcing-nix-formatting-in-nixpkgs/49506 --- Omni/Cloud/Gmnisrv.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Omni/Cloud/Gmnisrv.nix') diff --git a/Omni/Cloud/Gmnisrv.nix b/Omni/Cloud/Gmnisrv.nix index e2a66f6..c7ee523 100644 --- a/Omni/Cloud/Gmnisrv.nix +++ b/Omni/Cloud/Gmnisrv.nix @@ -1,8 +1,12 @@ -{ lib, config, pkgs, ... }: - -let cfg = config.services.gmnisrv; +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.services.gmnisrv; in { - meta.maintainers = [ lib.maintainers.bsima ]; + meta.maintainers = [lib.maintainers.bsima]; options.services.gmnisrv = { enable = lib.mkEnableOption "Enable the gmnisrv service"; listen = lib.mkOption { @@ -15,7 +19,7 @@ in { Configuration for gmnisrv. See gmnisrv.ini(5) for supported settings. ''; default = { - ":tls" = { "store" = lib.mkDefault "${cfg.dataDir}/certs"; }; + ":tls" = {"store" = lib.mkDefault "${cfg.dataDir}/certs";}; }; }; dataDir = lib.mkOption { @@ -27,11 +31,11 @@ in { config = lib.mkIf cfg.enable { systemd.services.gmnisrv = { description = "gmnisrv service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; + wantedBy = ["multi-user.target"]; + after = ["network-online.target"]; script = let - ini = lib.generators.toINIWithGlobalSection { } { - globalSection = { "listen" = cfg.listen; }; + ini = lib.generators.toINIWithGlobalSection {} { + globalSection = {"listen" = cfg.listen;}; sections = cfg.settings; }; in "${pkgs.gmnisrv}/bin/gmnisrv -C ${ini}"; -- cgit v1.2.3