diff options
| author | makefu <github@syntax-fehler.de> | 2019-04-17 21:48:16 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-04-17 21:48:16 +0200 |
| commit | 12f77bbed628e4071ac300af77857815be97a344 (patch) | |
| tree | 4f8233712a96ac5a38a386e1cc9df24de8a2b31a /lass/1systems/green/config.nix | |
| parent | e9743b162d51c4eb04d7939f8445e1acaa2d723d (diff) | |
| parent | d0d3fcb2d2b9ed82dd1ff2864b9fbbd88aa65ff4 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems/green/config.nix')
| -rw-r--r-- | lass/1systems/green/config.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lass/1systems/green/config.nix b/lass/1systems/green/config.nix index 6ae157e38..0b4b50ee4 100644 --- a/lass/1systems/green/config.nix +++ b/lass/1systems/green/config.nix @@ -8,20 +8,13 @@ with import <stockholm/lib>; <stockholm/lass/2configs/exim-retiolum.nix> <stockholm/lass/2configs/mail.nix> - #<stockholm/lass/2configs/blue.nix> <stockholm/lass/2configs/syncthing.nix> + <stockholm/lass/2configs/sync/decsync.nix> + <stockholm/lass/2configs/sync/weechat.nix> ]; krebs.build.host = config.krebs.hosts.green; - krebs.syncthing.folders = [ - { id = "contacts"; path = "/home/lass/contacts"; peers = [ "mors" "blue" "green" "phone" ]; } - ]; - lass.ensure-permissions = [ - { folder = "/home/lass/contacts"; owner = "lass"; group = "syncthing"; } - ]; - - #networking.nameservers = [ "1.1.1.1" ]; #time.timeZone = "Europe/Berlin"; |