From adab62337de9c5b566ede7ebc8e9b4a413b0c998 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Fri, 6 Jun 2025 17:52:58 -0500
Subject: [PATCH 1/2] bigbird: Add disabled Eric user; reorg users

---
 bigbird/configuration.nix     |  3 ++-
 bigbird/users/eric.nix        | 12 ++++++++++++
 bigbird/{ => users}/kathe.nix |  0
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 bigbird/users/eric.nix
 rename bigbird/{ => users}/kathe.nix (100%)

diff --git a/bigbird/configuration.nix b/bigbird/configuration.nix
index ac7ed56..cfd1070 100644
--- a/bigbird/configuration.nix
+++ b/bigbird/configuration.nix
@@ -5,8 +5,9 @@
       # <nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix>
       ./hardware-configuration.nix
       ./backups.nix
-      ./kathe.nix
       ./smb.nix
+      ./users/eric.nix
+      ./users/kathe.nix
     ];
 
   # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
diff --git a/bigbird/users/eric.nix b/bigbird/users/eric.nix
new file mode 100644
index 0000000..0abb023
--- /dev/null
+++ b/bigbird/users/eric.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  # users.users.eric = {
+  #   isNormalUser = true;
+  #   description = "Eric Villnow";
+  #   openssh.authorizedKeys.keys = [
+  #     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBKTAtIfDbYG2Wvwc0dmzXJXWwRnI1QFzFf7P9Txj9zo eric@vill.now"
+  #   ];
+  #   packages = with pkgs; [
+  #     #
+  #   ];
+  # };
+}
diff --git a/bigbird/kathe.nix b/bigbird/users/kathe.nix
similarity index 100%
rename from bigbird/kathe.nix
rename to bigbird/users/kathe.nix

From cb2e73007f3c4fe17a72985ef53038ceb988419d Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 19 Jun 2025 22:44:06 -0500
Subject: [PATCH 2/2] Upgrade to Minecraft 1.21.6

Requested-By: Jacob
---
 bert/services/minecraft.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bert/services/minecraft.nix b/bert/services/minecraft.nix
index 962ea77..1a36b0b 100644
--- a/bert/services/minecraft.nix
+++ b/bert/services/minecraft.nix
@@ -1,7 +1,7 @@
 {
   services.minecraft-server = {
     enable = true;
-    package = (import <nixpkgs> {
+    package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/058b28c40c1210cb16233f443dc6a4c850670f21.tar.gz") {
       config.allowUnfree = true;
     }).minecraft-server;
     declarative = true;