From a451e639747e32055d5e1631ec622200c8ee0aa2 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Sat, 23 Apr 2022 20:56:17 +0200
Subject: [PATCH] Clean up formatting

---
 defaults/hardware/thinkpad-x1-gen9.nix | 15 +++-----
 flake.nix                              |  4 +-
 home/fhauser/applications/default.nix  | 52 +++++++++++++-------------
 host/ochsenchopf/filesystems.nix       |  7 ++--
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/defaults/hardware/thinkpad-x1-gen9.nix b/defaults/hardware/thinkpad-x1-gen9.nix
index a44a11c..e6a4b72 100644
--- a/defaults/hardware/thinkpad-x1-gen9.nix
+++ b/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;
diff --git a/flake.nix b/flake.nix
index 38062fd..761388c 100644
--- a/flake.nix
+++ b/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";
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index 2049c3a..3f1c1f7 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -90,35 +90,35 @@
         modem-manager-gui
       ];
 
-      #TODO: Write module
-      activation.statefulConfigSymlinks =
-        config.lib.dag.entryAfter [ "writeBoundary" ] ''
-          set -eo pipefail
+    #TODO: Write module
+    activation.statefulConfigSymlinks =
+      config.lib.dag.entryAfter [ "writeBoundary" ] ''
+        set -eo pipefail
 
-          STATEFUL_ROOT="$HOME/.stateful"
-          if [ ! -d "$STATEFUL_ROOT" ]; then
-             $DRY_RUN_CMD mkdir "$STATEFUL_ROOT"
+        STATEFUL_ROOT="$HOME/.stateful"
+        if [ ! -d "$STATEFUL_ROOT" ]; then
+           $DRY_RUN_CMD mkdir "$STATEFUL_ROOT"
+        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
 
-          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
+            $DRY_RUN_CMD rm "$STATEFUL_CONF"
+          fi
 
-            if [ -h "$STATEFUL_CONF" ]; then
-              $DRY_RUN_CMD rm "$STATEFUL_CONF"
-            fi
-
-            STATEFUL_CONF_DIR="$STATEFUL_ROOT/$STATEFUL_CONF"
-            $DRY_RUN_CMD mkdir -p "$STATEFUL_CONF_DIR"
-            $DRY_RUN_CMD ln -s $VERBOSE_ARG "$STATEFUL_CONF_DIR" "$HOME/$STATEFUL_CONF"
-          done
-        '';
+          STATEFUL_CONF_DIR="$STATEFUL_ROOT/$STATEFUL_CONF"
+          $DRY_RUN_CMD mkdir -p "$STATEFUL_CONF_DIR"
+          $DRY_RUN_CMD ln -s $VERBOSE_ARG "$STATEFUL_CONF_DIR" "$HOME/$STATEFUL_CONF"
+        done
+      '';
   };
 }
diff --git a/host/ochsenchopf/filesystems.nix b/host/ochsenchopf/filesystems.nix
index bf7a4c0..7f07a6a 100644
--- a/host/ochsenchopf/filesystems.nix
+++ b/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";