From 6e1bd44ee0bda5c8aba2a81bf404e87d014b643e Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Tue, 1 Apr 2025 16:33:03 -0500
Subject: [PATCH 1/3] bert, oscar: Update factorio to 2.0.43

---
 bert/services/factorio.nix | 2 +-
 oscar/configuration.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix
index 0c7f423..b6291ac 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/e47e7cdafffab8b74c2878e02c37696dfcdebca0.tar.gz") {
+    package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/aa2922b69f0245008d93e9edf9f34894db724d89.tar.gz") {
       config.allowUnfree = true;
     }).factorio-headless;
     openFirewall = true;
diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 451893e..5c0b306 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -178,7 +178,7 @@
 
       # Unfree:
       discord
-      (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/e47e7cdafffab8b74c2878e02c37696dfcdebca0.tar.gz") {
+      (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/aa2922b69f0245008d93e9edf9f34894db724d89.tar.gz") {
         config.allowUnfree = true;
       }).factorio-space-age
     ];

From aee8a274ef3d3286f86f6785905635619a3db8db Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Tue, 15 Apr 2025 10:07:36 -0500
Subject: [PATCH 2/3] bert: Add git for git recv-pack for deployments

---
 bert/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bert/configuration.nix b/bert/configuration.nix
index 4072b87..8277e24 100644
--- a/bert/configuration.nix
+++ b/bert/configuration.nix
@@ -51,6 +51,7 @@
   };
 
   environment.systemPackages = with pkgs; [
+    git
     rsync
   ];
 

From e289dde49af19b43cbd8bb61f599c543709edf95 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Wed, 14 May 2025 21:15:46 -0500
Subject: [PATCH 3/3] oscar: Add chandler to docker group

---
 oscar/configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 5c0b306..44c472b 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -106,7 +106,7 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.chandler.isNormalUser = true;
   users.users.chandler.description = "Chandler Swift";
-  users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" "plugdev" "adbusers" ];
+  users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" "plugdev" "adbusers" "docker" ];
   home-manager.backupFileExtension = "backup";
   home-manager.users.chandler = { pkgs, ... }: {