Merge remote-tracking branch 'gum/20.03'

7 files changed, 13 insertions, 12 deletions

diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index 43c2798d5..eb27aa34d 100644
--- a/krebs/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -301,6 +301,7 @@ let
       default = mkDefault true;
       inherit (webcfg) basicAuth;
       root = optionalString rucfg.enable webdir;
+      listen = [ { inherit (webcfg) addr port; } ];
 
       locations = {
         "/RPC2".extraConfig = ''
@@ -319,15 +320,7 @@ let
           include ${pkgs.nginx}/conf/fastcgi.conf;
         ''; }
       );
-    # workaround because upstream nginx api changed
-    # TODO remove when nobody uses 17.03 anymore
-    } // (if hasAttr "port" (head options.services.nginx.virtualHosts.type.getSubModules).submodule.options then {
-      port = webcfg.port;
-    } else {
-      listen = [
-        { inherit (webcfg) addr port; }
-      ];
-    });
+    };
   };
 
   rutorrent-imp = {
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 0cbb5efe7..6166b87c3 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -85,4 +85,8 @@ with import <stockholm/lib>;
     RuntimeMaxUse=128M
     '';
   environment.pathsToLink = [ "/share" ];
+  security.acme = {
+    email = "letsencrypt@syntax-fehler.de";
+    acceptTerms = true;
+  };
 }
diff --git a/makefu/2configs/gui/urxvtd.nix b/makefu/2configs/gui/urxvtd.nix
index 286b87ab3..cb6c25840 100644
--- a/makefu/2configs/gui/urxvtd.nix
+++ b/makefu/2configs/gui/urxvtd.nix
@@ -10,7 +10,7 @@ in {
     serviceConfig = {
       SyslogIdentifier = "urxvtd";
       ExecReload = "${pkgs.coreutils}/bin/echo NOP";
-      ExecStart = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtd";
+      ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd";
       Restart = "always";
       RestartSec = "2s";
       StartLimitBurst = 0;
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 6da1a37e7..5d409b8df 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -12,7 +12,7 @@
 
     windowManager = lib.mkForce {
       awesome.enable = false;
-      default = "none";
+      default = "xfce";
     };
     desktopManager.xfce = {
       extraSessionCommands = ''
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 0dc7f256b..1f4ceea6c 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -9,6 +9,7 @@
     home-manager.users.makefu.home.packages = [ pkgs.bat ];
       home-manager.users.makefu.programs.zsh.shellAliases = {
         cat = "bat --style=header,snip";
+        mirage = "sxiv"; # only available when tools/extra-gui is in use
         catn = "${pkgs.coreutils}/bin/cat";
         ncat = "${pkgs.coreutils}/bin/cat";
       };
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 7c01104a0..49b36a5d7 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -4,7 +4,7 @@
   users.users.makefu.packages = with pkgs;[
     # media
     gimp
-    mirage
+    # mirage - last time available in 19.09
     inkscape
     libreoffice
     # skype
diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index 2c8ca399d..0998a695e 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 
 {
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.0.2u" # required for studio-link
+  ];
   users.users.makefu.packages = with pkgs; [
     obs-studio
     studio-link