From 655f6fdabfca1c2f474ebdc6c8c8de4e99793b25 Mon Sep 17 00:00:00 2001
From: Patrick Neff <odie86@gmail.com>
Date: Fri, 22 Nov 2024 23:18:49 +0100
Subject: [PATCH] cleanup

---
 flake.lock                                | 62 +++++++++++++++++++----
 flake.nix                                 |  4 ++
 modules/nixos/games/minecraft/default.nix | 33 +++++++++---
 modules/nixvim/plugins/default.nix        |  3 +-
 4 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index de45fca..bd833ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -621,16 +621,18 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "placeholderapi-luckperms": "placeholderapi-luckperms",
         "systems": [
           "systems"
-        ]
+        ],
+        "vanillatweaks": "vanillatweaks"
       },
       "locked": {
-        "lastModified": 1731718090,
-        "narHash": "sha256-t2yvuShb9HwFNkJ3xNB6eC9/itD7/XeXeafsk4li9lQ=",
+        "lastModified": 1732313755,
+        "narHash": "sha256-uF3LDIKiAAmayuQkuRB/50p5ZUS1Lun9poOLuY4wCP8=",
         "ref": "refs/heads/master",
-        "rev": "119c048af7940e09c501fd24dc84ee16ebfed4bc",
-        "revCount": 74,
+        "rev": "fccbd8aac6e9114b481e542026c60e247922f252",
+        "revCount": 149,
         "type": "git",
         "url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git"
       },
@@ -761,11 +763,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1731375802,
-        "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=",
+        "lastModified": 1732067443,
+        "narHash": "sha256-CPNSYmlv8Hp1GHLPKq4RE1ujnOpwGEZKHZDWb1b1ZNc=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf",
+        "rev": "ca645f4163a501a3302e4afeb25f52906493bfd3",
         "type": "github"
       },
       "original": {
@@ -1077,6 +1079,18 @@
         "url": "http://ftp.vim.org/vim/runtime/spell/de.utf-8.sug"
       }
     },
+    "placeholderapi-luckperms": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-885K4DpNJc6FVvNwkzIvD8rcHJzEO3LtBpUmcLkcUTM=",
+        "type": "file",
+        "url": "https://download.gaja-group.com/LuckPerms-Fabric-PlaceholderAPI-Hook.jar"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://download.gaja-group.com/LuckPerms-Fabric-PlaceholderAPI-Hook.jar"
+      }
+    },
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
@@ -1105,7 +1119,8 @@
         "nvim-spell-de-latin1-suggestions": "nvim-spell-de-latin1-suggestions",
         "nvim-spell-de-utf8-dictionary": "nvim-spell-de-utf8-dictionary",
         "nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions",
-        "systems": "systems_3"
+        "systems": "systems_3",
+        "vim-mcfunction": "vim-mcfunction"
       }
     },
     "systems": {
@@ -1173,6 +1188,35 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
+    },
+    "vanillatweaks": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1729813122,
+        "narHash": "sha256-ilaZ0ozs/M+/XoVXPm8D+XjenKdhyPmZC4iUroexn2U=",
+        "type": "tarball",
+        "url": "https://download.gaja-group.com/VanillaTweaks_d592869_UNZIP_ME.zip"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://download.gaja-group.com/VanillaTweaks_d592869_UNZIP_ME.zip"
+      }
+    },
+    "vim-mcfunction": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675460606,
+        "narHash": "sha256-R2QKpuuT7BULM3tv2lBf5GCJysU8gNtKqyrQHDoOcMo=",
+        "owner": "RubixTheSlime",
+        "repo": "vim-mcfunction",
+        "rev": "f8ad1bfccb97f8f8e7ee0c52024eac3a8e491a85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RubixTheSlime",
+        "repo": "vim-mcfunction",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 7ee14c9..affa027 100644
--- a/flake.nix
+++ b/flake.nix
@@ -180,6 +180,10 @@
       url = "github:ray-x/guihua.lua";
       flake = false;
     };
+    vim-mcfunction = {
+      url = "github:RubixTheSlime/vim-mcfunction";
+      flake = false;
+    };
 
     /*
       neorg-overlay = {
diff --git a/modules/nixos/games/minecraft/default.nix b/modules/nixos/games/minecraft/default.nix
index c0bb86d..af6ca6f 100644
--- a/modules/nixos/games/minecraft/default.nix
+++ b/modules/nixos/games/minecraft/default.nix
@@ -1,12 +1,33 @@
-{ inputs
-, ...
-}: {
+{ inputs, ... }: {
   imports = [
     inputs.minecraft-server-flake.nixosModules.minecraft-servers
   ];
-  nixpkgs.overlays = [
-    inputs.minecraft-server-flake.overlays.minecraft-servers
-  ];
+  services.minecraft-servers = {
+    servers = {
+      vanilla-plus.enable = true;
+      flat.enable = true;
+    };
+    extraOptions = {
+      flat = {
+        port = 25567;
+        mapPort = 8101;
+        voicePort = 24455;
+        whitelist = {
+          masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
+          Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
+        };
+      };
+      vanilla-plus = {
+        port = 25566;
+        mapPort = 8100;
+        voicePort = 24454;
+        whitelist = {
+          masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
+          Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
+        };
+      };
+    };
+  };
 }
 /*
   { pkgs, lib, config, inputs, ... }: with lib; {
diff --git a/modules/nixvim/plugins/default.nix b/modules/nixvim/plugins/default.nix
index 6cb4321..9737b4b 100644
--- a/modules/nixvim/plugins/default.nix
+++ b/modules/nixvim/plugins/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ inputs, pkgs, ... }: {
   imports = [
     ./cmp.nix
     ./codeium.nix
@@ -47,5 +47,6 @@
   extraPlugins = with pkgs.vimPlugins;
     [
       vim-nftables
+      (pkgs.vimUtils.buildVimPlugin {name= "mcfunction"; src = inputs.vim-mcfunction; })
     ];
 }