Clean up formatting

defaults/hardware/thinkpad-x1-gen9.nix

@@ -5,19 +5,14 @@
     hardwareModules.lenovo-thinkpad-x1-9th-gen
   ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"
-    "ahci"
-    "usbhid"
-  ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "ahci" "usbhid" ];
   boot.kernelModules = [ "kvm-intel" ];
 
-  boot.initrd.kernelModules = [ "dm-snapshot" ]; # TODO: This should be moved to defaults
+  boot.initrd.kernelModules =
+    [ "dm-snapshot" ]; # TODO: This should be moved to defaults
 
-  environment.systemPackages = with pkgs; [
-    modemmanager
-    libmbim
-  ];
+  environment.systemPackages = with pkgs; [ modemmanager libmbim ];
 
   # CPU Configuration
   hardware.cpu.intel.updateMicrocode = true;

flake.nix

@@ -37,7 +37,7 @@
       in pkgs.runCommand "nixfmt-check" { } ''
         set -euo pipefail
         cd ${self}
-        ${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt --check {} +
+        ${self.apps.${system}.format.program} --check
         mkdir $out
       '';
 
@@ -91,7 +91,7 @@
         format = let
           pkgs = pkgsUnstable;
           formatter = pkgsUnstable.writeShellScriptBin "formatter" ''
-            ${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt {} +
+            ${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt $@ {} +
           '';
         in {
           type = "app";

host/ochsenchopf/filesystems.nix

@@ -1,10 +1,9 @@
 { config, pkgs, lib, ... }: {
 
-  boot.initrd.luks.devices = {
-    "luks".device = "/dev/disk/by-label/luks";
-  };
+  boot.initrd.luks.devices = { "luks".device = "/dev/disk/by-label/luks"; };
 
-  fileSystems = let rootdev = "/dev/disk/by-label/hv_ochsenchopf"; in {
+  fileSystems = let rootdev = "/dev/disk/by-label/hv_ochsenchopf";
+  in {
     "/" = {
       device = rootdev;
       fsType = "btrfs";