summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-07-07 23:33:49 +0200
committerlassulus <lass@aidsballs.de>2016-07-07 23:33:49 +0200
commit18ff162945aa66192e89b5b57c49e4b4fe122f64 (patch)
treec99bc60647988323c3054add53dc538fe78e9861 /makefu/1systems
parentf4b2262c7eb07a4b66a9352e9851e9e94c13b540 (diff)
parentfa2eb245f30df9f69720ec5853b2c15dd67cdf28 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/pornocauster.nix2
-rw-r--r--makefu/1systems/wbob.nix45
2 files changed, 28 insertions, 19 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 7b6c18342..2ab030916 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -64,7 +64,7 @@
# configure pulseAudio to provide a HDMI sink as well
networking.firewall.enable = true;
- networking.firewall.allowedTCPPorts = [ 80 ];
+ networking.firewall.allowedTCPPorts = [ 80 24800 ];
networking.firewall.allowedUDPPorts = [ 665 ];
krebs.build.host = config.krebs.hosts.pornocauster;
diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix
index b4f7c9058..45b935af0 100644
--- a/makefu/1systems/wbob.nix
+++ b/makefu/1systems/wbob.nix
@@ -1,5 +1,10 @@
{ config, pkgs, ... }:
{
+ makefu.awesome = {
+ modkey = "Mod1";
+ #TODO: integrate kiosk config into full config by templating the autostart
+ baseConfig = pkgs.awesomecfg.kiosk;
+ };
imports =
[ # Include the results of the hardware scan.
../.
@@ -10,6 +15,15 @@
retiolum.enable = true;
build.host = config.krebs.hosts.wbob;
};
+ networking.firewall.allowedUDPPorts = [ 1655 ];
+ networking.firewall.allowedTCPPorts = [ 1655 ];
+ services.tinc.networks.siem = {
+ name = "display";
+ extraConfig = ''
+ ConnectTo = sjump
+ Port = 1655
+ '';
+ };
# rt2870.bin wifi card, part of linux-unfree
hardware.enableAllFirmware = true;
@@ -39,23 +53,18 @@
xrandr --output HDMI2 --right-of HDMI1
'';
};
- ## TODO Awesomecfg + autostart chrome
- #
- #local current_screen = 1
- #awful.rules.rules = {
- # { rule = { class = "chromium-browser" },
- # callback = function()
- # awful.client.movetotag(tags[current_screen][1],c)
- # if (current_screen == 1) then
- # current_screen = current_screen+1
- # else
- # current_screen = current_screen-1
- # end
- # end
- # },
- #}
- #awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values")
- # prevent Race Condition
- #awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast")
+ # TODO: update synergy package with these extras (username)
+ # TODO: add crypto layer
+ systemd.services."synergy-client" = {
+ environment.DISPLAY = ":0";
+ serviceConfig.User = "makefu";
+ };
+ services.synergy = {
+ client = {
+ enable = true;
+ screenName = "wbob";
+ serverAddress = "pornocauster.r";
+ };
+ };
}