Add nixpkgs-fmt pre-commit hook

This commit is contained in:
Dave Gallant
2021-05-30 23:00:39 -04:00
parent 8498968acc
commit 9092b371fe
9 changed files with 81 additions and 60 deletions

View File

@@ -13,54 +13,56 @@
};
outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware }: {
nixosConfigurations = let
defaultModules = [
home-manager.nixosModules.home-manager
./main/desktop.nix
./main/fonts.nix
./main/general.nix
./main/kernel.nix
./main/netdata/default.nix
./main/networking.nix
./main/packages.nix
./main/printing.nix
nixosConfigurations =
let
defaultModules = [
home-manager.nixosModules.home-manager
./main/desktop.nix
./main/fonts.nix
./main/general.nix
./main/kernel.nix
./main/netdata/default.nix
./main/networking.nix
./main/packages.nix
./main/printing.nix
({ config, lib, lib', ... }: {
config = {
_module.args = {
lib' = lib // import ./lib { inherit config lib; };
({ config, lib, lib', ... }: {
config = {
_module.args = {
lib' = lib // import ./lib { inherit config lib; };
};
nix = {
autoOptimiseStore = true;
binaryCaches = [ "https://davegallant.cachix.org" ];
binaryCachePublicKeys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
useSandbox = false;
registry = { nixpkgs.flake = nixpkgs; };
trustedUsers = [ "root" "dave" ];
};
nixpkgs.overlays = [ (import ./overlays) ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [ ./home/default.nix ];
};
};
nix = {
autoOptimiseStore = true;
binaryCaches = [ "https://davegallant.cachix.org" ];
binaryCachePublicKeys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
useSandbox = false;
registry = { nixpkgs.flake = nixpkgs; };
trustedUsers = [ "root" "dave" ];
};
nixpkgs.overlays = [ (import ./overlays) ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [ ./home/default.nix ];
};
};
})
];
in {
hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./machines/hephaestus/configuration.nix
./machines/hephaestus/hardware.nix
] ++ defaultModules;
})
];
in
{
hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./machines/hephaestus/configuration.nix
./machines/hephaestus/hardware.nix
] ++ defaultModules;
};
};
};
darwinConfigurations = {
demeter = darwin.lib.darwinSystem {
modules = [