update 2020.3

configuration.nix

@@ -29,6 +29,12 @@
     # should.
     system = {
         stateVersion = "17.09"; # Did you read the comment?
-        autoUpgrade.enable = true;
+        autoUpgrade = {
+		enable = true;
+		allowReboot = true;
+	};
     };
+
+    security.acme.email = "stubbfel@posteo.de";
+    security.acme.acceptTerms = true;
 }

i18n.nix

@@ -2,10 +2,8 @@
 
 {
     # Select internationalisation properties.
-    i18n = {
+    i18n.defaultLocale = "de_DE.UTF-8";    
-        consoleKeyMap = "de";
+    console.keyMap= "de";	
-        defaultLocale = "de_DE.UTF-8";
-    };
 
     # Set your time zone.
     time.timeZone = "Europe/Amsterdam";

module/news2kindle/news2kindle.nix

@@ -71,7 +71,7 @@ calibreWithRecipes = pkgs.calibre.overrideAttrs (oldAttrs: rec {
     cp -ravf recipes $out/var/news2kindle
     ''+ oldAttrs.installPhase ;
 
-    buildInputs = (remove pkgs.python2Packages.odfpy oldAttrs.buildInputs) ++ [odfpyNoTest];
+    buildInputs = (remove pkgs.python2Packages.odfpy oldAttrs.buildInputs) ++ [odfpyNoTest pkgs.python27Packages.feedparser];
 
 #    patches = oldAttrs.patches ++  [./calibre-disable_plugins.patch];
 #    patches = [./calibre-disable_plugins.patch];

programs/installed.nix

@@ -2,7 +2,7 @@
 
 {
     environment.systemPackages = with pkgs; [
-        wget curl vim nano zsh fzf tmux git exa progress tldr
+        wget curl vim nano zsh fzf tmux git exa progress tldr steamcmd
     ];
 
     imports =

services/7dtd.nix

@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+let
+
+ runEnv = (pkgs.buildFHSUserEnv {
+    name = "7dtd-env";
+    targetPkgs = pkgs: (with pkgs;
+    [
+    ]);
+    runScript = "bash startserver.sh -configfile=serverconfig.xml";
+  });
+
+in
+{
+
+  networking.firewall.allowedTCPPorts = [26900];
+  networking.firewall.allowedUDPPorts = [26900 26901 26902];
+#7DaysToDie.stubbe.rocks
+
+#  services.nginx.virtualHosts."7daystodie.stubbe.rocks" = {
+#        enableACME = true;
+#        forceSSL = false;
+#        locations."/".proxyPass = "http://localhost:8085";
+#  };
+
+  systemd.services.sdtd = {
+    description = "7dtd";
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "simple";
+      User = "sshuser";
+      Group = "users";
+      WorkingDirectory = "/home/sshuser/SteamCMD7_Days_to_Die_server";     
+      ExecStart = "${runEnv}/bin/7dtd-env";
+      Restart = "always";
+    };
+  };
+
+
+}
+

services/enabled.nix

@@ -3,6 +3,7 @@
 {
     imports =
     [
+	./7dtd.nix 
         ./sshd.nix
         ./teamspeak.nix
         ./nginx.nix

services/nextcloud.nix

@@ -2,7 +2,7 @@
 
 {
 
-    environment.systemPackages = with pkgs; [ nextcloud ];
+    environment.systemPackages = with pkgs; [ nextcloud18 ];
 
     services.nginx.virtualHosts."cloud.stubbe.rocks" = {
         enableACME = true;

services/nginx.nix

@@ -3,7 +3,7 @@
 
 {
 
-networking.firewall.allowedTCPPorts = [80 443];
+networking.firewall.allowedTCPPorts = [80 443 ];
 
 services.nginx = {
 	appendHttpConfig= ''server_names_hash_bucket_size 64;'';

services/teamspeak.nix

@@ -12,9 +12,9 @@ in
 	9987 # ts port
     ];
 
-#    nixpkgs.config.packageOverrides = pkgs: {
+    nixpkgs.config.packageOverrides = pkgs: {
-#	teamspeak_server = unstable.teamspeak_server;
+	teamspeak_server = unstable.teamspeak_server;
-#   };
+   };
 
     services.teamspeak3= {
         enable = true;