summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorene <ene@sils.li>2023-01-15 20:29:16 +0100
committerene <ene@sils.li>2023-01-15 20:29:16 +0100
commit3f3301c2ed8432fafdc1fbf891a55bd97446cba4 (patch)
tree350c72a02ab87a67e99b14b295c7bfa8f31b019f
parentMerge pull request 'Service: Run a basic Minecraft Server' (#6) from server1_... (diff)
parentMerge branch 'server1' into server1_minecraft (diff)
downloadnixos-server-3f3301c2ed8432fafdc1fbf891a55bd97446cba4.tar.gz
nixos-server-3f3301c2ed8432fafdc1fbf891a55bd97446cba4.zip
Merge pull request 'Fix: Import Minecraft Configuration' (#7) from server1_minecraft into server1
Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/7
Reviewed-by: ene <ene@sils.li>
-rw-r--r--configuration.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/configuration.nix b/configuration.nix
index 852a6ee..600201d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -3,6 +3,7 @@
     ./hardware-configuration.nix
     ./packages.nix
     ./networking.nix # network configuration that just works
+    ./services/minecraft.nix
   ];
 
   boot.cleanTmpDir = true;
@@ -24,3 +25,4 @@
   system.stateVersion = "22.11";
 }
 # vim: ts=2
+