merge: merged leyla/main

flake.nix

@@ -77,6 +77,12 @@
       url = "github:utensils/mcp-nixos";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Noita Entangled Worlds package
+    # Not following our nixpkgs so it can use its own rust-overlay configuration
+    noita-entangled-worlds = {
+      url = "github:IntQuant/noita_entangled_worlds/master";
+    };
   };
 
   outputs = {
@@ -91,15 +97,9 @@
     util = import ./util {inherit inputs;};
     forEachPkgs = util.forEachPkgs;
 
-    mkNixosInstaller = util.mkNixosInstaller;
     mkNixosSystem = util.mkNixosSystem;
     mkDarwinSystem = util.mkDarwinSystem;
     mkHome = util.mkHome;
-    syncthingConfiguration = util.syncthingConfiguration;
-
-    installerSystems = {
-      basic = mkNixosInstaller "basic" [];
-    };
 
     nixosSystems = {
       horizon = mkNixosSystem "horizon";
@@ -170,14 +170,10 @@
       };
     });
 
-    installerConfigurations = installerSystems;
-
     nixosConfigurations = nixosSystems;
 
     darwinConfigurations = darwinSystems;
 
     homeConfigurations = homeConfigurations;
-
-    syncthingConfiguration = syncthingConfiguration;
   };
 }