Merge branch 'treefmt'

bin/ci

@@ -47,7 +47,7 @@ if [ "${1}" = "update" ]; then
 		git add pull_requests
 		git commit -m 'watched: update watched pull requests'
 	fi
-	
+
 	for inp in $(nix flake metadata --json | jq -r '.locks.nodes.root.inputs | keys[] as $k | $k'); do
 		if ! git checkout -b "${ci_branch}_${inp}"; then
 			handle_co_fail "${ci_branch}_${inp}"
@@ -88,7 +88,6 @@ if [ "${1}" = "update" ]; then
 		exit 1
 	fi
 
-
 	if ! git checkout main; then
 		handle_co_fail
 		exit 1

bin/fmt

@@ -2,12 +2,4 @@
 
 set -e
 
-find . -name \*.nix -exec nix fmt {} \+
-find . -name \*.sh -exec shfmt -w {} \+
-
-deadnix -f .
-shfmt -w bin/deploy
-shfmt -w bin/mkboot
-# TODO: https://github.com/nerdypepper/statix/issues/68
-#statix check --ignore lib/default.nix .
-statix check .
+treefmt

bin/repair

@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/usr/bin/env bash
 
 while nix flake check --no-build |& grep "is not valid" >/tmp/invalid; do
 	path=$(cat /tmp/invalid | awk -F\' '{print $2}')

bin/update-openssh

@@ -20,15 +20,15 @@ CURRENT_COMMIT="$(echo $CURRENT | jq -r .rev)"
 if [ "${CURRENT_COMMIT}" != "${COMMIT}" ]; then
 	nix-prefetch-github openssh openssh-portable \
 		--rev "${COMMIT}" \
-		--json  | \
+		--json |
 		jq -r --arg v "${UPDATED}" \
-		--arg c "${COMMENT}" \
-		'. |= . + {"version": $v, "comment": $c}' \
-		> pkgs/openssh/version.json
+			--arg c "${COMMENT}" \
+			'. |= . + {"version": $v, "comment": $c}' \
+			>pkgs/openssh/version.json
 	FN=$(mktemp)
-	echo "pkgs/openssh: update to '${COMMIT}'" > ${FN}
-	echo >> ${FN}
-	echo "${COMMENT}" >> ${FN}
+	echo "pkgs/openssh: update to '${COMMIT}'" >${FN}
+	echo >>${FN}
+	echo "${COMMENT}" >>${FN}
 	git add pkgs/openssh/version.json && git commit -F $FN
 else
 	echo "No updates."

common.sh

@@ -56,7 +56,7 @@ resolveAlias() {
 agentHasKey() {
 	checkKey="$(echo $1 | awk '{print $NF}')"
 	for i in $AgentKeys; do
-		if [[ "$i" == $checkKey ]]; then
+		if [[ $i == $checkKey ]]; then
 			return 0
 		fi
 	done

lib/default.nix

@@ -101,6 +101,8 @@ let
         ssh-to-age
         ssh-to-pgp
         statix
+        treefmt2
+        perlPackages.PerlTidy
       ];
     };
 

pkgs/flake-warn.sh

@@ -9,10 +9,10 @@ NORMAL=$(tput sgr0)
 FLAKE_EPOCH=$(@nix@/bin/nix flake metadata --json | @jq@/bin/jq .lastModified)
 NOW_EPOCH=$(@coreutils@/bin/date +"%s")
 
-EPOCH_DIFF=$(($NOW_EPOCH - $FLAKE_EPOCH))
+EPOCH_DIFF=$((NOW_EPOCH - FLAKE_EPOCH))
 
 if [ $EPOCH_DIFF -gt $((60480 * 5)) ]; then
 	echo
-	echo "${BOLD}WARNING: inputs haven't been updated in $(($EPOCH_DIFF / 86400)) days!${NORMAL}"
+	echo "${BOLD}WARNING: inputs haven't been updated in $((EPOCH_DIFF / 86400)) days!${NORMAL}"
 	echo
 fi

templates/mojo/thing.pl

@@ -8,7 +8,7 @@ use 5.10.0;
 use Mojolicious::Lite -signatures;
 
 get '/' => sub ($c) {
-  $c->render(text => 'Hello Thing!');
+    $c->render( text => 'Hello Thing!' );
 };
 
 app->start;

treefmt.toml

@@ -0,0 +1,28 @@
+[formatter.statix]
+command = "statix"
+options = ["check"]
+priority = 1
+
+[formatter.deadnix]
+command = "deadnix"
+options = ["-f"]
+includes = [ "*.nix" ]
+priority = 2
+
+[formatter.nix]
+command = "nix"
+options = ["fmt"]
+includes = ["*.nix"]
+priority = 3
+
+[formatter.shfmt]
+command = "shfmt"
+options = ["-w"]
+includes = ["*.sh", "bin/*"]
+priority = 1
+
+[formatter.perltidy]
+command = "perltidy"
+options = ["-b"]
+includes = ["*.pl", "*.PL"]
+priority = 1