From 3fdd49c0d4cafd6dcfcbffeb41441986a6331d8e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 16 Nov 2020 21:22:52 +0100
Subject: ma omo.r: enable direct connect to gum share

---
 makefu/1systems/omo/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index dd89b4057..cbe97e28a 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -47,6 +47,7 @@ in {
       # <stockholm/makefu/2configs/legacy_only.nix>
 
       <stockholm/makefu/2configs/share/omo.nix>
+      <stockholm/makefu/2configs/share/gum-client.nix>
       <stockholm/makefu/2configs/dcpp/airdcpp.nix>
       { krebs.airdcpp.dcpp.shares = let
           d = path: "/media/cryptX/${path}";
-- 
cgit v1.2.3


From d1b32e88cbc5fb42e659331660c223284ac0426e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 16 Nov 2020 22:15:04 +0100
Subject: ma sdev.r: disable torbrowser

---
 makefu/1systems/sdev/config.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index e3c59e181..d02c30342 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -37,10 +37,11 @@
     passwdqc-utils
     gnupg
     populate
-    (pkgs.writeScriptBin "tor-browser" ''
-      #! /bin/sh
-      TOR_SKIP_LAUNCH=1 ${torbrowser}/bin/tor-browser
-    '')
+    # 20.09: torbrowser is broken
+    #(pkgs.writeScriptBin "tor-browser" ''
+    #  #! /bin/sh
+    #  TOR_SKIP_LAUNCH=1 ${torbrowser}/bin/tor-browser
+    #'')
   ];
 
   networking.firewall.allowedTCPPorts = [
-- 
cgit v1.2.3


From a06144cc89556519ee5ede5c22fb02c9596cfaca Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Nov 2020 20:07:20 +0100
Subject: ma gum.r: disable gitlab-runner

---
 makefu/1systems/gum/config.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index d0ba1a3c6..f65c6672b 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -82,8 +82,12 @@ in {
       # ci
       # <stockholm/makefu/2configs/exim-retiolum.nix>
       <stockholm/makefu/2configs/git/cgit-retiolum.nix>
+
+      ###### Shack #####
       # <stockholm/makefu/2configs/shack/events-publisher>
-      <stockholm/makefu/2configs/shack/gitlab-runner>
+      # <stockholm/makefu/2configs/shack/gitlab-runner>
+
+
       <stockholm/makefu/2configs/remote-build/slave.nix>
       <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
       <stockholm/makefu/2configs/taskd.nix>
-- 
cgit v1.2.3


From 63b119a4b319ffeb5a7c7e72e5d04e5ea4bf083b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 18 Nov 2020 23:57:02 +0100
Subject: ma omo.r: zigbee2mqtt is included via ham

---
 makefu/1systems/omo/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index cbe97e28a..a9e307ddf 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -92,7 +92,6 @@ in {
       <stockholm/makefu/2configs/bluetooth-mpd.nix>
 
       <stockholm/makefu/2configs/ham>
-      <stockholm/makefu/2configs/ham/zigbee2mqtt>
       {
         makefu.ps3netsrv = {
           enable = true;
-- 
cgit v1.2.3