summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-11-17 20:01:18 +0100
committerlassulus <lassulus@lassul.us>2020-11-17 20:01:18 +0100
commit2041c1fb9e1265fa02e443b704bfb55527108954 (patch)
tree9e34c403594eb4d37bfea8c6813129e0d931aec5 /makefu/1systems
parent2fce838d369dfe4dfffc19830272daaba95e2dea (diff)
parentf911324c592ebd7809472a4100a8f6a6c83b0fe2 (diff)
Merge remote-tracking branch 'gum/20.09' into 20.09
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/omo/config.nix1
-rw-r--r--makefu/1systems/sdev/config.nix9
2 files changed, 6 insertions, 4 deletions
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}";
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 = [