Compare commits

..

No commits in common. "acc7057790dd1f0dadbb8707865a13052181792c" and "1403595ae16def3be8682db3275b395498310253" have entirely different histories.

4 changed files with 2 additions and 11 deletions

View file

@ -7,7 +7,7 @@
enabled = "fcitx5"; enabled = "fcitx5";
fcitx5.addons = fcitx5.addons =
(with pkgs; [ (with pkgs; [
libsForQt5.fcitx5-chinese-addons fcitx5-chinese-addons
fcitx5-tokyonight fcitx5-tokyonight
]) ])
++ (with inputs.berberman.packages.${pkgs.stdenv.hostPlatform.system}; [ ++ (with inputs.berberman.packages.${pkgs.stdenv.hostPlatform.system}; [

View file

@ -1,7 +1,5 @@
{lib, ...}: { {lib, ...}: {
nixpkgs.config = { nixpkgs.config = {
allowAliases = false;
allowNonSource = false; allowNonSource = false;
allowNonSourcePredicate = pkg: allowNonSourcePredicate = pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [

View file

@ -1,6 +1,7 @@
{ {
pkgs, pkgs,
inputs, inputs,
config,
... ...
}: { }: {
imports = [ imports = [

View file

@ -2,7 +2,6 @@
pkgs, pkgs,
lib, lib,
config, config,
inputs,
... ...
}: { }: {
imports = [ imports = [
@ -168,13 +167,6 @@
eula = true; eula = true;
openFirewall = true; openFirewall = true;
package = pkgs.callPackage "${inputs.nixpkgs}/pkgs/games/minecraft-servers/derivation.nix" {
version = "1.21";
sha1 = "450698d1863ab5180c25d7c804ef0fe6369dd1ba";
url = "https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar";
jre_headless = pkgs.javaPackages.compiler.openjdk21.headless;
};
# Aikar's flag # Aikar's flag
# https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/ # https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/
# https://docs.papermc.io/paper/aikars-flags # https://docs.papermc.io/paper/aikars-flags