diff options
| author | lassulus <lass@blue.r> | 2018-09-04 20:11:18 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-04 20:11:18 +0200 |
| commit | 58fe54d3f9ae616bbb3f9b0366bb7bd5b96a099d (patch) | |
| tree | 9763541597c67dd2ff833995ddddc31b8de679ab | |
| parent | c1e692217834de86416b04c04958c791113b11cc (diff) | |
| parent | 228ca863767edc07ae50c82034d873ee7ef17310 (diff) | |
Merge remote-tracking branch 'prism/staging/jeschli'
| -rw-r--r-- | jeschli/1systems/brauerei/config.nix | 1 | ||||
| -rw-r--r-- | jeschli/1systems/enklave/config.nix | 1 | ||||
| -rw-r--r-- | jeschli/2configs/retiolum.nix | 2 | ||||
| -rw-r--r-- | jeschli/2configs/steam.nix | 12 | ||||
| -rw-r--r-- | krebs/3modules/jeschli/default.nix | 1 |
5 files changed, 16 insertions, 1 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index e200cbcd4..4cd544a66 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -8,6 +8,7 @@ <stockholm/jeschli/2configs/emacs.nix> <stockholm/jeschli/2configs/xdg.nix> <stockholm/jeschli/2configs/xserver> + <stockholm/jeschli/2configs/steam.nix> <stockholm/jeschli/2configs/virtualbox.nix> ]; diff --git a/jeschli/1systems/enklave/config.nix b/jeschli/1systems/enklave/config.nix index 470566a8b..cadec3cab 100644 --- a/jeschli/1systems/enklave/config.nix +++ b/jeschli/1systems/enklave/config.nix @@ -5,6 +5,7 @@ <stockholm/jeschli> <stockholm/jeschli/2configs/retiolum.nix> <stockholm/jeschli/2configs/IM.nix> + <stockholm/jeschli/2configs/git.nix> <stockholm/jeschli/2configs/os-templates/CentOS-7-64bit.nix> { networking.dhcpcd.allowInterfaces = [ diff --git a/jeschli/2configs/retiolum.nix b/jeschli/2configs/retiolum.nix index b611cbe7d..f22609655 100644 --- a/jeschli/2configs/retiolum.nix +++ b/jeschli/2configs/retiolum.nix @@ -17,7 +17,7 @@ tinc = pkgs.tinc_pre; }; - networking.firewall.allowedTCPPorts = [ 655 ]; + networking.firewall.allowedTCPPorts = [ 80 655 ]; networking.firewall.allowedUDPPorts = [ 655 ]; environment.systemPackages = [ diff --git a/jeschli/2configs/steam.nix b/jeschli/2configs/steam.nix new file mode 100644 index 000000000..06a068a3f --- /dev/null +++ b/jeschli/2configs/steam.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: + +{ + + nixpkgs.config.steam.java = true; + environment.systemPackages = with pkgs; [ + steam + ]; + hardware.opengl.driSupport32Bit = true; + + #ports for inhome streaming +} diff --git a/krebs/3modules/jeschli/default.nix b/krebs/3modules/jeschli/default.nix index ed9bfad29..ab8fe097d 100644 --- a/krebs/3modules/jeschli/default.nix +++ b/krebs/3modules/jeschli/default.nix @@ -132,6 +132,7 @@ with import <stockholm/lib>; ip6.addr = "42::30"; aliases = [ "enklave.r" + "cgit.enklave.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- |