ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-17 20:53:10 -04:00 committed by Alice Huston
parent cf7f67d401
commit d766dd28f3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flake.nix
View File

@ -329,11 +329,8 @@
packages = [ packages = [
self.formatter.${system} self.formatter.${system}
nixpkgs.legacyPackages.${system}.deadnix nixpkgs.legacyPackages.${system}.deadnix
<<<<<<< HEAD
nixpkgs.legacyPackages.${system}.treefmt nixpkgs.legacyPackages.${system}.treefmt
nixpkgs.legacyPackages.${system}.pre-commit nixpkgs.legacyPackages.${system}.pre-commit
=======
>>>>>>> 7502153 (fixes :))
]; ];
shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook; shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook;
} }