Merge pull request 'Merge to server1' (#16) from server1_develop into server1

Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/16

5 files changed, 27 insertions, 1 deletions

diff --git a/services/default.nix b/services/default.nix
new file mode 100644
index 0000000..6983529
--- /dev/null
+++ b/services/default.nix
@@ -0,0 +1,8 @@
+{config, ...}: {
+  imports = [
+    ./services/minecraft.nix
+    ./services/nix.nix
+    ./services/opensshd.nix
+    ./services/rust-motd.nix
+  ];
+}
diff --git a/services/minecraft.nix b/services/services/minecraft.nix
index 5882d9a..754c974 100644
--- a/services/minecraft.nix
+++ b/services/services/minecraft.nix
@@ -11,7 +11,7 @@
     };
   };
   systemd.services.minecraft = {
-    wantedBy = "multi-user.target";
+    wantedBy = ["multi-user.target"];
     after = "network.target";
     description = "Minecraft Server";
     serviceConfig = {
diff --git a/services/services/nix.nix b/services/services/nix.nix
new file mode 100644
index 0000000..bd562ec
--- /dev/null
+++ b/services/services/nix.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  nix = {
+    #    gc = {
+    #      automatic = true;
+    #      dates = "daily";
+    #      options = "--delete-older-than 3";
+    #    };
+    settings = {
+      auto-optimise-store = true;
+      experimental-features = ["nix-command" "flakes"];
+    };
+  };
+}
diff --git a/services/opensshd.nix b/services/services/opensshd.nix
index cb9f2ba..cb9f2ba 100644
--- a/services/opensshd.nix
+++ b/services/services/opensshd.nix
diff --git a/services/rust-motd.nix b/services/services/rust-motd.nix
index 21bc1cd..21bc1cd 100644
--- a/services/rust-motd.nix
+++ b/services/services/rust-motd.nix