diff --git a/clanModules/flake-module.nix b/clanModules/flake-module.nix
index d618a39a2..00cf9d3b9 100644
--- a/clanModules/flake-module.nix
+++ b/clanModules/flake-module.nix
@@ -1,4 +1,5 @@
-{ inputs, ... }: {
+{ inputs, ... }:
+{
   flake.clanModules = {
     diskLayouts = {
       imports = [
diff --git a/clanModules/moonlight.nix b/clanModules/moonlight.nix
index 37b442d2d..5458ad026 100644
--- a/clanModules/moonlight.nix
+++ b/clanModules/moonlight.nix
@@ -13,8 +13,12 @@ in
 
   systemd.tmpfiles.rules = [
     "d '/var/lib/moonlight' 0770 'user' 'users' - -"
-    "C '/var/lib/moonlight/moonlight.cert' 0644 'user' 'users' - ${config.clanCore.secrets.moonlight.secrets."moonlight.cert".path or ""}"
-    "C '/var/lib/moonlight/moonlight.key' 0644 'user' 'users' - ${config.clanCore.secrets.moonlight.secrets."moonlight.key".path or ""}"
+    "C '/var/lib/moonlight/moonlight.cert' 0644 'user' 'users' - ${
+      config.clanCore.secrets.moonlight.secrets."moonlight.cert".path or ""
+    }"
+    "C '/var/lib/moonlight/moonlight.key' 0644 'user' 'users' - ${
+      config.clanCore.secrets.moonlight.secrets."moonlight.key".path or ""
+    }"
   ];
 
   systemd.user.services.init-moonlight = {
@@ -37,13 +41,13 @@ in
         "/var/lib/moonlight/moonlight.cert"
       ];
     };
-
   };
 
   systemd.user.services.moonlight-join = {
     description = "Join sunshine hosts";
-    script = ''
-      ${ms-accept}/bin/moonlight-sunshine-accept moonlight join --port ${builtins.toString defaultPort} --cert '${config.clanCore.secrets.moonlight.facts."moonlight.cert".value or ""}' --host fd2e:25da:6035:c98f:cd99:93e0:b9b8:9ca1'';
+    script = ''${ms-accept}/bin/moonlight-sunshine-accept moonlight join --port ${builtins.toString defaultPort} --cert '${
+      config.clanCore.secrets.moonlight.facts."moonlight.cert".value or ""
+    }' --host fd2e:25da:6035:c98f:cd99:93e0:b9b8:9ca1'';
     serviceConfig = {
       Type = "oneshot";
       TimeoutSec = "infinity";
@@ -63,7 +67,6 @@ in
       Persistent = true;
       Unit = "moonlight-join.service";
     };
-
   };
 
   clanCore.secrets.moonlight = {
diff --git a/clanModules/sunshine.nix b/clanModules/sunshine.nix
index c91a47894..410c3d34d 100644
--- a/clanModules/sunshine.nix
+++ b/clanModules/sunshine.nix
@@ -1,4 +1,9 @@
-{ pkgs, config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 let
   ms-accept = pkgs.callPackage ../pkgs/moonlight-sunshine-accept { };
   sunshineConfiguration = pkgs.writeText "sunshine.conf" ''
@@ -56,7 +61,6 @@ in
     }
   ];
 
-
   environment.systemPackages = [
     ms-accept
     pkgs.sunshine
@@ -92,8 +96,12 @@ in
 
   systemd.tmpfiles.rules = [
     "d '/var/lib/sunshine' 0770 'user' 'users' - -"
-    "C '/var/lib/sunshine/sunshine.cert' 0644 'user' 'users' - ${config.clanCore.secrets.sunshine.secrets."sunshine.cert".path or ""}"
-    "C '/var/lib/sunshine/sunshine.key' 0644 'user' 'users' - ${config.clanCore.secrets.sunshine.secrets."sunshine.key".path or ""}"
+    "C '/var/lib/sunshine/sunshine.cert' 0644 'user' 'users' - ${
+      config.clanCore.secrets.sunshine.secrets."sunshine.cert".path or ""
+    }"
+    "C '/var/lib/sunshine/sunshine.key' 0644 'user' 'users' - ${
+      config.clanCore.secrets.sunshine.secrets."sunshine.key".path or ""
+    }"
   ];
 
   hardware.opengl.enable = true;
@@ -107,9 +115,7 @@ in
     serviceConfig = {
       Restart = "on-failure";
       RestartSec = "5s";
-      ReadWritePaths = [
-        "/var/lib/sunshine"
-      ];
+      ReadWritePaths = [ "/var/lib/sunshine" ];
       ReadOnlyPaths = [
         (config.clanCore.secrets.sunshine.secrets."sunshine.key".path or "")
         (config.clanCore.secrets.sunshine.secrets."sunshine.cert".path or "")
@@ -130,15 +136,15 @@ in
     startLimitBurst = 5;
     startLimitIntervalSec = 500;
     script = ''
-      ${ms-accept}/bin/moonlight-sunshine-accept sunshine init-state --uuid ${config.clanCore.secrets.sunshine.facts.sunshine-uuid.value or null} --state-file /var/lib/sunshine/state.json
+      ${ms-accept}/bin/moonlight-sunshine-accept sunshine init-state --uuid ${
+        config.clanCore.secrets.sunshine.facts.sunshine-uuid.value or null
+      } --state-file /var/lib/sunshine/state.json
     '';
     serviceConfig = {
       Restart = "on-failure";
       RestartSec = "5s";
       Type = "oneshot";
-      ReadWritePaths = [
-        "/var/lib/sunshine"
-      ];
+      ReadWritePaths = [ "/var/lib/sunshine" ];
     };
     wantedBy = [ "graphical-session.target" ];
   };
@@ -155,9 +161,7 @@ in
       Restart = "on-failure";
       RestartSec = "5s";
       Type = "oneshot";
-      ReadWritePaths = [
-        "/var/lib/sunshine"
-      ];
+      ReadWritePaths = [ "/var/lib/sunshine" ];
     };
     wantedBy = [ "graphical-session.target" ];
   };
@@ -168,7 +172,11 @@ in
     startLimitBurst = 5;
     startLimitIntervalSec = 500;
     script = ''
-      ${ms-accept}/bin/moonlight-sunshine-accept sunshine listen --port ${builtins.toString listenPort} --uuid ${config.clanCore.secrets.sunshine.facts.sunshine-uuid.value or null}  --state /var/lib/sunshine/state.json --cert '${config.clanCore.secrets.sunshine.facts."sunshine.cert".value or null}'
+      ${ms-accept}/bin/moonlight-sunshine-accept sunshine listen --port ${builtins.toString listenPort} --uuid ${
+        config.clanCore.secrets.sunshine.facts.sunshine-uuid.value or null
+      }  --state /var/lib/sunshine/state.json --cert '${
+        config.clanCore.secrets.sunshine.facts."sunshine.cert".value or null
+      }'
     '';
     serviceConfig = {
       # ExecStart = lib.concatStringsSep " " (lib.flatten 
@@ -182,9 +190,7 @@ in
       # );
       Restart = "on-failure";
       RestartSec = 5;
-      ReadWritePaths = [
-        "/var/lib/sunshine"
-      ];
+      ReadWritePaths = [ "/var/lib/sunshine" ];
     };
     wantedBy = [ "graphical-session.target" ];
   };