From 577177e0f1b8e0f5946269c66af4b096826f2659 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 16 Mar 2025 12:15:54 -0500
Subject: [PATCH 1/5] bert: Simplify factorio allowUnfreePredicate

---
 bert/services/factorio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix
index 1d832bf..741a910 100644
--- a/bert/services/factorio.nix
+++ b/bert/services/factorio.nix
@@ -1,5 +1,5 @@
-{pkgs, lib, ...}: {
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+{lib, ...}: {
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem pkg.pname [
     "factorio-headless"
   ];
   services.factorio = {

From 0afc65007be06ffaac80fa77bb711ad1666bd8ce Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 16 Mar 2025 12:18:22 -0500
Subject: [PATCH 2/5] oscar: Install android-studio

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

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 84a43fd..84449cd 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -123,12 +123,14 @@
   home-manager.users.chandler = { pkgs, ... }: {
 
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+      "android-studio-stable"
       "discord"
       "factorio-space-age"
     ];
 
     home.packages = with pkgs; [
       # applications
+      android-studio
       blender
       freecad
       frescobaldi

From 11f31a8356caabf93da24517a8de3be022d86e36 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 16 Mar 2025 12:20:12 -0500
Subject: [PATCH 3/5] oscar: Add games section to installed apps; add
 bolt-launcher

---
 oscar/configuration.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 84449cd..a25448a 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -144,10 +144,14 @@
       libreoffice-qt
       mumble
       musescore
-      prismlauncher
       prusa-slicer
       qgis
+
+      # games
+      bolt-launcher
+      prismlauncher
       scummvm
+      # runelite
 
       # command line applications
       iperf

From 09ed1bed4350f66aee322b83ad2505cbc62b32e9 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 16 Mar 2025 12:21:29 -0500
Subject: [PATCH 4/5] oscar: Remove no-longer-helpful/accurate comments

---
 oscar/configuration.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index a25448a..6d7cf61 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -44,10 +44,6 @@
   networking.hostName = "oscar"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   # Enable networking
   networking.networkmanager.enable = true;
 
@@ -102,17 +98,9 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
     jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
   };
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   # Define a user account. Don't forget to set a password with ‘passwd’.

From 44b11c451bdad7b13d16daf5aa89ba315c0c5d47 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 16 Mar 2025 12:38:04 -0500
Subject: [PATCH 5/5] Update factorio to 2.0.41

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

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