mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 17:03:56 -05:00
messing with website
locked papermc added searxng enabled website
This commit is contained in:
parent
f8c13c04b9
commit
164cdd85a0
8 changed files with 177 additions and 97 deletions
|
|
@ -1,20 +1,26 @@
|
|||
_: {
|
||||
{self, ...}: {
|
||||
containers."minecraft" = {
|
||||
ephemeral = true;
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostBridge = "bridge0";
|
||||
hostBridge = "br0";
|
||||
localAddress = "192.168.1.10/24";
|
||||
bindMounts."/minecraft" = {
|
||||
hostPath = "/persist/minecraft";
|
||||
isReadOnly = false;
|
||||
};
|
||||
config = {pkgs, ...}: {
|
||||
config = {
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
environment.systemPackages = [pkgs.neovim];
|
||||
networking = {
|
||||
defaultGateway = "192.168.1.1";
|
||||
nameservers = ["192.168.1.1"];
|
||||
useHostResolvConf = lib.mkForce false;
|
||||
|
||||
firewall = {
|
||||
allowedUDPPorts = [25565];
|
||||
allowedTCPPorts = [25565];
|
||||
|
|
@ -59,7 +65,7 @@ _: {
|
|||
after = ["network.target" "minecraft-server.socket"];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.papermc}/bin/minecraft-server -Xms8G -Xmx8G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true";
|
||||
ExecStart = "${self.packages.${pkgs.system}.papermc}/bin/minecraft-server -Xms8G -Xmx8G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true";
|
||||
Restart = "always";
|
||||
User = "minecraft";
|
||||
WorkingDirectory = "/minecraft";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,6 @@ _: {
|
|||
"website/nextcloud" = {
|
||||
mode = "0444";
|
||||
};
|
||||
|
||||
"website/ssl_key" = {
|
||||
mode = "0444";
|
||||
};
|
||||
|
||||
"website/ssl_cert" = {
|
||||
mode = "0444";
|
||||
};
|
||||
};
|
||||
containers."website" = {
|
||||
ephemeral = true;
|
||||
|
|
@ -38,6 +30,7 @@ _: {
|
|||
config = {
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
giteaPort = 3000;
|
||||
|
|
@ -46,10 +39,9 @@ _: {
|
|||
environment.systemPackages = [pkgs.neovim];
|
||||
networking = {
|
||||
defaultGateway = "192.168.1.1";
|
||||
nameservers = ["1.1.1.1" "1.0.0.1"];
|
||||
firewall = {
|
||||
allowedTCPPorts = [giteaPort 80 443 22];
|
||||
};
|
||||
nameservers = ["192.168.1.1"];
|
||||
useHostResolvConf = lib.mkForce false;
|
||||
firewall.allowedTCPPorts = [giteaPort 80 443 22];
|
||||
};
|
||||
systemd.services.setmacaddr = {
|
||||
script = ''
|
||||
|
|
@ -114,29 +106,6 @@ _: {
|
|||
gitea-users gitea gitea
|
||||
'';
|
||||
};
|
||||
nginx = {
|
||||
enable = true;
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
virtualHosts = let
|
||||
template = {
|
||||
forceSSL = true;
|
||||
sslCertificate = "/secrets/ssl_cert";
|
||||
sslCertificateKey = "/secrets/ssl_key";
|
||||
};
|
||||
in {
|
||||
"git.gerg-l.com" =
|
||||
template
|
||||
// {
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString giteaPort}";
|
||||
};
|
||||
};
|
||||
"next.gerg-l.com" = template;
|
||||
};
|
||||
};
|
||||
openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
Loading…
Add table
Add a link
Reference in a new issue