Add nix pre-commit hooks and clean up a few other things

Author: jhh

.envrc

@@ -3,6 +3,7 @@
 
 # Automatically reload when this file changes
 watch_file nix/devshell.nix
+watch_file nix/checks/pre-commit.nix
 
 # Load `nix develop`
 use flake

.gitignore

@@ -196,3 +196,4 @@ strykeforce.sql.gz
 /image_renditions
 .nixos-test-history
 .envrc.local
+.pre-commit-config.yaml

.pre-commit-config.yaml

@@ -14,6 +14,9 @@
     nixos-generators.url = "github:nix-community/nixos-generators";
     nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
 
+    pre-commit-hooks.url = "github:cachix/git-hooks.nix";
+    pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
+
     pyproject-nix.url = "github:nix-community/pyproject.nix";
     pyproject-nix.inputs.nixpkgs.follows = "nixpkgs";
 

flake.lock

@@ -0,0 +1,56 @@
+{
+  flake,
+  inputs,
+  pkgs,
+  system,
+  ...
+}:
+inputs.pre-commit-hooks.lib.${system}.run {
+  src = ../../.;
+  hooks =
+    let
+      pythonSet = flake.lib.pythonSets pkgs;
+      venv = pythonSet.mkVirtualEnv "pre-commit-env" {
+        website = [ "pre-commit" ];
+      };
+    in
+    {
+      nixfmt-rfc-style.enable = true;
+      ruff.enable = true;
+      ruff-format.enable = true;
+      ruff-format.after = [ "ruff" ];
+      trim-trailing-whitespace.enable = true;
+      end-of-file-fixer.enable = true;
+      check-yaml.enable = true;
+      check-added-large-files.enable = true;
+      check-added-large-files.args = [ "--maxkb=25" ];
+      check-case-conflicts.enable = true;
+      check-json.enable = true;
+      check-toml.enable = true;
+      check-merge-conflicts.enable = true;
+      check-symlinks.enable = true;
+      pyupgrade.enable = true;
+      pyupgrade.args = [ "--py312-plus" ];
+      add-trailing-comma = {
+        enable = true;
+        name = "add-trailing-comma";
+        description = "Automatically add trailing commas to calls and literals.";
+        entry = "${venv}/bin/add-trailing-comma";
+        types = [ "python" ];
+      };
+      djade = {
+        enable = true;
+        name = "djade";
+        description = "A Django template formatter.";
+        entry = "${venv}/bin/djade";
+        types = [ "html" ];
+      };
+      django-upgrade = {
+        enable = true;
+        name = "django-upgrade";
+        description = "Automatically upgrade your Django project code.";
+        entry = "${venv}/bin/django-upgrade --target-version=5.2";
+        types = [ "python" ];
+      };
+    };
+}

flake.nix

@@ -1,30 +1,40 @@
 {
   flake,
+  inputs,
   perSystem,
   pkgs,
+  system,
 }:
+let
+  pythonSet = flake.lib.pythonSets pkgs;
+  inherit (inputs.self.checks.${system}) pre-commit;
+in
 pkgs.mkShell {
-  packages = with pkgs; [
-    (flake.lib.python pkgs)
-    cachix
-    just
-    nil
-    nix-output-monitor
-    nixfmt-rfc-style
-    nodejs
-    postgresql.dev
-    pre-commit
-    tailwindcss
-    perSystem.uv2nix.uv-bin
-    perSystem.agenix.agenix
-    watchman
-  ];
+  packages =
+    with pkgs;
+    [
+      pythonSet.python
+      cachix
+      just
+      nil
+      nix-output-monitor
+      nixfmt-rfc-style
+      nodejs
+      postgresql.dev
+      pre-commit
+      tailwindcss
+      perSystem.uv2nix.uv-bin
+      perSystem.agenix.agenix
+      watchman
+    ]
+    ++ pre-commit.enabledPackages;
 
   env = {
     UV_PYTHON_DOWNLOADS = "never";
   };
 
   shellHook = ''
     unset PYTHONPATH
+    ${pre-commit.shellHook}
   '';
 }

nix/checks/pre-commit.nix

@@ -6,13 +6,11 @@ let
     sourcePreference = "wheel";
   };
 
-  python = pkgs: pkgs.python312;
-
   pythonSets =
     pkgs:
     let
       baseSet = pkgs.callPackage inputs.pyproject-nix.build.packages {
-        python = python pkgs;
+        python = pkgs.python312;
         stdenv = pkgs.stdenv.override {
           targetPlatform = pkgs.stdenv.targetPlatform // {
             # allow downloading of opencv-python wheel
@@ -24,9 +22,6 @@ let
       pillowHeifOverrides = import ./overrides/overrides-pillow-heif.nix { inherit pkgs; };
       psycopgOverrides = import ./overrides/overrides-psycopg.nix { inherit pkgs; };
       opencvOverrides = import ./overrides/overrides-opencv.nix { inherit pkgs; };
-      strykeforceOverrides = import ./overrides/overrides-strykeforce.nix {
-        inherit flake pkgs workspace;
-      };
       tbaApiOverrides = import ./overrides/overrides-tba-api-v3client.nix { inherit pkgs; };
     in
     baseSet.overrideScope (
@@ -36,7 +31,6 @@ let
         pillowHeifOverrides
         psycopgOverrides
         opencvOverrides
-        strykeforceOverrides
         tbaApiOverrides
       ]
     );
@@ -45,7 +39,6 @@ in
 
   inherit
     overlay
-    python
     pythonSets
     workspace
     ;

nix/devshell.nix

@@ -28,6 +28,11 @@ dev = [
     "ipython>=8.31.0",
     "rich>=13.9.4",
 ]
+pre-commit = [
+    "add-trailing-comma>=3.1.0",
+    "djade>=1.3.2",
+    "django-upgrade>=1.23.1",
+]
 
 [build-system]
 requires = ["hatchling"]