Skip to content

Commit

Permalink
fix alejandra
Browse files Browse the repository at this point in the history
  • Loading branch information
number5 committed Aug 23, 2024
1 parent 12dd6cd commit f1fd6c0
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 136 deletions.
4 changes: 2 additions & 2 deletions checks/alejandra.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
runCommand,
alejandra,
pkgs,
self,
}:
runCommand "alejandra-run-${self.rev or "00000000"}" {} ''
${alejandra}/bin/alejandra --check ${self} < /dev/null | tee $out
${pkgs.alejandra}/bin/alejandra --check ${self} < /dev/null | tee $out
''
4 changes: 1 addition & 3 deletions checks/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
inputs: let
pkgs = inputs.unstable.legacyPackages.x86_64-linux;
apkgs = inputs.alejandra.packages.x86_64-linux;

callPackage = pkgs.lib.callPackageWith (pkgs // apkgs // {inherit (inputs) self;});
callPackage = pkgs.lib.callPackageWith (pkgs // {inherit (inputs) self;});
in {
alejandra = callPackage ./alejandra.nix {};
statix = callPackage ./statix.nix {};
}
125 changes: 16 additions & 109 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

nixd.url = "github:nix-community/nixd";
nuenv.url = "github:DeterminateSystems/nuenv";
alejandra.url = "github:kamadorueda/alejandra/3.0.0";

# Neovim
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
Expand Down Expand Up @@ -92,7 +91,7 @@
./nixos/configurations
./home/configurations

./packages
# ./packages
];

flake = {
Expand Down
2 changes: 2 additions & 0 deletions home/configurations/bruce_at_chestnut.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
config = {
# display.enable = true;

modules.eww.enable = true;

home.packages = builtins.attrValues {
inherit (pkgs) neovim;
};
Expand Down
17 changes: 0 additions & 17 deletions packages/default.nix

This file was deleted.

5 changes: 2 additions & 3 deletions parts/auxiliary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
system,
...
}: {
formatter = self.packages.${system}.alejandra;
formatter = pkgs.alejandra;

apps.rotate.program = let
sopsrotate = pkgs.writeShellScript "sops-rotate" ''
Expand All @@ -30,8 +30,7 @@

devShells.default = pkgs.mkShell {
packages = builtins.attrValues {
inherit (self'.packages) alejandra;
inherit (inputs'.unstable.legacyPackages) npins sops age ssh-to-age;
inherit (inputs'.unstable.legacyPackages) npins sops age ssh-to-age alejandra;
};
};
};
Expand Down

0 comments on commit f1fd6c0

Please sign in to comment.