Compare commits
5 Commits
387891be93
...
be0953c816
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be0953c816 | ||
| 7b072f8467 | |||
| 6b0147e764 | |||
| 557fe1c502 | |||
| 3f74e38b80 |
24
flake.lock
generated
24
flake.lock
generated
@@ -76,11 +76,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1774152686,
|
||||
"narHash": "sha256-RlEgsdHr9IQm79SsXKNT8iU+ZjjIOPTJXcatMqgSfwk=",
|
||||
"lastModified": 1774238582,
|
||||
"narHash": "sha256-Ki8cqI4709KnKyR5EbMMbtsc4k3vSP7KeCTAhBRZ640=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "4c83dbe717272428562a33db817f492195e227ae",
|
||||
"rev": "1b4ad32c889411e7df7e9c88246e39c9407eae1f",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -242,11 +242,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774198433,
|
||||
"narHash": "sha256-V98UvfIy4jeqhFDLBmEUXCAh2Enmq+1f7NRRlRXY6pE=",
|
||||
"lastModified": 1774210133,
|
||||
"narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "38539206d0637bc951f01192e32b4e64d91d0941",
|
||||
"rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -502,11 +502,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1773821835,
|
||||
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
||||
"lastModified": 1774106199,
|
||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -596,11 +596,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774149071,
|
||||
"narHash": "sha256-SYp8NyzwfCO3Guqmu9hPRHR1hwESlQia5nNz3lYo2qA=",
|
||||
"lastModified": 1774235565,
|
||||
"narHash": "sha256-D8OOwvq3zDDCtIhMcNueb9tGSZaZUanKpWDleRgQ80U=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "6a031966eab3bfaa19be9e261eed5b8a79c04b18",
|
||||
"rev": "dc00324a2438762582b49954373112b8eab29cab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
5
modules/fwupd.nix
Normal file
5
modules/fwupd.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
services.fwupd.enable = lib.mkDefault true;
|
||||
}
|
||||
@@ -80,74 +80,6 @@ in
|
||||
# log-driver = "local";
|
||||
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||
#};
|
||||
prominence-ii = {
|
||||
image = "itzg/minecraft-server:java25";
|
||||
volumes = [
|
||||
"${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
|
||||
"${minecraft_path}/prominence-ii/data:/data"
|
||||
];
|
||||
hostname = "pii";
|
||||
environment = defaultEnv // {
|
||||
VERSION = "1.20.1";
|
||||
CF_SLUG = "prominence-2-hasturian-era";
|
||||
CF_FILENAME_MATCHER = "3.9.14hf";
|
||||
MEMORY = "8G";
|
||||
USE_AIKAR_FLAGS = "false";
|
||||
USE_MEOWICE_FLAGS = "true";
|
||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
||||
DIFFICULTY = "hard";
|
||||
ENABLE_COMMAND_BLOCK = "true";
|
||||
CF_FORCE_INCLUDE_FILES = ''
|
||||
emi
|
||||
'';
|
||||
};
|
||||
extraOptions = defaultOptions;
|
||||
log-driver = "local";
|
||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||
};
|
||||
stoneblock-4 = {
|
||||
image = "itzg/minecraft-server:java25";
|
||||
volumes = [
|
||||
"${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
|
||||
"${minecraft_path}/stoneblock-4/data:/data"
|
||||
];
|
||||
hostname = "stoneblock-4";
|
||||
environment = defaultEnv // {
|
||||
VERSION = "1.21.1";
|
||||
CF_SLUG = "ftb-stoneblock-4";
|
||||
CF_FILENAME_MATCHER = "1.6.0";
|
||||
MEMORY = "8G";
|
||||
USE_AIKAR_FLAGS = "false";
|
||||
USE_MEOWICE_FLAGS = "true";
|
||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
||||
DIFFICULTY = "hard";
|
||||
ENABLE_COMMAND_BLOCK = "true";
|
||||
};
|
||||
extraOptions = defaultOptions;
|
||||
log-driver = "local";
|
||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||
};
|
||||
submerged-2 = {
|
||||
image = "itzg/minecraft-server:java25";
|
||||
volumes = [
|
||||
"${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
|
||||
"${minecraft_path}/submerged-2/data:/data"
|
||||
];
|
||||
hostname = "submerged-2";
|
||||
environment = defaultEnv // {
|
||||
VERSION = "1.21.1";
|
||||
CF_SLUG = "submerged-2";
|
||||
CF_FILENAME_MATCHER = "B6.1";
|
||||
USE_AIKAR_FLAGS = "false";
|
||||
USE_MEOWICE_FLAGS = "true";
|
||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
||||
DIFFICULTY = "hard";
|
||||
ENABLE_COMMAND_BLOCK = "true";
|
||||
};
|
||||
extraOptions = defaultOptions;
|
||||
log-driver = "local";
|
||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||
};
|
||||
cobblemon-overclocked = {
|
||||
image = "itzg/minecraft-server:java21";
|
||||
volumes = [
|
||||
|
||||
Reference in New Issue
Block a user