diff --git a/checks/default.nix b/checks/default.nix index 1a9f01f5..7f84cb02 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -1,9 +1,8 @@ inputs: let pkgs = inputs.unstable.legacyPackages.x86_64-linux; apkgs = inputs.alejandra.packages.x86_64-linux; - spkgs = inputs.statix.packages.x86_64-linux; - callPackage = pkgs.lib.callPackageWith (pkgs // apkgs // spkgs // {inherit (inputs) self;}); + callPackage = pkgs.lib.callPackageWith (pkgs // apkgs // {inherit (inputs) self;}); in { alejandra = callPackage ./alejandra.nix {}; statix = callPackage ./statix.nix {}; diff --git a/flake.lock b/flake.lock index c0f7c28d..168162e3 100644 --- a/flake.lock +++ b/flake.lock @@ -64,28 +64,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "statix", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1645251813, - "narHash": "sha256-cQ66tGjnZclBCS3nD26mZ5fUH+3/HnysGffBiWXUSHk=", - "owner": "nix-community", - "repo": "fenix", - "rev": "9892337b588c38ec59466a1c89befce464aae7f8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -147,27 +125,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "statix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1635165013, - "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -456,22 +413,6 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1645013224, - "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -531,7 +472,6 @@ "nixpkgs-insync": "nixpkgs-insync", "parts": "parts", "programsdb": "programsdb", - "statix": "statix", "unstable": "unstable" } }, @@ -552,23 +492,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1645205556, - "narHash": "sha256-e4lZW3qRyOEJ+vLKFQP7m2Dxh5P44NrnekZYLxlucww=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "acf5874b39f3dc5262317a6074d9fc7285081161", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -594,26 +517,6 @@ "type": "github" } }, - "statix": { - "inputs": { - "fenix": "fenix_2", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1673173471, - "narHash": "sha256-P+Y1vjr5uuuuK7vxDeRP0JfrbP3LV/COQ3/aWQTDLWo=", - "owner": "nerdypepper", - "repo": "statix", - "rev": "f0267dfb72971a074180b351c927573008c54b06", - "type": "github" - }, - "original": { - "owner": "nerdypepper", - "repo": "statix", - "type": "github" - } - }, "unstable": { "locked": { "lastModified": 1676721149, diff --git a/flake.nix b/flake.nix index c8dbe3a7..24084350 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,6 @@ nixos-vscode-server.url = "github:msteen/nixos-vscode-server"; - statix.url = "github:nerdypepper/statix"; alejandra.url = "github:kamadorueda/alejandra/3.0.0"; }; diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index d841c3f1..d2109666 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -1,8 +1,4 @@ -{ - self, - statix, - ... -}: { +{self, ...}: { config, pkgs, lib, diff --git a/lefthook.yml b/lefthook.yml index 58dc1709..f348a8b0 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -7,7 +7,7 @@ pre-commit: linting: glob: "*.nix" - run: nix run --option allow-import-from-derivation true --inputs-from . statix -- check + run: nix run --inputs-from . nixpkgs#statix -- check statix: parallel: false