yes
This commit is contained in:
parent
1d47a987bb
commit
635d358fcd
3 changed files with 13 additions and 96 deletions
94
flake.lock
94
flake.lock
|
@ -1,94 +0,0 @@
|
|||
{
|
||||
"nodes": {
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667574732,
|
||||
"narHash": "sha256-73TVk3uSQOja6Q/5OuNcpcqwo6+SMzJPRtYAjU0rBx4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b764068a506c6f70dba998efa0e7fcb99cb4deb2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mac-brcm-fw": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-ewzM8IBKNFCx73ah5rflcdx605ukRF3oTWwih2CTsvs=",
|
||||
"path": "./mac-brcm-fw",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "./mac-brcm-fw",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1667501134,
|
||||
"narHash": "sha256-DvH2mS0cV0o3rSzKbSuD8m2G4rM+W53SRVssQgGFlq8=",
|
||||
"owner": "kekrby",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "1b90099863ebb1b3cb71c82f6ba48d7e51748703",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kekrby",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1667552457,
|
||||
"narHash": "sha256-9gH6VAK7idBb9owuLCKT2ODQUpDNc+UvcFWZ+lx41eM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7d09cc075f416997a8e547982b652ec2c7020a5f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"mac-brcm-fw": "mac-brcm-fw",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667077288,
|
||||
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
|
@ -15,9 +15,12 @@
|
|||
mms.url = "github:mkaito/nixos-modded-minecraft-servers";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, home-manager, nixos-hardware, mac-brcm-fw, ... }: {
|
||||
outputs = { self, nixpkgs, home-manager, nixos-hardware, mac-brcm-fw, ... }@inputs: {
|
||||
nixosConfigurations = {
|
||||
monosodium-glutamate-g = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./monosodium-glutamate-g/configuration.nix
|
||||
|
@ -32,6 +35,9 @@
|
|||
];
|
||||
};
|
||||
potatobook-g = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
"${mac-brcm-fw}"
|
||||
|
|
|
@ -107,12 +107,17 @@
|
|||
# In this case, the folder is `/var/lib/mc-e2es`
|
||||
# and the user `mc-e2es`.
|
||||
instances = {
|
||||
standard-server = {
|
||||
e2es = {
|
||||
enable = true;
|
||||
jvmMaxAllocation = "7G";
|
||||
jvmInitialAllocation = "2G";
|
||||
rsyncSSHKeys = [ "" ];
|
||||
serverConfig = {
|
||||
# Port must be unique
|
||||
white-list = true;
|
||||
spawn-protection = 0;
|
||||
max-tick-time = 5 * 60 * 1000;
|
||||
allow-flight = true;
|
||||
server-port = 8080;
|
||||
motd = "Hello world";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue