Opt-in to formatting for the services/ subdirectory

flake.nix

@@ -27,7 +27,10 @@
             ## opt-in. Maybe one day we will decide to have them everywhere.
             let
               inherit (builtins) concatStringsSep;
-              optin = [ "deployment" ];
+              optin = [
+                "deployment"
+                "services"
+              ];
               files = "^((" + concatStringsSep "|" optin + ")/.*\\.nix|[^/]*\\.nix)$";
             in
             {

services/fediversity/garage.nix

@@ -141,12 +141,8 @@ in
           types.submodule {
             # TODO: these should be managed as secrets, not in the nix store
             options = {
-              id = mkOption {
+              id = mkOption { type = types.str; };
-                type = types.str;
+              secret = mkOption { type = types.str; };
-              };
-              secret = mkOption {
-                type = types.str;
-              };
               # TODO: assert at least one of these is true
               # NOTE: this currently needs to be done at the top level module
               ensureAccess = mkOption {
@@ -184,9 +180,7 @@ in
       pkgs.awscli
     ];
 
-    networking.firewall.allowedTCPPorts = [
+    networking.firewall.allowedTCPPorts = [ fedicfg.rpc.port ];
-      fedicfg.rpc.port
-    ];
     services.garage = {
       enable = true;
       package = pkgs.garage_0_9;

services/fediversity/mastodon.nix

@@ -5,11 +5,7 @@ let
   };
 in
 
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 
 lib.mkIf (config.fediversity.enable && config.fediversity.mastodon.enable) {
   #### garage setup

services/fediversity/peertube.nix

@@ -5,11 +5,7 @@ let
   };
 in
 
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 
 lib.mkIf (config.fediversity.enable && config.fediversity.peertube.enable) {
   networking.firewall.allowedTCPPorts = [

services/flake.nix

@@ -128,9 +128,7 @@
       };
 
       devShells.${system}.default = pkgs.mkShell {
-        inputs = with pkgs; [
+        inputs = with pkgs; [ nil ];
-          nil
-        ];
         shellHook = self.checks.${system}.pre-commit.shellHook;
       };
     };

services/installer.nix

@@ -42,9 +42,7 @@ let
       };
     in
     {
-      imports = [
+      imports = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" ];
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-      ];
       nixpkgs.hostPlatform = "x86_64-linux";
       services.getty.autologinUser = lib.mkForce "root";
       programs.bash.loginShellInit = nixpkgs.lib.getExe bootstrap;

services/tests/mastodon-garage.nix

@@ -7,9 +7,7 @@ let
 
   seleniumScript =
     pkgs.writers.writePython3Bin "selenium-script"
-      {
+      { libraries = with pkgs.python3Packages; [ selenium ]; }
-        libraries = with pkgs.python3Packages; [ selenium ];
-      }
       ''
         from selenium import webdriver
         from selenium.webdriver.common.by import By

services/tests/pixelfed-garage.nix

@@ -54,9 +54,7 @@ let
 
   seleniumScriptPostPicture =
     pkgs.writers.writePython3Bin "selenium-script-post-picture"
-      {
+      { libraries = with pkgs.python3Packages; [ selenium ]; }
-        libraries = with pkgs.python3Packages; [ selenium ];
-      }
       ''
         import os
         import time
@@ -99,9 +97,7 @@ let
 
   seleniumScriptGetSrc =
     pkgs.writers.writePython3Bin "selenium-script-get-src"
-      {
+      { libraries = with pkgs.python3Packages; [ selenium ]; }
-        libraries = with pkgs.python3Packages; [ selenium ];
-      }
       ''
         ${seleniumImports}
         ${seleniumSetup}

services/vm/pixelfed-vm.nix

@@ -1,8 +1,4 @@
-{
+{ lib, modulesPath, ... }:
-  lib,
-  modulesPath,
-  ...
-}:
 
 let
   inherit (lib) mkVMOverride;