Add alejandra

This commit is contained in:
Dave Gallant
2022-05-28 10:30:29 -04:00
parent 80e7729ab4
commit d2aaa3920f
31 changed files with 334 additions and 323 deletions

121
flake.nix
View File

@@ -19,76 +19,90 @@
};
};
outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware, ... }@inputs: {
outputs = {
self,
darwin,
home-manager,
nixpkgs,
nixos-hardware,
...
} @ inputs: {
nixosConfigurations = let
defaultModules = [
home-manager.nixosModules.home-manager
./common/desktop.nix
./common/fonts.nix
./common/linux.nix
./common/networking.nix
./common/packages.nix
./common/printing.nix
nixosConfigurations =
let
defaultModules = [
home-manager.nixosModules.home-manager
./common/desktop.nix
./common/fonts.nix
./common/linux.nix
./common/netdata/default.nix
./common/networking.nix
./common/packages.nix
./common/printing.nix
./services/netdata/default.nix
./services/keyleds/default.nix
({ config, lib, lib', ... }: {
config = {
_module.args = {
lib' = lib // import ./lib { inherit config lib; };
};
nix = {
settings = {
auto-optimise-store = true;
sandbox = false;
substituters = [ "https://davegallant.cachix.org" ];
trusted-users = [ "root" "dave" ];
trusted-public-keys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
};
registry = { nixpkgs.flake = nixpkgs; };
};
nixpkgs.overlays = [
(import ./modules/overlays)
inputs.neovim-nightly-overlay.overlay
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [ ./home/default.nix ];
};
({
config,
lib,
lib',
...
}: {
config = {
_module.args = {
lib' = lib // import ./lib {inherit config lib;};
};
})
];
in
{
hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
nix = {
settings = {
auto-optimise-store = true;
sandbox = false;
substituters = ["https://davegallant.cachix.org"];
trusted-users = ["root" "dave"];
trusted-public-keys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
};
registry = {nixpkgs.flake = nixpkgs;};
};
nixpkgs.overlays = [
(import ./modules/overlays)
inputs.neovim-nightly-overlay.overlay
];
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;
};
]
++ defaultModules;
};
};
darwinConfigurations = {
demeter = darwin.lib.darwinSystem {
system = "x86_64-darwin";
modules = [
home-manager.darwinModules.home-manager
./common/darwin.nix
./common/packages.nix
./machines/demeter/configuration.nix
./modules/darwin/default.nix
({ config, ... }: {
({config, ...}: {
config = {
nixpkgs.overlays = [
inputs.neovim-nightly-overlay.overlay
@@ -97,7 +111,7 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [ ./home/default.nix ];
users.dave.imports = [./home/default.nix];
};
};
})
@@ -106,4 +120,3 @@
};
};
}