merge: merged leyla/main

util/default.nix

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