diff options
| -rw-r--r-- | configs/default.nix | 1 | ||||
| -rw-r--r-- | nix/sources.json | 14 | ||||
| -rw-r--r-- | public/aforemny.id_ed25519.pub | 1 | ||||
| -rw-r--r-- | public/kmein.id_ed25519.pub | 1 | ||||
| m--------- | secrets | 0 | ||||
| -rw-r--r-- | systems/system1/configuration.nix | 30 |
6 files changed, 45 insertions, 2 deletions
diff --git a/configs/default.nix b/configs/default.nix index 3693318..0ba5c28 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -5,6 +5,7 @@ # `fysiweb deploy`, if it exists. { users.users.root.openssh.authorizedKeys.keyFiles = [ + ../public/aforemny.id_ed25519.pub ../public/aforemny.id_rsa.pub ../public/kirchner.id_rsa.pub ]; diff --git a/nix/sources.json b/nix/sources.json index 1835e4e..425d697 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -14,7 +14,7 @@ "feed-nomath-org": { "branch": "main", "repo": "git@code.nomath.org:~/feed-nomath-org", - "rev": "a42267246099b0d4d7467669bf09c830aab73d43", + "rev": "6a75e3db9f30ba8856dda185b012a48cea2d7d6f", "type": "git" }, "fysiweb-cli": { @@ -36,6 +36,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/84d981bae8b5e783b3b548de505b22880559515f.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, + "nixpkgs_latest": { + "branch": "master", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2e4091b2c36dc83185da18f2c91630816b1de8d8", + "sha256": "0qin8wfic17zz7c4c42yyzhcxa3bi6i409kya5zqhmy83idirgz1", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/2e4091b2c36dc83185da18f2c91630816b1de8d8.tar.gz", + "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" + }, "nomath-org": { "branch": "main", "repo": "git@code.nomath.org:~/nomath-org", diff --git a/public/aforemny.id_ed25519.pub b/public/aforemny.id_ed25519.pub new file mode 100644 index 0000000..a68b934 --- /dev/null +++ b/public/aforemny.id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBvRliydgYlyjKeMAEuVWWvmr82rZBXaA5ZM9U8r0pyN aforemny@x1e diff --git a/public/kmein.id_ed25519.pub b/public/kmein.id_ed25519.pub new file mode 100644 index 0000000..e092475 --- /dev/null +++ b/public/kmein.id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@kabsa diff --git a/secrets b/secrets -Subproject e7b6b5d90ae72e7a04cdda28612db720f8e2f41 +Subproject 2bd6efe7a0527639ea722200fde41ca95cf97a9 diff --git a/systems/system1/configuration.nix b/systems/system1/configuration.nix index 5695eb9..ad1fb46 100644 --- a/systems/system1/configuration.nix +++ b/systems/system1/configuration.nix @@ -18,12 +18,16 @@ } # enable static users { - fysiweb-apps.public.static-users.public.users.aforemny.publicKeyFiles = [ (toString ../../public + "/aforemny.id_rsa.pub") ]; + fysiweb-apps.public.static-users.public.users.aforemny.publicKeyFiles = [ + (toString ../../public + "/aforemny.id_rsa.pub") + (toString ../../public + "/aforemny.id_ed25519.pub") + ]; fysiweb-apps.public.static-users.public.users.kirchner.publicKeyFiles = [ (toString ../../public + "/kirchner.id_rsa.pub") (toString ../../public + "/kirchner@hereon.id_rsa.pub") (toString ../../public + "/kirchner@hereon-laptop.id_rsa.pub") ]; + fysiweb-apps.public.static-users.public.users.kmein.publicKeyFiles = [ (toString ../../public + "/kmein.id_ed25519.pub") ]; } # enable authelia { @@ -48,7 +52,9 @@ } { fysiweb-apps.public.cgit."code-nomath-org".repositories."abuilder".description = "simple build daemon"; + fysiweb-apps.public.cgit."code-nomath-org".repositories."achat".description = "simple chat"; fysiweb-apps.public.cgit."code-nomath-org".repositories."acms".description = "semantically versioned content management system"; + fysiweb-apps.public.cgit."code-nomath-org".repositories."autotypes".description = "TODO"; fysiweb-apps.public.cgit."code-nomath-org".repositories."agame".description = "a game"; fysiweb-apps.public.cgit."code-nomath-org".repositories."anissue".description = "in-source issue management"; fysiweb-apps.public.cgit."code-nomath-org".repositories."apaperless".description = "document archival system"; @@ -74,6 +80,7 @@ # TODO connect with cgit repositories fysiweb-apps.public.feed-nomath-org.feed-nomath-org.repositories = [ "/var/lib/git/abuilder" + "/var/lib/git/achat" "/var/lib/git/acms" "/var/lib/git/agame" "/var/lib/git/anissue" @@ -104,6 +111,27 @@ # enable agame server { services.agame.enable = true; + systemd.services.agame.wantedBy = pkgs.lib.mkForce [ ]; + } + # enable minecraft server + { + services.minecraft-server.enable = true; + services.minecraft-server.eula = true; + services.minecraft-server.openFirewall = true; + services.minecraft-server.declarative = true; + services.minecraft-server.package = (import (import ../../nix/sources.nix).nixpkgs_latest { + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ]; + }).pkgs.minecraft-server; + + services.minecraft-server.serverProperties.difficulty = 3; + services.minecraft-server.serverProperties.motd = config.services.minecraft-server.package.version; + services.minecraft-server.serverProperties.enforce-whitelist = true; + services.minecraft-server.serverProperties.white-list = true; + + services.minecraft-server.serverProperties.view-distance = 16; + + services.minecraft-server.whitelist.Alsbach = "9e479252-1c7d-45dc-a6ba-5fb8b659af86"; + services.minecraft-server.whitelist.elbueblo = "3d0afb8e-3289-4b18-90c6-e113eb636e5b"; } ]; } |