diff --git a/.gitignore b/.gitignore index bc3b901..dbde18b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ result -.pre-commit-config.yaml *.qcow2 *.fd diff --git a/flake.lock b/flake.lock index 5bb59b4..e66e6a8 100644 --- a/flake.lock +++ b/flake.lock @@ -81,22 +81,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -149,27 +133,6 @@ "type": "github" } }, - "gitignore": { - "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" - } - }, "hjem": { "inputs": { "nix-darwin": [ @@ -483,9 +446,7 @@ "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ], + "pre-commit-hooks": [], "utils": "utils" }, "locked": { @@ -502,28 +463,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "pyproject-nix": { "inputs": { "nixpkgs": [ @@ -582,7 +521,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "podcasts": "podcasts", - "pre-commit-hooks": "pre-commit-hooks", "qbpm": "qbpm", "srcery-textmate": "srcery-textmate", "srvos": "srvos", @@ -770,9 +708,7 @@ "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ] + "pre-commit-hooks": [] }, "locked": { "lastModified": 1683782062, diff --git a/flake.nix b/flake.nix index 829f896..9033f0d 100644 --- a/flake.nix +++ b/flake.nix @@ -25,8 +25,6 @@ agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.home-manager.follows = ""; - pre-commit-hooks.url = "github:cachix/git-hooks.nix"; - pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; niri.url = "github:sodiboo/niri-flake"; niri.inputs.nixpkgs.follows = "nixpkgs"; @@ -36,10 +34,10 @@ qbpm.inputs.nixpkgs.follows = "nixpkgs"; podcasts.url = "github:pvsr/podcasts"; podcasts.inputs.nixpkgs.follows = "nixpkgs"; - podcasts.inputs.pre-commit-hooks.follows = "pre-commit-hooks"; + podcasts.inputs.pre-commit-hooks.follows = ""; weather.url = "github:pvsr/weather"; weather.inputs.nixpkgs.follows = "nixpkgs"; - weather.inputs.pre-commit-hooks.follows = "pre-commit-hooks"; + weather.inputs.pre-commit-hooks.follows = ""; srcery-textmate.url = "github:srcery-colors/srcery-textmate"; srcery-textmate.flake = false; diff --git a/modules/flake/default.nix b/modules/flake/default.nix index 5cc9012..d8bf418 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -2,7 +2,6 @@ { imports = [ inputs.flake-parts.flakeModules.modules - inputs.pre-commit-hooks.flakeModule ]; perSystem = { @@ -13,14 +12,7 @@ }: { formatter = pkgs.nixfmt-tree; - pre-commit = { - settings.hooks.treefmt = { - enable = true; - stages = [ "pre-push" ]; - }; - }; devShells.default = pkgs.mkShell { - inputsFrom = [ config.pre-commit.devShell ]; packages = [ pkgs.nixfmt pkgs.nixfmt-tree