fixed location of plaintext apiKey as environment variable in systemd service config (#264)

* fixed location of plaintext apiKey as environment variable in systemd services attrset

* Fix formatting

---------

Co-authored-by: Kiri Carlson <kiri@walawren.com>

Author: Amolition

modules/arr-common/mkArrServiceModule.nix

@@ -300,7 +300,11 @@ in
 
       systemd.services.${serviceName} = {
         description = capitalizedName;
-        environment = mkServarrSettingsEnvVars (toUpper serviceBase) cfg.settings;
+        environment =
+          mkServarrSettingsEnvVars (toUpper serviceBase) cfg.settings
+          // optionalAttrs (cfg.config.apiKey != null && !apiKeyIsSecretRef) {
+            ${apiKeyEnvVar} = toString cfg.config.apiKey;
+          };
 
         after = [
           "network.target"
@@ -331,9 +335,6 @@ in
         }
         // optionalAttrs apiKeyIsSecretRef {
           LoadCredential = [ "apiKey:${toString cfg.config.apiKey._secret}" ];
-        }
-        // optionalAttrs (cfg.config.apiKey != null && !apiKeyIsSecretRef) {
-          environment.${apiKeyEnvVar} = toString cfg.config.apiKey;
         };
       };
     }