refactor: move syncthing configs out of flake file

This commit is contained in:
Leyla Becker 2025-11-07 17:11:41 -06:00
parent 761246a4a4
commit d613dee364
3 changed files with 9 additions and 12 deletions

View file

@ -94,7 +94,6 @@
mkNixosSystem = util.mkNixosSystem; mkNixosSystem = util.mkNixosSystem;
mkDarwinSystem = util.mkDarwinSystem; mkDarwinSystem = util.mkDarwinSystem;
mkHome = util.mkHome; mkHome = util.mkHome;
syncthingConfiguration = util.syncthingConfiguration;
nixosSystems = { nixosSystems = {
horizon = mkNixosSystem "horizon"; horizon = mkNixosSystem "horizon";
@ -170,7 +169,5 @@
darwinConfigurations = darwinSystems; darwinConfigurations = darwinSystems;
homeConfigurations = homeConfigurations; homeConfigurations = homeConfigurations;
syncthingConfiguration = syncthingConfiguration;
}; };
} }

View file

@ -1,7 +1,7 @@
{ {
config, config,
lib, lib,
outputs, syncthingConfiguration,
... ...
}: 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 = outputs.syncthingConfiguration; configuration = syncthingConfiguration;
deviceName = config.networking.hostName; deviceName = config.networking.hostName;
}; };
} }

View file

@ -52,6 +52,12 @@
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));
@ -64,7 +70,7 @@ in {
mkNixosSystem = host: mkNixosSystem = host:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs util;}; specialArgs = {inherit inputs outputs util syncthingConfiguration;};
modules = modules =
system-modules system-modules
++ [ ++ [
@ -109,10 +115,4 @@ in {
../configurations/home-manager/${user} ../configurations/home-manager/${user}
]; ];
}; };
syncthingConfiguration = nix-syncthing.lib.syncthingConfiguration {
modules = [
(import ../configurations/syncthing)
];
};
} }