From b8d073f6cdaf6925f8ef3c01e3c593b0bba5cf51 Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Tue, 22 Oct 2024 19:28:59 +0200
Subject: update factorio

---
 flake.lock                | 17 +++++++++++++++++
 flake.nix                 | 11 +++++++++--
 modules/games/default.nix |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index e922583..5ce5b5d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -289,6 +289,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1729614774,
+        "narHash": "sha256-K+3N/Iq+wARJy1sWAa17tcsn4W1N75Brc+tWI0r+elI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d4d006a3eb22659e21a5009954812e162d679a00",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1728492678,
@@ -548,6 +564,7 @@
         "flake-parts": "flake-parts",
         "nixinate": "nixinate",
         "nixpkgs": "nixpkgs_3",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "pastor": "pastor",
         "secrets": "secrets"
diff --git a/flake.nix b/flake.nix
index da0bd91..9ce6453 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixinate.url = "github:maxaudron/nixinate";
 
@@ -14,7 +15,7 @@
     pastor.url = "gitlab:cocainefarm/pastor/feature/nix";
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, flake-parts, nixinate, ... }:
+  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nixpkgs-master, flake-parts, nixinate, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [ nixinate.flakeModule ./lib ];
       flake =
@@ -30,9 +31,15 @@
               config.allowUnfree = true;
             };
           };
+          overlay-master = final: prev: {
+            master = import nixpkgs-master {
+              system = prev.system;
+              config.allowUnfree = true;
+            };
+          };
 
           overlays = { config, pkgs, ... }: {
-            nixpkgs.overlays = [ overlay-unstable ];
+            nixpkgs.overlays = [ overlay-unstable overlay-master ];
           };
 
           mkSystem = modules: nixpkgs.lib.nixosSystem {
diff --git a/modules/games/default.nix b/modules/games/default.nix
index 7c33658..405a842 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -5,7 +5,7 @@
 
   services.factorio = {
     enable = true;
-    package = pkgs.unstable.factorio-headless;
+    package = pkgs.master.factorio-headless;
 
     public = false;
     nonBlockingSaving = true;
-- 
cgit v1.2.3