diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix index 4651520..3cf7dc4 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -68,7 +68,7 @@ qmk ; inherit (nvim-flake.packages) neovim; - inherit (self.packages) lint; + inherit (self.packages) lint nixfmt; }; etc = { "jdks/17".source = "${pkgs.openjdk17}/bin"; diff --git a/lib/default.nix b/lib/default.nix index ae4de63..ac97d14 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -130,7 +130,7 @@ rec { callPackage = lib.callPackageWith ( pkgs // { - inherit inputs; + inputs = constructInputs' pkgs.stdenv.hostPlatform.system inputs; # maybe add self? # inherit self; # npins sources if i need them diff --git a/packages/lint/package.nix b/packages/lint/package.nix index 4eea355..2328a9c 100644 --- a/packages/lint/package.nix +++ b/packages/lint/package.nix @@ -1,6 +1,5 @@ { inputs, - nixfmt, writeShellApplication, deadnix, statix, @@ -10,11 +9,7 @@ writeShellApplication { name = "lint"; runtimeInputs = [ - (nixfmt.overrideAttrs { - version = "0.6.0-${inputs.nixfmt.shortRev}"; - - src = inputs.nixfmt; - }) + inputs.self.packages.nixfmt deadnix statix fd diff --git a/packages/nixfmt/package.nix b/packages/nixfmt/package.nix new file mode 100644 index 0000000..d9ac681 --- /dev/null +++ b/packages/nixfmt/package.nix @@ -0,0 +1,6 @@ +{inputs, nixfmt}: +(nixfmt.overrideAttrs { + version = "0.6.0-${inputs.nixfmt.shortRev}"; + + src = inputs.nixfmt; + })