From 766dc0011daf75c21ea5dad28909df23fbebdc03 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Tue, 4 Mar 2025 16:58:23 -0600 Subject: [PATCH] bert: Refactor factorio service --- bert/services/factorio.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix index 10e0b27..e49103d 100644 --- a/bert/services/factorio.nix +++ b/bert/services/factorio.nix @@ -1,14 +1,12 @@ -{ - # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - # "factorio-headless" - # ]; - services.factorio = let - factorio-nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7e35ac30ea1d236419653182559367ecd8a30675.tar.gz") { - config.allowUnfree = true; - }; - in { +{pkgs, lib, ...}: { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "factorio-headless" + ]; + services.factorio = { enable = true; - package = factorio-nixpkgs.factorio-headless; + package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/2c7baaaae909d8d7a50fc33beb593cde9d40e2ce.tar.gz") { + config.allowUnfree = true; + }).factorio-headless; openFirewall = true; nonBlockingSaving = true; game-name = "Chandler's Factorio Server";