More formatting changes

modules/system/accounts/users/custom/main/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   users.users."${config.sysusers.main}" = {
     hashedPassword = config.secrets.mainAccPass;

modules/system/default.nix

@@ -10,7 +10,7 @@
     ../extras
   ];
 
-  options.system = {
+  options.system = with lib; {
     desktop.enable = lib.mkEnableOption "Enable desktop apps and services";
     server.enable = lib.mkEnableOption "Enable server apps and services";
   };

modules/system/devices/bluetooth/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   config = lib.mkIf config.system.desktop.enable {
     hardware.bluetooth = {

modules/system/devices/boot/lanzaboote/default.nix

@@ -1,13 +1,8 @@
-{ lanzaboote, lib, config, pkgs, ... }:
+{ config, lib, pkgs, lanzaboote, ... }:
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
-  options.system.lanzaboote = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
-  };
+  options.system.lanzaboote.enable = lib.mkEnableOption "Enable lanzaboote";
 
   config = lib.mkIf config.system.lanzaboote.enable {
     boot = {

modules/system/services/server/fileserver/jellyfin/nginx/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."jelly.${config.domains.p2}" = lib.mkIf config.services.forgejo.enable {
     enableACME = true;

modules/system/services/server/fileserver/nextcloud/nginx/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."cloud.${config.domains.p2}" = lib.mkIf config.services.nextcloud.enable {
     enableACME = true;

modules/system/services/server/forgejo/nginx/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."git.${config.domains.p2}" = lib.mkIf config.services.forgejo.enable {
     enableACME = true;

modules/system/services/server/icecast/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   imports = [
     ./nginx

modules/system/services/server/icecast/liquidsoap/jimbops/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.services.icecast.enable {
     services.liquidsoap.streams = {

modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.services.icecast.enable {
     services.liquidsoap.streams = {

modules/system/services/server/icecast/nginx/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."radio.${config.domains.p2}" = lib.mkIf config.services.icecast.enable {
     enableACME = true;

modules/system/services/server/mailserver/roundcube/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: 
+{ config, ... }: 
 {
   services.roundcube = {
    enable = config.system.mailserver.enable;

modules/system/services/server/mailserver/simplenix/nginx/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: 
+{ config, lib, ... }: 
 {
   services.nginx.virtualHosts."mx.${config.domains.p2}" = lib.mkIf config.mailserver.enable {
     enableACME = true;

modules/system/services/server/socialserver/matrix/element/nginx/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   services.nginx.virtualHosts."chat.${config.domains.p2}" = lib.mkIf config.services.matrix-synapse.enable {
     enableACME = true;

modules/system/services/server/webserver/nginx/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, ... }:
 {
   imports = [
     ./rtmp
@@ -14,9 +14,7 @@
       recommendedProxySettings = true;
     };
 
-    environment.persistence."/persist".directories = [
-      "/var/www"
-    ];
+    environment.persistence."/persist".directories = [ "/var/www" ];
 
     networking.firewall.allowedTCPPorts = [
       80

modules/system/services/server/webserver/nginx/rtmp/default.nix

@@ -1,11 +1,6 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
-  options.services.nginx.rtmp = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
-  };
+  options.services.nginx.rtmp.enable = lib.mkEnableOption "Enable an RTMP server using Nginx";
 
   config = lib.mkIf config.services.nginx.rtmp.enable {
     services.nginx = {
@@ -32,9 +27,6 @@
         }
       '';
     };
-
-    systemd.services.nginx.serviceConfig = {
-      ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ];
-    };
+    systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ];
   };
 }