diff --git a/os-mods/ryzenapu/default.nix b/os-mods/ryzenapu/default.nix
index d7cc7a7..2945269 100644
--- a/os-mods/ryzenapu/default.nix
+++ b/os-mods/ryzenapu/default.nix
@@ -17,79 +17,81 @@
       ${ryzenadj}/bin/ryzenadj --stapm-limit="$value" --fast-limit="$value" --slow-limit="$value" --tctl-temp=85
     '')
   ];
-  systemd = let 
-  tcl = "85";
-  coall = "1048561"; # 1048561 = 0x100000 - 15(mV) $ math "0x100000-15" # slight undervolt
-  defaults = "--tctl-temp=${tcl} --set-coall=${coall}";
-  in {
-    services = {
-  	ryzenadj = {
-        enable = false;
-        description = "RyzenAdj Autoset";
-        serviceConfig = {
-          Type = "oneshot";
-          User = "root";
-          ExecStart = "${pkgs.ryzenadj}/bin/ryzenadj ${defaults}"; 
+  systemd =
+    let
+      tcl = "85";
+      coall = "1048561"; # 1048561 = 0x100000 - 15(mV) $ math "0x100000-15" # slight undervolt
+      defaults = "--tctl-temp=${tcl} --set-coall=${coall}";
+    in
+    {
+      services = {
+        ryzenadj = {
+          enable = false;
+          description = "RyzenAdj Autoset";
+          serviceConfig = {
+            Type = "oneshot";
+            User = "root";
+            ExecStart = "${pkgs.ryzenadj}/bin/ryzenadj ${defaults}";
+          };
+          wantedBy = [ "multi-user.target" ];
         };
-        wantedBy = [ "multi-user.target" ];
-      };
 
-      desktop-power-maximum-tdp = {
-        description = "Change TDP to maximum TDP when on AC power";
-        wantedBy = [ "ac.target" ];
-        unitConfig = {
-          RefuseManualStart = true;
+        desktop-power-maximum-tdp = {
+          description = "Change TDP to maximum TDP when on AC power";
+          wantedBy = [ "ac.target" ];
+          unitConfig = {
+            RefuseManualStart = true;
+          };
+          path = with pkgs; [
+            coreutils
+            ryzenadj
+          ];
+          serviceConfig.Type = "oneshot";
+          preStart = "sleep 2";
+          script = ''
+            ryzenadj --stapm-limit=50000 --slow-limit=54000 --fast-limit=55000 ${defaults}
+          '';
         };
-        path = with pkgs; [
-          coreutils
-          ryzenadj
-        ];
-        serviceConfig.Type = "oneshot";
-        preStart = "sleep 2";
-        script = ''
-          ryzenadj --stapm-limit=50000 --slow-limit=54000 --fast-limit=55000 ${defaults}
+
+        portable-power-saving-tdp = {
+          description = "Change TDP to power saving TDP when on battery power";
+          wantedBy = [ "battery.target" ];
+          unitConfig = { RefuseManualStart = true; };
+          path = with pkgs; [
+            coreutils
+            ryzenadj
+          ];
+          serviceConfig.Type = "oneshot";
+          preStart = "sleep 2";
+          script = ''
+            ryzenadj --stapm-limit=10000 --slow-limit=15000 --fast-limit=30000 ${defaults}
+          '';
+        };
+
+        # Do not manage HID devices to prevent annoying keyboard/mouse sleeps
+        powertop.postStart = ''
+          HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
+          for i in $HIDDEVICES; do
+            echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
+            echo 'on' > /sys/bus/usb/devices/$i/power/control
+          done
         '';
       };
 
-      portable-power-saving-tdp = {
-        description = "Change TDP to power saving TDP when on battery power";
-        wantedBy = [ "battery.target" ];
-        unitConfig = { RefuseManualStart = true; };
-        path = with pkgs; [
-          coreutils
-          ryzenadj
-        ];
-        serviceConfig.Type = "oneshot";
-        preStart = "sleep 2";
-        script = ''
-          ryzenadj --stapm-limit=10000 --slow-limit=15000 --fast-limit=30000 ${defaults}
-        '';
-      };
+      targets = {
+        ac = {
+          conflicts = [ "battery.target" ];
+          description = "On AC power";
+          unitConfig = { DefaultDependencies = "false"; };
+        };
 
-      # Do not manage HID devices to prevent annoying keyboard/mouse sleeps
-      powertop.postStart = ''
-        HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
-        for i in $HIDDEVICES; do
-          echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
-          echo 'on' > /sys/bus/usb/devices/$i/power/control
-        done
-      '';
-    };
-
-    targets = {
-      ac = {
-        conflicts = [ "battery.target" ];
-        description = "On AC power";
-        unitConfig = { DefaultDependencies = "false"; };
-      };
-
-      battery = {
-        conflicts = [ "ac.target" ];
-        description = "On battery power";
-        unitConfig = { DefaultDependencies = "false"; };
+        battery = {
+          conflicts = [ "ac.target" ];
+          description = "On battery power";
+          unitConfig = { DefaultDependencies = "false"; };
+        };
       };
     };
-  };
 
   services = {
     power-profiles-daemon.enable = true;
diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index 1e889b6..eb123bf 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -237,7 +237,6 @@
 
   systemd = {
     services = {
-
       # Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps
       # powertop.postStart = ''
       # HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)