hydra updates!

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-17 20:51:36 -04:00
parent 8426b9461a
commit 9bbee9da3e
2 changed files with 10 additions and 3 deletions
--- a/flake.nix
+++ b/flake.nix
@ -308,14 +308,12 @@
          packages = [
            self.formatter.${system}
            nixpkgs.legacyPackages.${system}.deadnix
-<<<<<<< HEAD
            nixpkgs.legacyPackages.${system}.treefmt
            nixpkgs.legacyPackages.${system}.pre-commit
-=======
->>>>>>> 7502153 (fixes :))
          ];
          shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook;
        }
      ) sops-nix.packages;
    };
+
 }