made gitea container and moved minecraft container

systems/gerg-desktop/containers/default.nix

@@ -0,0 +1,6 @@
+inputs: {
+  imports = [
+    (import ./minecraft.nix inputs)
+    (import ./website.nix inputs)
+  ];
+}

systems/gerg-desktop/containers/minecraft.nix

@@ -0,0 +1,108 @@
+_: {...}: {
+  containers."minecraft" = {
+    privateNetwork = true;
+    hostBridge = "bridge0";
+    localAddress = "192.168.1.10/24";
+    localAddress6 = "2605:59c8:252e:500:200:ff:fe00:10/64";
+    bindMounts."/persist/minecraft" = {
+      mountPoint = "/minecraft";
+      hostPath = "/persist/minecraft";
+      isReadOnly = false;
+    };
+    config = {pkgs, ...}: let
+      stopScript = pkgs.writeShellScript "minecraft-server-stop" ''
+        echo stop > /run/minecraft-server.stdin
+        # Wait for the PID of the minecraft server to disappear before
+        # returning, so systemd doesn't attempt to SIGKILL it.
+        while kill -0 "$1" 2> /dev/null; do
+          sleep 1s
+        done
+      '';
+    in {
+      nixpkgs.config.allowUnfree = true;
+      environment.systemPackages = [pkgs.neovim];
+      networking = {
+        defaultGateway = "192.168.1.1";
+        nameservers = ["1.1.1.1" "1.0.0.1"];
+        firewall = {
+          allowedUDPPorts = [25565];
+          allowedTCPPorts = [25565];
+        };
+      };
+      systemd.services.setmacaddr = {
+        script = ''
+          /run/current-system/sw/bin/ip link set dev eth0 address 00:00:00:00:00:10
+        '';
+        wantedBy = ["basic.target"];
+        after = ["dhcpcd.service"];
+      };
+      system.stateVersion = "unstable";
+      users.users.minecraft = {
+        description = "Minecraft server service user";
+        home = "/minecraft";
+        createHome = true;
+        isSystemUser = true;
+        group = "minecraft";
+      };
+      users.groups.minecraft = {};
+
+      systemd.sockets.minecraft-server = {
+        bindsTo = ["minecraft-server.service"];
+        socketConfig = {
+          ListenFIFO = "/run/minecraft-server.stdin";
+          SocketMode = "0660";
+          SocketUser = "minecraft";
+          SocketGroup = "minecraft";
+          RemoveOnStop = true;
+          FlushPending = true;
+        };
+      };
+
+      systemd.services.minecraft-server = {
+        enable = true;
+        description = "Minecraft Server Service";
+        wantedBy = ["multi-user.target"];
+        requires = ["minecraft-server.socket"];
+        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";
+          ExecStop = "${stopScript} $MAINPID";
+          Restart = "always";
+          User = "minecraft";
+          WorkingDirectory = "/minecraft";
+
+          StandardInput = "socket";
+          StandardOutput = "journal";
+          StandardError = "journal";
+
+          # Hardening
+          CapabilityBoundingSet = [""];
+          DeviceAllow = [""];
+          LockPersonality = true;
+          PrivateDevices = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          RestrictAddressFamilies = ["AF_INET" "AF_INET6"];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          UMask = "0077";
+        };
+        preStart = ''
+          echo "eula=true" > eula.txt
+
+        '';
+      };
+    };
+  };
+}

systems/gerg-desktop/containers/website.nix

@@ -0,0 +1,79 @@
+_: {...}: {
+  containers."website" = {
+    autoStart = true;
+    privateNetwork = true;
+    hostBridge = "bridge0";
+    localAddress = "192.168.1.11/24";
+    localAddress6 = "2605:59c8:252e:500:200:ff:fe00:11/64";
+    config = {
+      pkgs,
+      config,
+      ...
+    }: let
+      giteaPort = 3000;
+    in {
+      nixpkgs.config.allowUnfree = true;
+      environment.systemPackages = [pkgs.neovim];
+      networking = {
+        defaultGateway = "192.168.1.1";
+        nameservers = ["1.1.1.1" "1.0.0.1"];
+        firewall = {
+          #allowedUDPPorts = [giteaPort 80 443];
+          allowedTCPPorts = [giteaPort 80 443 22];
+        };
+      };
+      systemd.services.setmacaddr = {
+        script = ''
+          /run/current-system/sw/bin/ip link set dev eth0 address 00:00:00:00:00:11
+        '';
+        wantedBy = ["basic.target"];
+        after = ["dhcpcd.service"];
+      };
+      system.stateVersion = "unstable";
+      services = {
+        gitea = {
+          enable = true;
+          appName = "WEEEWOOOO";
+          domain = "git.gerg-l.com";
+          rootUrl = "https://git.gerg-l.com/";
+          httpPort = giteaPort;
+          settings = {
+            server = {
+              LANDING_PAGE = "/explore/repos";
+            };
+            UI = {
+              DEFAULT_THEME = "arc-green";
+            };
+            service = {
+              DISABLE_REGISTRATION = true;
+            };
+          };
+        };
+        nginx = {
+          enable = true;
+          virtualHosts = {
+            "git.gerg-l.com" = {
+              forceSSL = true;
+              enableACME = true;
+              locations."/" = {
+                proxyPass = "http://localhost:${toString giteaPort}";
+              };
+            };
+          };
+        };
+        openssh = {
+          enable = true;
+          settings = {
+            PermitRootLogin = "no";
+            PasswordAuthentication = false;
+            KbdInteractiveAuthentication = false;
+          };
+        };
+      };
+      security.acme = {
+        acceptTerms = true;
+        defaults.email = "gregleyda@proton.me";
+      };
+    };
+  };
+}