diff --git a/nixosConfigurations/catarina/default.nix b/nixosConfigurations/catarina/default.nix index 65fd9c1..e548710 100644 --- a/nixosConfigurations/catarina/default.nix +++ b/nixosConfigurations/catarina/default.nix @@ -155,14 +155,14 @@ rec { }; services.jellyfin = { - enable = true; + enable = false; openFirewall = true; }; services.spoofdpi.enable = true; services.qbittorrent-nox = { - enable = true; + enable = false; webuiPort = 8085; openFirewall = true; }; diff --git a/nixosConfigurations/catarina/hardware.nix b/nixosConfigurations/catarina/hardware.nix index 7bb717d..9581d8a 100644 --- a/nixosConfigurations/catarina/hardware.nix +++ b/nixosConfigurations/catarina/hardware.nix @@ -123,7 +123,6 @@ networking = { networkmanager.enable = true; useDHCP = false; -# dhcpcd.enable = false; hostName = "catarina"; extraHosts = ''''; @@ -131,34 +130,30 @@ enable = true; allowedTCPPorts = [ 80 443 3001 25600 8080 8085 ]; }; - -# interfaces.enp9s0.ipv4.addresses = [ { -# address = "192.168.156.102"; -# prefixLength = 24; -# } ]; - interfaces.wlp8s0.ipv4.addresses = [ { - address = "192.168.156.102"; - prefixLength = 24; - } ]; - interfaces.wlp8s0.useDHCP = false; + interfaces.wlp8s0 = { + useDHCP = false; + ipv4.addresses = [ { + address = "192.168.156.102"; + prefixLength = 24; + } ]; + }; defaultGateway = { - address = "192.168.156.1"; - interface = null; - metric = null; - }; + address = "192.168.156.1"; + interface = null; + metric = null; + }; nameservers = [ "192.168.156.1" "8.8.8.8" ]; -# networkmanager.insertNameservers = config.networking.nameservers; }; services.resolved = { enable = false; dnssec = "true"; - extraConfig = '' - DNSOverTLS=yes - ''; - fallbackDns = [ "8.8.8.8" ]; + extraConfig = '' + DNSOverTLS=yes + ''; + fallbackDns = [ "8.8.8.8" ]; }; services.logind.lidSwitchExternalPower = "ignore"; diff --git a/nixosConfigurations/catarina/services/papermc.nix b/nixosConfigurations/catarina/services/papermc.nix index 1febf24..ad8e5bd 100644 --- a/nixosConfigurations/catarina/services/papermc.nix +++ b/nixosConfigurations/catarina/services/papermc.nix @@ -198,6 +198,7 @@ in { "rcon.port" = 25600; white-list = false; }; + jvmOpts = "-Xms512M -Xmx2048M"; rconPasswordFile = config.sops.secrets."papermc/rcon".path; whitelist = whitelist; ops = operators; @@ -213,8 +214,7 @@ in { ln -sf ${config.bonfire.configDir}/goodomens/plugins/squaremap/advanced.yml plugins/squaremap/ ln -sf ${config.bonfire.configDir}/goodomens/plugins/squaremap/advanced.yml plugins/squaremap/ ln -sf ${config.bonfire.configDir}/goodomens/site/map/index.html plugins/squaremap/web/ - '' - ; + ''; }; services.nginx.virtualHosts."mc.elnafo.ru" = {