Merge pull request #94 from akirak/nixfmt-rfc-style

Reformat the code with nixfmt-rfc-style

.github/workflows/lint.yml

@@ -1,5 +1,5 @@
-name: Lint via pre-commit-hooks
 
+name: Format check and linting
 on:
   pull_request:
   workflow_dispatch:

dev/flake.nix

@@ -2,41 +2,42 @@
   inputs = {
     # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     systems.url = "github:nix-systems/default";
-    pre-commit-hooks.url = "github:cachix/git-hooks.nix";
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # To be overridden during execution
     src.url = "github:akirak/flake-templates";
   };
 
-  outputs = {
-    self,
-    systems,
-    nixpkgs,
-    pre-commit-hooks,
-    ...
-  } @ inputs: let
-    eachSystem = nixpkgs.lib.genAttrs (import systems);
-  in {
-    packages = eachSystem (system: {
-      update-beam = nixpkgs.legacyPackages.${system}.callPackage ./update-beam.nix {};
-    });
+  outputs =
+    {
+      self,
+      systems,
+      nixpkgs,
+      treefmt-nix,
+      ...
+    }@inputs:
+    let
+      eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
 
-    checks = eachSystem (system: {
-      pre-commit-check = pre-commit-hooks.lib.${system}.run {
-        src = inputs.src.outPath;
-        hooks = {
-          actionlint.enable = true;
-          alejandra.enable = true;
-          markdownlint.enable = true;
-        };
-      };
-    });
+      treefmtEval = eachSystem (
+        pkgs:
+        treefmt-nix.lib.evalModule pkgs {
+          projectRootFile = "flake.nix";
+          programs.nixfmt-rfc-style.enable = true;
+        }
+      );
+    in
+    {
+      packages = eachSystem (pkgs: {
+        update-beam = nixpkgs.legacyPackages.${pkgs.system}.callPackage ./update-beam.nix { };
+      });
 
-    devShells = eachSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      default = pkgs.mkShell {
-        inherit (self.checks.${system}.pre-commit-check) shellHook;
-      };
-    });
-  };
+      formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
+
+      checks = eachSystem (pkgs: {
+        formatting = treefmtEval.${pkgs.system}.config.build.check self;
+      });
+    };
 }

dev/update-beam.nix

@@ -1,22 +1,33 @@
 /*
-This script helps the user keep Erlang (erlangRxx) and Elixir (elixir_x_xx)
-to their latest versions. It performs simple regexp substitutions in flake.nix.
+  This script helps the user keep Erlang (erlangRxx) and Elixir (elixir_x_xx)
+  to their latest versions. It performs simple regexp substitutions in flake.nix.
 */
 {
   lib,
   beam,
   writeText,
   writeShellScript,
-}: let
-  inherit (builtins) attrNames filter match sort head compareVersions;
+}:
+let
+  inherit (builtins)
+    attrNames
+    filter
+    match
+    sort
+    head
+    compareVersions
+    ;
 
-  latestPackageMatching = pattern: attrs:
+  latestPackageMatching =
+    pattern: attrs:
     lib.pipe attrs [
       (lib.filterAttrs (name: _: match pattern name != null))
-      (lib.mapAttrsToList (name: value: {
-        inherit name;
-        inherit (value) version;
-      }))
+      (lib.mapAttrsToList (
+        name: value: {
+          inherit name;
+          inherit (value) version;
+        }
+      ))
       (sort (a: b: compareVersions a.version b.version > 0))
       (elems: builtins.elemAt elems 1)
       (x: x.name)
@@ -35,14 +46,14 @@ to their latest versions. It performs simple regexp substitutions in flake.nix.
     s/${elixirRegex}/${latestElixir}/
   '';
 in
-  writeShellScript "update-beam" ''
-    git add .
-    find -name flake.nix | xargs sed -i -r -f ${sed}
+writeShellScript "update-beam" ''
+  git add .
+  find -name flake.nix | xargs sed -i -r -f ${sed}
 
-    if git diff --exit-code
-    then
-      exit 1
-    else
-      git add .
-    fi
-  ''
+  if git diff --exit-code
+  then
+    exit 1
+  else
+    git add .
+  fi
+''