Use nixfmt-rfc-style instead of alejandra

deployments.nix

@@ -1,4 +1,5 @@
-{self, ...}: let
+{ self, ... }:
+let
   inherit (self.inputs) deploy-rs;
 
   x86 = {
@@ -27,12 +28,13 @@
       };
     };
   };
-in {
+in
+{
   flake = {
     deploy.nodes = x86 // aarch64;
     checks = {
-      x86_64-linux = deploy-rs.lib.x86_64-linux.deployChecks {nodes = x86;};
-      aarch64-linux = deploy-rs.lib.aarch64-linux.deployChecks {nodes = aarch64;};
+      x86_64-linux = deploy-rs.lib.x86_64-linux.deployChecks { nodes = x86; };
+      aarch64-linux = deploy-rs.lib.aarch64-linux.deployChecks { nodes = aarch64; };
     };
   };
 }

devshell.nix

@@ -1,13 +1,15 @@
 {
-  perSystem = {pkgs, ...}: {
-    devShells.default = pkgs.mkShell {
-      name = "snowflake";
-      packages = with pkgs; [
-        sops
-        ssh-to-age
-        gnupg
-        deploy-rs
-      ];
+  perSystem =
+    { pkgs, ... }:
+    {
+      devShells.default = pkgs.mkShell {
+        name = "snowflake";
+        packages = with pkgs; [
+          sops
+          ssh-to-age
+          gnupg
+          deploy-rs
+        ];
+      };
     };
-  };
 }

disko/hetzner-block-storage.nix

@@ -1,8 +1,5 @@
+{ id, mountpoint, ... }:
 {
-  id,
-  mountpoint,
-  ...
-}: {
   disko.devices.disk = {
     # hetzner block storage, must be attached from cloud gui
     block = {

disko/hetzner-osdisk.nix

@@ -1,4 +1,5 @@
-{pci, ...}: {
+{ pci, ... }:
+{
   disko.devices.disk = {
     sda = {
       device = "/dev/disk/by-path/pci-${pci}-scsi-0:0:0:0";

flake.nix

@@ -110,8 +110,9 @@
     };
   };
 
-  outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} {
+  outputs =
+    inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -126,31 +127,33 @@
         ./deployments.nix
       ];
 
-      perSystem = {
-        pkgs,
-        config,
-        ...
-      }: {
-        packages = {
-          rpi_export = pkgs.callPackage ./pkgs/rpi_export {};
-          headscale-alpha = pkgs.callPackage ./pkgs/headscale {};
-          actual-server = pkgs.callPackage ./pkgs/actual-server {};
-        };
-
-        treefmt.config = {
-          inherit (config.flake-root) projectRootFile;
-          programs = {
-            alejandra.enable = true;
-            deadnix.enable = true;
-            statix.enable = true;
-            shellcheck.enable = true;
-            ormolu.enable = true;
-            jsonfmt.enable = true;
+      perSystem =
+        { pkgs, config, ... }:
+        {
+          packages = {
+            rpi_export = pkgs.callPackage ./pkgs/rpi_export { };
+            headscale-alpha = pkgs.callPackage ./pkgs/headscale { };
+            actual-server = pkgs.callPackage ./pkgs/actual-server { };
           };
-          settings.formatter.ormolu = {
-            options = ["--ghc-opt" "-XImportQualifiedPost"];
+
+          treefmt.config = {
+            inherit (config.flake-root) projectRootFile;
+            programs = {
+              nixfmt.enable = true;
+              nixfmt.package = pkgs.nixfmt-rfc-style; # rfc-166 formatting conform version
+              deadnix.enable = true;
+              statix.enable = true;
+              shellcheck.enable = true;
+              ormolu.enable = true;
+              jsonfmt.enable = true;
+            };
+            settings.formatter.ormolu = {
+              options = [
+                "--ghc-opt"
+                "-XImportQualifiedPost"
+              ];
+            };
           };
         };
-      };
     };
 }

githubMatrix.nix

@@ -1,4 +1,5 @@
-{self, ...}: {
+{ self, ... }:
+{
   flake.githubActions.matrix = {
     host = builtins.attrNames self.nixosConfigurations;
   };

home-modules/common.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.stateVersion = "23.11";
   programs.home-manager.enable = true;
   nixpkgs.config.allowUnfree = true;

home-modules/discord.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     (discord.override {
       withOpenASAR = false;

home-modules/easyeffects/default.nix

@@ -1,7 +1,6 @@
-{pkgs, ...}: {
-  imports = [
-    ./preset.nix
-  ];
+{ pkgs, ... }:
+{
+  imports = [ ./preset.nix ];
 
   services.easyeffects = {
     enable = true;

home-modules/easyeffects/preset.nix

@@ -1,57 +1,55 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
+{ lib, config, ... }:
+with lib;
+let
   cfg = config.services.easyeffects;
-in {
+in
+{
   options = {
     services.easyeffects.presets = mkOption {
-      type = types.listOf (types.submodule {
-        options = {
-          device = mkOption {
-            type = types.str;
-          };
-          type = mkOption {
-            type = types.enum ["input" "output"];
-          };
-          profile = mkOption {
-            type = types.str;
-          };
-          file = mkOption {
-            type = types.path;
-          };
-          description = mkOption {
-            type = types.str;
-            default = "Created by Home Manager";
+      type = types.listOf (
+        types.submodule {
+          options = {
+            device = mkOption { type = types.str; };
+            type = mkOption {
+              type = types.enum [
+                "input"
+                "output"
+              ];
+            };
+            profile = mkOption { type = types.str; };
+            file = mkOption { type = types.path; };
+            description = mkOption {
+              type = types.str;
+              default = "Created by Home Manager";
+            };
           };
-        };
-      });
+        }
+      );
     };
   };
   config = {
     xdg.configFile = lib.mergeAttrsList (
-      map ({
-        device,
-        type,
-        profile,
-        file,
-        description,
-      }: let
-        name = builtins.head (lib.splitString "." (builtins.baseNameOf file));
-      in {
-        "easyeffects/${type}/${name}.json".source = file;
-        "easyeffects/autoload/${type}/${device}.json".text =
-          builtins.toJSON
-          {
+      map (
+        {
+          device,
+          type,
+          profile,
+          file,
+          description,
+        }:
+        let
+          name = builtins.head (lib.splitString "." (builtins.baseNameOf file));
+        in
+        {
+          "easyeffects/${type}/${name}.json".source = file;
+          "easyeffects/autoload/${type}/${device}.json".text = builtins.toJSON {
             inherit device;
             device-description = description;
             device-profile = profile;
             preset-name = name;
           };
-      })
-      cfg.presets
+        }
+      ) cfg.presets
     );
   };
 }

home-modules/flameshot.nix

@@ -1,4 +1,5 @@
-{user, ...}: {
+{ user, ... }:
+{
   services = {
     flameshot = {
       enable = true;

home-modules/gaming.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     prismlauncher
     mangohud

home-modules/git.nix

@@ -1,9 +1,6 @@
+{ pkgs, user, ... }:
 {
-  pkgs,
-  user,
-  ...
-}: {
-  home.packages = [pkgs.git-absorb];
+  home.packages = [ pkgs.git-absorb ];
 
   programs.git = {
     enable = true;

home-modules/gpg.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.gpg = {
     enable = true;
 

home-modules/gtk.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home = {
     pointerCursor = {
       package = pkgs.phinger-cursors;

home-modules/mpv.nix

@@ -1,9 +1,8 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.mpv = {
     enable = true;
-    scripts = with pkgs.mpvScripts; [
-      thumbfast
-    ];
+    scripts = with pkgs.mpvScripts; [ thumbfast ];
     config = {
       loop-file = "inf";
     };