Run treefmt on repo

Author: jhh

.pre-commit-config.yaml

@@ -2,13 +2,11 @@
 # See https://pre-commit.com/hooks.html for more hooks
 default_language_version:
   python: python3.12
-
 repos:
   - repo: https://github.com/asottile/add-trailing-comma
     rev: v3.1.0
     hooks:
       - id: add-trailing-comma
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -17,22 +15,19 @@ repos:
       - id: check-yaml
       - id: debug-statements
       - id: check-added-large-files
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.9.4
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
-
   - repo: https://github.com/adamchainz/django-upgrade
     rev: 1.22.2
     hooks:
       - id: django-upgrade
         args: [--target-version, "5.1"] # Replace with Django version
-
   - repo: https://github.com/adamchainz/djade-pre-commit
     rev: "1.3.2"
     hooks:
-    -   id: djade
-        args: [--target-version, "5.1"]  # Replace with Django version
+      - id: djade
+        args: [--target-version, "5.1"] # Replace with Django version

README.md

@@ -19,6 +19,7 @@ zcat strykeforce.sql.gz | psql -d strykeforce
 rclone -v sync s3://www.strykeforce.org/media/ ./media
 ./manage.py wagtail_update_image_renditions
 ```
+
 ## Server Management
 
 ```sh
@@ -31,7 +32,6 @@ $ nix registry add strykeforce-manage "github:strykeforce/strykeforce.org"
 $ nix run strykeforce-manage -- help
 ```
 
-
 ## Testing NixOS module in Container
 
 ```

deploy/configuration.nix

@@ -1,11 +1,15 @@
-{ modulesPath, pkgs, ... }: {
+{ modulesPath, pkgs, ... }:
+{
   imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
   ec2.hvm = true;
 
   services.getty.autologinUser = pkgs.lib.mkDefault "root";
 
   networking.hostName = "mercury";
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   systemd.services.amazon-init.enable = false;
 
@@ -19,7 +23,11 @@
     ];
   };
 
-  environment.systemPackages = with pkgs; [ bat htop vim ];
+  environment.systemPackages = with pkgs; [
+    bat
+    htop
+    vim
+  ];
   programs = {
     git.enable = true;
     vim.enable = true;

deploy/secrets.nix

@@ -6,6 +6,12 @@ let
 
 in
 {
-  "strykeforce_website_secrets.age".publicKeys = [ jeff mercury ];
-  "strykeforce_s3_secrets.age".publicKeys = [ jeff mercury ];
+  "strykeforce_website_secrets.age".publicKeys = [
+    jeff
+    mercury
+  ];
+  "strykeforce_s3_secrets.age".publicKeys = [
+    jeff
+    mercury
+  ];
 }

justfile

@@ -1,14 +1,14 @@
 # just manual: https://just.systems/man/en/
 
 _default:
-  @just --list
+    @just --list
 
 # bootstrap the development environment
 bootstrap: pre-commit
 
 # open the project in Pycharm
 edit:
-  pycharm .
+    pycharm .
 
 # run manage.py with command
 manage command:
@@ -32,7 +32,9 @@ test: (manage "test --keepdb")
 push:
     nix build --json .#venv | jq -r '.[].outputs | to_entries[].value' | cachix push strykeforce
     nix build --json .#static | jq -r '.[].outputs | to_entries[].value' | cachix push strykeforce
+
 #
+
 # update CSS
 update-css:
     npx @tailwindcss/cli --input=website/static/2767/base.css --output=website/static/2767/main.css

nix/formatter.nix

@@ -7,10 +7,19 @@ inputs.treefmt-nix.lib.mkWrapper pkgs {
   programs.mdformat.settings.number = true;
 
   programs.nixfmt.enable = true;
-  programs.stylua.enable = true;
+  programs.ruff-format.enable = true;
   programs.yamlfmt.enable = true;
+  programs.just.enable = true;
+  programs.jsonfmt.enable = true;
+  programs.taplo.enable = true;
 
   settings = {
-    global.excludes = [ "*.{age,gif,png,svg,env,envrc,gitignore,tmTheme,sublime-syntax,theme}" ];
+    global.excludes = [
+      "*.{age,gif,png,svg,env,envrc,gitignore,tmTheme,sublime-syntax,theme,pickle,toml}"
+      ".idea/*"
+      "website/static/*"
+      "website/templates/*"
+      ".python-version"
+    ];
   };
 }

pyproject.toml

@@ -33,9 +33,8 @@ dev = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.black]
+[tool.ruff]
 line-length = 99
-target-version = ['py312']
 
 [tool.isort]
 profile = "black"