From 1c0e075fe3745298acb7a38849fe3cb6dd11134a Mon Sep 17 00:00:00 2001
From: Nickiel12 <nicholasyoungsumner@gmail.com>
Date: Sat, 15 Jul 2023 12:20:47 -0700
Subject: [PATCH] flake update, non-working bedrock-server configuration

---
 flake.lock                                    | 40 +++++++++++++------
 .../minecraft-bedrock-server.nix              | 36 +++++++++++++++++
 users/nixolas.nix                             | 17 ++++----
 3 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 modules/minecraft-bedrock/minecraft-bedrock-server.nix

diff --git a/flake.lock b/flake.lock
index a5bc7d6..21de68b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687098182,
-        "narHash": "sha256-kBys+Cwmcxzh7UNVWTrunOgaR02zl2XN3feA8fSlqVo=",
+        "lastModified": 1689447223,
+        "narHash": "sha256-A5vQBtWYamvGf3c2IEhAmwIkXBzuzrkpnMYbLvc+lEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0480dabc99e1b669ebe909949180fa2786e733cd",
+        "rev": "f5b03feb33629cb2b6dd513935637e8cc718a5ba",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1685177663,
-        "narHash": "sha256-T3WC47AyxwPxwCmukrwE/alZLU3bu7ZuBrCW5DMefI8=",
+        "lastModified": 1688896102,
+        "narHash": "sha256-o8oo0tuRR6eYhh4IYnNaeQ810RdIeF9JJQdJHuzRN3U=",
         "owner": "kmonad",
         "repo": "kmonad",
-        "rev": "97ac050f9818e942a706194adb7374f7b10ee339",
+        "rev": "19cccbf8988a67ff2e1fab14341230b220e4e5c8",
         "type": "github"
       },
       "original": {
@@ -103,13 +103,28 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-23_05": {
+      "locked": {
+        "lastModified": 1684782344,
+        "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.05",
+        "type": "indirect"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1686960236,
-        "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
+        "lastModified": 1689282004,
+        "narHash": "sha256-VNhuyb10c9SV+3hZOlxwJwzEGytZ31gN9w4nPCnNvdI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
+        "rev": "e74e68449c385db82de3170288a28cd0f608544f",
         "type": "github"
       },
       "original": {
@@ -148,14 +163,15 @@
         "flake-compat": "flake-compat",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-22_11": "nixpkgs-22_11",
+        "nixpkgs-23_05": "nixpkgs-23_05",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1686468558,
-        "narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=",
+        "lastModified": 1689103880,
+        "narHash": "sha256-vHRCkcpnBbFsPqUNXliUmdPU81jqyuL9ZPzj3vJx2RE=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "290d00f6db4e80467013728819ad73dd4a394d9a",
+        "rev": "69a4b7ad67d2732ba1f86666b3d4d2d83b15200e",
         "type": "gitlab"
       },
       "original": {
diff --git a/modules/minecraft-bedrock/minecraft-bedrock-server.nix b/modules/minecraft-bedrock/minecraft-bedrock-server.nix
new file mode 100644
index 0000000..f8d574d
--- /dev/null
+++ b/modules/minecraft-bedrock/minecraft-bedrock-server.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, autoPatchelfHook, unzip, curl, gcc }:
+
+stdenv.mkDerivation rec {
+  pname = "minecraft bedrock server";
+  version = "1.20.1";
+
+  src = fetchurl {
+    url = "https://minecraft.azureedge.net/bin-linux/bedrock-server-1.20.1.02.zip";
+    sha256 = "sha256-H7OAdB1EzcvdGHWRUD/K8/P8rqBkteuxtNdx/Fp2ZTM=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    unzip
+  ];
+
+  buildInputs = [
+    curl
+    gcc.cc.lib
+  ];
+
+  sourceRoot = ".";
+  installPhase = ''
+    mkdir $out
+    mkdir $out/bin
+    unzip $src -d $out
+    install -m755 -D $out/bedrock_server $out/bin/bedrock-server
+  '';
+
+
+  meta = with lib; {
+    description = "Minecraft Bedrock Server";
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/users/nixolas.nix b/users/nixolas.nix
index d34a170..b9baef2 100644
--- a/users/nixolas.nix
+++ b/users/nixolas.nix
@@ -43,6 +43,7 @@ in
     ".config/awesome/calendar.lua".source = "${awesome-wm-widgets}/calendar-widget/batteryarc.lua";
   };
 
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
@@ -67,6 +68,7 @@ in
     stateVersion = "22.11";
   
     packages = with pkgs; [
+    # (pkgs.callPackage ./../modules/minecraft-bedrock/minecraft-bedrock-server.nix {}) # the possible minecraft-bedrock-server package for testing
       # utilities
       bat      # cat with wings (better cat)
       du-dust  # directory disk-space analyzer
@@ -81,14 +83,15 @@ in
       texlive.combined.scheme-medium
     
       # commandline utils
-      pfetch
-      fortune
-      rmtrash
-      ripgrep
-      fd
-      neofetch
-      ranger
       exa
+      fd
+      fortune
+      neofetch
+      pfetch
+      ranger
+      ripgrep
+      rmtrash
+      testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/
       xdotool
       vhs