From b1ca4fc2ef077d5c2f73232889fe0fa07e0e3ed6 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sat, 12 Apr 2025 23:55:23 -0400 Subject: [PATCH] Update cachix/git-hooks.nix --- .envrc | 5 ---- .gitignore | 1 - README.md | 2 +- default.nix | 13 --------- flake.lock | 84 +++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 30 ++++++++++++++++++- shell.nix | 13 --------- 7 files changed, 109 insertions(+), 39 deletions(-) delete mode 100644 .envrc delete mode 100644 default.nix delete mode 100644 shell.nix diff --git a/.envrc b/.envrc deleted file mode 100644 index d83cf80..0000000 --- a/.envrc +++ /dev/null @@ -1,5 +0,0 @@ -if has lorri; then - eval "$(lorri direnv)" -else - use nix -fi diff --git a/.gitignore b/.gitignore index 1c89332..6779e7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .pre-commit-config.yaml .vscode -git-crypt-key result diff --git a/README.md b/README.md index 56a6af1..544dd32 100644 --- a/README.md +++ b/README.md @@ -45,4 +45,4 @@ just clean ## Pre-commit hooks -Pre-commit hooks are automatically activated when [direnv](https://github.com/direnv/direnv) is installed. +Run `nix develop` to install the pre-commit hooks. diff --git a/default.nix b/default.nix deleted file mode 100644 index aa87fa5..0000000 --- a/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - nix-pre-commit-hooks = import ( - builtins.fetchTarball "https://github.com/cachix/git-hooks.nix/tarball/master" - ); -in -{ - pre-commit-check = nix-pre-commit-hooks.run { - src = ./.; - hooks = { - shellcheck.enable = true; - }; - }; -} diff --git a/flake.lock b/flake.lock index 7f657c6..b98ceec 100644 --- a/flake.lock +++ b/flake.lock @@ -257,6 +257,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -455,7 +471,7 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "stylix", "nixpkgs" @@ -498,6 +514,27 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "stylix", @@ -810,6 +847,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1743703532, "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", @@ -825,7 +878,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1743814133, "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", @@ -893,6 +946,26 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "darwin": "darwin", @@ -902,6 +975,7 @@ "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", + "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", "vpngate": "vpngate" } @@ -930,12 +1004,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -1075,7 +1149,7 @@ "vpngate": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1743991519, diff --git a/flake.nix b/flake.nix index 50ffe82..5dac3c6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*"; nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*"; + pre-commit-hooks.url = "github:cachix/git-hooks.nix"; darwin = { url = "github:lnl7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -21,6 +22,7 @@ outputs = { + self, darwin, fh, determinate, @@ -31,7 +33,31 @@ vpngate, ... }@inputs: + let + supportedSystems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + in { + checks = forAllSystems (system: { + pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { + src = ./.; + hooks = { + nixfmt-rfc-style.enable = true; + }; + }; + }); + devShells = forAllSystems (system: { + default = nixpkgs.legacyPackages.${system}.mkShell { + inherit (self.checks.${system}.pre-commit-check) shellHook; + buildInputs = self.checks.${system}.pre-commit-check.enabledPackages; + }; + }); nixosConfigurations = let unstable = import nixpkgs-unstable { @@ -68,7 +94,9 @@ "root" "dave" ]; - trusted-public-keys = [ "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08=" ]; + trusted-public-keys = [ + "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08=" + ]; }; registry = { nixpkgs.flake = nixpkgs; diff --git a/shell.nix b/shell.nix deleted file mode 100644 index d1441d9..0000000 --- a/shell.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11"; - pkgs = import nixpkgs { - config = { }; - overlays = [ ]; - }; - -in -pkgs.mkShell { - shellHook = '' - ${(import ./default.nix).pre-commit-check.shellHook} - ''; -}