diff options
| author | lassulus <lassulus@lassul.us> | 2017-12-05 18:46:48 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-12-05 18:46:48 +0100 |
| commit | 8030352c450432a0cee14f561241831875f8399b (patch) | |
| tree | 832fc539497da14ec7d90e1540cb8093ca63cfbd /krebs/3modules | |
| parent | 18fad9c618be468d3a8e902ee2e23143e598163c (diff) | |
| parent | 704096c93e91f0b71d257028401b52d6da03c073 (diff) | |
Merge branch 'prism/master' into HEAD
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/fetchWallpaper.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix index 8d4933cb5..f67188122 100644 --- a/krebs/3modules/fetchWallpaper.nix +++ b/krebs/3modules/fetchWallpaper.nix @@ -27,7 +27,7 @@ let }; display = mkOption { type = types.str; - default = ":0"; + default = ":${toString config.services.xserver.display}"; }; unitConfig = mkOption { type = types.attrsOf types.str; diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 867f1bd34..d2c3000d6 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -449,8 +449,6 @@ with import <stockholm/lib>; retiolum = rec { via = internet; addrs = [ - # edinburgh university - "129.215.0.0/16" ip4.addr ip6.addr ]; @@ -472,6 +470,10 @@ with import <stockholm/lib>; lyK301Jb42wGEsVWxu3Eo/PLtp8OdD+Wdh6o/ELcc0k/YCUGFMujUM8CAwEAAQ== -----END RSA PUBLIC KEY----- ''; + tinc.subnets = [ + # edinburgh university + "129.215.0.0/16" + ]; }; }; }; |