diff --git a/defaults/user-configuration/fhauser/applications/default.nix b/defaults/user-configuration/fhauser/applications/default.nix
index a666491..8108b7b 100644
--- a/defaults/user-configuration/fhauser/applications/default.nix
+++ b/defaults/user-configuration/fhauser/applications/default.nix
@@ -20,7 +20,7 @@
     ./swaylock.nix
     ./kanshi.nix
   ];
-  home-manager.users.fhauser = {config, pkgs, ...}: {
+  home-manager.users.fhauser = { config, pkgs, ... }: {
     home = {
       packages = with pkgs;
         [ # Networking
@@ -77,29 +77,29 @@
           modem-manager-gui
         ];
 
-
       #TODO: Write module
-      activation.statefulConfigSymlinks = config.lib.dag.entryAfter ["writeBoundary"] ''
-        set -eo pipefail
+      activation.statefulConfigSymlinks =
+        config.lib.dag.entryAfter [ "writeBoundary" ] ''
+          set -eo pipefail
 
-        STATEFUL_CONFS=(
-          ".config/spotify"
-          ".mozilla"
-          ".password-store"
-        )
-        for STATEFUL_CONF in ''${STATEFUL_CONFS[@]}; do
-          if [ -e "$STATEFUL_CONF" ] && [ ! -h "$STATEFUL_CONF" ]; then
-            echo "File $STATEFUL_CONF already exists, exiting!" >&2
-            exit 1
-          fi
+          STATEFUL_CONFS=(
+            ".config/spotify"
+            ".mozilla"
+            ".password-store"
+          )
+          for STATEFUL_CONF in ''${STATEFUL_CONFS[@]}; do
+            if [ -e "$STATEFUL_CONF" ] && [ ! -h "$STATEFUL_CONF" ]; then
+              echo "File $STATEFUL_CONF already exists, exiting!" >&2
+              exit 1
+            fi
 
-          if [ -h "$STATEFUL_CONF" ]; then
-            rm "$STATEFUL_CONF"
-          fi
+            if [ -h "$STATEFUL_CONF" ]; then
+              rm "$STATEFUL_CONF"
+            fi
 
-          $DRY_RUN_CMD ln -s $VERBOSE_ARG "$HOME/.stateful/$STATEFUL_CONF" "$HOME/$STATEFUL_CONF"
-        done
-      '';
+            $DRY_RUN_CMD ln -s $VERBOSE_ARG "$HOME/.stateful/$STATEFUL_CONF" "$HOME/$STATEFUL_CONF"
+          done
+        '';
     };
   };
 }
diff --git a/defaults/user-configuration/fhauser/applications/kanshi.nix b/defaults/user-configuration/fhauser/applications/kanshi.nix
index 47f86c1..67cf9f3 100644
--- a/defaults/user-configuration/fhauser/applications/kanshi.nix
+++ b/defaults/user-configuration/fhauser/applications/kanshi.nix
@@ -1,5 +1,5 @@
 { pkgs, lib, config, ... }: {
-#  home-manager.users.fhauser.systemd.user.services.kanshi.Install.WantedBy = "home-manager-fhauser.service"; # TODO: Upstream array type of systemdTarget
+  #  home-manager.users.fhauser.systemd.user.services.kanshi.Install.WantedBy = "home-manager-fhauser.service"; # TODO: Upstream array type of systemdTarget
   home-manager.users.fhauser.services.kanshi = {
     enable = true;
     profiles = let
diff --git a/hardware/thinkpad-t470s.nix b/hardware/thinkpad-t470s.nix
index e854056..23c1c83 100644
--- a/hardware/thinkpad-t470s.nix
+++ b/hardware/thinkpad-t470s.nix
@@ -10,7 +10,11 @@
   boot.initrd.availableKernelModules =
     [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.kernelModules = [ "kvm-intel" "qmi_wwan" ]; # TODO: qmi_wwan required?
-  environment.systemPackages = with pkgs; [ modemmanager libmbim libqmi ]; # TODO: this should not be required
+  environment.systemPackages = with pkgs; [
+    modemmanager
+    libmbim
+    libqmi
+  ]; # TODO: this should not be required
   # Ignore Realtek smartcard (gpg is not very smart)
   # See https://ludovicrousseau.blogspot.com/2015/12/remove-andor-customize-pcsc-reader-names.html
   systemd.services.pcscd.environment.PCSCLITE_FILTER_IGNORE_READER_NAMES =