From 60fcc73655f426933a05111357ca030ce2317eb8 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Tue, 31 May 2022 10:22:24 +1000
Subject: [PATCH] minecraftClient: dropped multimc for polymc

---
 hosts/dionach.nix            |  4 +---
 profiles/desktopCraige.nix   |  1 +
 profiles/games-kids.nix      | 11 ++++-------
 profiles/minecraftClient.nix | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 profiles/minecraftClient.nix

diff --git a/hosts/dionach.nix b/hosts/dionach.nix
index ccf3871..1372095 100644
--- a/hosts/dionach.nix
+++ b/hosts/dionach.nix
@@ -35,7 +35,7 @@
 
   nixpkgs.config = {
     allowUnfree = true;
-    permittedInsecurePackages = ["openssl-1.0.2u" "minecraft"];
+    permittedInsecurePackages = ["openssl-1.0.2u"];
   };
 
   # Use the GRUB 2 boot loader.
@@ -98,12 +98,10 @@
     libgphoto2
     libreoffice-fresh # Libreoffice - fresh version
     lxmenu-data
-    minecraft
     mkpasswd
     mp3info # MP3 tag editor / query tool
     mpd
     mtpfs
-    multimc
     ncmpcpp
     nextcloud-client
     nvme-cli # NVM-Express user space tooling for Linux
diff --git a/profiles/desktopCraige.nix b/profiles/desktopCraige.nix
index 9982e1d..c2f169d 100644
--- a/profiles/desktopCraige.nix
+++ b/profiles/desktopCraige.nix
@@ -7,6 +7,7 @@
   # Craige's Desktop Packages
   imports = [
     ../profiles/ebooks.nix
+    ../profiles/minecraftClient.nix
     ../profiles/spotify.nix # Spotify settings
   ];
 
diff --git a/profiles/games-kids.nix b/profiles/games-kids.nix
index d99fcd2..cf765de 100644
--- a/profiles/games-kids.nix
+++ b/profiles/games-kids.nix
@@ -7,12 +7,11 @@
   sources = import ../nix/sources.nix;
   unstable = import sources.nixpkgsUnstable {};
 in {
-  nixpkgs.config = {
-    allowUnfree = true;
-    permittedInsecurePackages = ["minecraft"];
-  };
+  imports = [
+    ../profiles/minecraftClient.nix # Play Minecraft :-)
+  ];
 
-  # Retro Gaming Packages
+  # Kid's Gaming Packages
   environment.systemPackages = with pkgs; [
     angband # A single-player roguelike dungeon exploration game
     discord # cross-platform voice and text chat for gamers
@@ -22,10 +21,8 @@ in {
     freedroidrpg # Isometric 3D RPG similar to game Diablo
     gcompris # Educational software suite, kids aged 2 to 10
     unstable.grapejuice # Simple Wine+Roblox management tool
-    jre # Required by Minecraft (via multimc)
     #lincity_ng      # City building game
     meritous # Action-adventure dungeon crawl game
-    minecraft # Official launcher for Minecraft
     minetest # Infinite-world block sandbox game
     nethack-x11 # Rogue-like game
     #opendungeons    # real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius
diff --git a/profiles/minecraftClient.nix b/profiles/minecraftClient.nix
new file mode 100644
index 0000000..f159129
--- /dev/null
+++ b/profiles/minecraftClient.nix
@@ -0,0 +1,16 @@
+# Minecraft client configuration for NixOS
+{
+  pkgs,
+  config,
+  ...
+}: {
+  nixpkgs.config = {
+    allowUnfree = true;
+    permittedInsecurePackages = ["minecraft"];
+  };
+  environment.systemPackages = with pkgs; [
+    jre # Required by Minecraft (via polymc)
+    minecraft # Official launcher for Minecraft
+    polymc # A free, open source launcher for Minecraft
+  ];
+}