Compare commits

..

No commits in common. "d613dee36414595ce3f49c72a0d546d086a7e027" and "0e5ebb37f1ce8f93dd7316156567094f1aba788b" have entirely different histories.

3 changed files with 29 additions and 9 deletions

View file

@ -91,9 +91,15 @@
util = import ./util {inherit inputs;}; util = import ./util {inherit inputs;};
forEachPkgs = util.forEachPkgs; forEachPkgs = util.forEachPkgs;
mkNixosInstaller = util.mkNixosInstaller;
mkNixosSystem = util.mkNixosSystem; mkNixosSystem = util.mkNixosSystem;
mkDarwinSystem = util.mkDarwinSystem; mkDarwinSystem = util.mkDarwinSystem;
mkHome = util.mkHome; mkHome = util.mkHome;
syncthingConfiguration = util.syncthingConfiguration;
installerSystems = {
basic = mkNixosInstaller "basic" [];
};
nixosSystems = { nixosSystems = {
horizon = mkNixosSystem "horizon"; horizon = mkNixosSystem "horizon";
@ -164,10 +170,14 @@
}; };
}); });
installerConfigurations = installerSystems;
nixosConfigurations = nixosSystems; nixosConfigurations = nixosSystems;
darwinConfigurations = darwinSystems; darwinConfigurations = darwinSystems;
homeConfigurations = homeConfigurations; homeConfigurations = homeConfigurations;
syncthingConfiguration = syncthingConfiguration;
}; };
} }

View file

@ -1,7 +1,7 @@
{ {
config, config,
lib, lib,
syncthingConfiguration, outputs,
... ...
}: let }: let
mountDir = "/mnt/sync"; mountDir = "/mnt/sync";
@ -27,7 +27,7 @@ in {
configDir = configDir; configDir = configDir;
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
configuration = syncthingConfiguration; configuration = outputs.syncthingConfiguration;
deviceName = config.networking.hostName; deviceName = config.networking.hostName;
}; };
} }

View file

@ -52,12 +52,6 @@
home-manager-config home-manager-config
../modules/system-modules ../modules/system-modules
]; ];
syncthingConfiguration = nix-syncthing.lib.syncthingConfiguration {
modules = [
(import ../configurations/syncthing)
];
};
in { in {
forEachPkgs = lambda: forEachSystem (system: lambda system (pkgsFor system)); forEachPkgs = lambda: forEachSystem (system: lambda system (pkgsFor system));
@ -68,9 +62,19 @@ in {
(lib.mkUnless condition no) (lib.mkUnless condition no)
]; ];
mkNixosInstaller = host: userKeys:
nixpkgs.lib.nixosSystem {
modules = [
{
# TODO: authorized keys for all users and hosts
}
../configurations/nixos/${host}
];
};
mkNixosSystem = host: mkNixosSystem = host:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs util syncthingConfiguration;}; specialArgs = {inherit inputs outputs util;};
modules = modules =
system-modules system-modules
++ [ ++ [
@ -115,4 +119,10 @@ in {
../configurations/home-manager/${user} ../configurations/home-manager/${user}
]; ];
}; };
syncthingConfiguration = nix-syncthing.lib.syncthingConfiguration {
modules = [
(import ../configurations/syncthing)
];
};
} }