From aa4a11c0c3ac84acb8b28eb82771120b0c0a38ce Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sat, 8 Feb 2025 18:06:10 -0500
Subject: [PATCH] set up treefmt action

---
 .github/workflows/build_systems.yml    |  2 --
 .github/workflows/treefmt.yml          | 15 +++++++++++++++
 .vscode/settings.json                  |  1 +
 systems/jeeves/runners/nix_builder.nix |  2 ++
 users/richie/home/programs.nix         |  1 +
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/treefmt.yml

diff --git a/.github/workflows/build_systems.yml b/.github/workflows/build_systems.yml
index ab39c82..98cad34 100644
--- a/.github/workflows/build_systems.yml
+++ b/.github/workflows/build_systems.yml
@@ -20,6 +20,4 @@ jobs:
       - name: Build default package
         run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
       - name: copy to nix-cache
-        env:
-          NIX_SSHOPTS: "-vvvv"
         run: nix copy --to ssh://jeeves .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel
diff --git a/.github/workflows/treefmt.yml b/.github/workflows/treefmt.yml
new file mode 100644
index 0000000..ea7a9da
--- /dev/null
+++ b/.github/workflows/treefmt.yml
@@ -0,0 +1,15 @@
+name: build_systems
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    name: nix fmt
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build default package
+        run: "treefmt --ci"
diff --git a/.vscode/settings.json b/.vscode/settings.json
index dc7e8a9..78531e1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -241,6 +241,7 @@
     "topsites",
     "topstories",
     "torrenting",
+    "treefmt",
     "twimg",
     "uaccess",
     "ublock",
diff --git a/systems/jeeves/runners/nix_builder.nix b/systems/jeeves/runners/nix_builder.nix
index 739b704..53c3d69 100644
--- a/systems/jeeves/runners/nix_builder.nix
+++ b/systems/jeeves/runners/nix_builder.nix
@@ -79,8 +79,10 @@ in
             user = "github-runners";
             group = "github-runners";
             extraPackages = with pkgs; [
+              nixfmt-rfc-style
               nixos-rebuild
               openssh
+              treefmt
             ];
           };
           users = {
diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix
index 9e21dd8..68a43b9 100644
--- a/users/richie/home/programs.nix
+++ b/users/richie/home/programs.nix
@@ -51,6 +51,7 @@
     nix-prefetch
     nix-tree
     nixfmt-rfc-style
+    treefmt
     inputs.system_tools.packages.x86_64-linux.default
   ];
 }