mirror of
https://github.com/phfroidmont/self-hosting.git
synced 2025-12-25 05:36:59 +01:00
Use minecraft-server from unstable
This commit is contained in:
parent
1808cdc632
commit
0b484ab7a7
2 changed files with 12 additions and 4 deletions
11
flake.nix
11
flake.nix
|
|
@ -12,9 +12,17 @@
|
||||||
let
|
let
|
||||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
pkgs-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux;
|
pkgs-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux;
|
||||||
|
defaultModuleArgs = { pkgs, ... }: {
|
||||||
|
_module.args.pkgs-unstable = import nixpkgs-unstable {
|
||||||
|
inherit (pkgs.stdenv.targetPlatform) system;
|
||||||
|
config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
|
||||||
|
"minecraft-server"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
devShell.x86_64-linux = pkgs.mkShell {
|
devShells.x86_64-linux.default = pkgs.mkShell {
|
||||||
sopsPGPKeyDirs = [
|
sopsPGPKeyDirs = [
|
||||||
"./keys/hosts"
|
"./keys/hosts"
|
||||||
"./keys/users"
|
"./keys/users"
|
||||||
|
|
@ -71,6 +79,7 @@
|
||||||
storage1 = nixpkgs.lib.nixosSystem {
|
storage1 = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
defaultModuleArgs
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
simple-nixos-mailserver.nixosModule
|
simple-nixos-mailserver.nixosModule
|
||||||
./profiles/storage.nix
|
./profiles/storage.nix
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, pkgs-unstable, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../environment.nix
|
../environment.nix
|
||||||
|
|
@ -65,10 +65,9 @@
|
||||||
if failed port 443 protocol https with timeout 20 seconds then alert
|
if failed port 443 protocol https with timeout 20 seconds then alert
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
services.minecraft-server = {
|
services.minecraft-server = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-unstable.minecraft-server;
|
||||||
eula = true;
|
eula = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
declarative = true;
|
declarative = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue