From 766dc0011daf75c21ea5dad28909df23fbebdc03 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Tue, 4 Mar 2025 16:58:23 -0600
Subject: [PATCH 1/3] 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";

From 429b8243d06ab67f98f3ceabc202041b8895d894 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 6 Mar 2025 10:22:32 -0600
Subject: [PATCH 2/3] oscar: Fix/Upgrade kate package

This commit fixes this error:

    error: The top-level kate alias has been removed.

    Please explicitly use kdePackages.kate for the latest Qt 6-based
    version, or libsForQt5.kate for the deprecated Qt 5 version.

    Note that Qt 5 versions of most KDE software will be removed in
    NixOS 25.11.

Turns out I was using the kde5 version. The old version was deprecated
here:

https://github.com/NixOS/nixpkgs/commit/5c2f694947ebd1000d589ed636cae65cc18ef642
---
 oscar/configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 0c51647..84a43fd 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -136,7 +136,7 @@
       gnome-sound-recorder
       inkscape
       josm
-      kate
+      kdePackages.kate
       krita
       kicad
       libreoffice-qt

From 14e899476b4df4c7572d043550e42736ad3efc0c Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 6 Mar 2025 13:07:23 -0600
Subject: [PATCH 3/3] bert: Update Factorio to 2.0.32 (current stable)

---
 bert/services/factorio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix
index e49103d..1d832bf 100644
--- a/bert/services/factorio.nix
+++ b/bert/services/factorio.nix
@@ -4,7 +4,7 @@
   ];
   services.factorio = {
     enable = true;
-    package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/2c7baaaae909d8d7a50fc33beb593cde9d40e2ce.tar.gz") {
+    package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/ab224822391f803e3b58c65f753162361e769075.tar.gz") {
       config.allowUnfree = true;
     }).factorio-headless;
     openFirewall = true;