diff options
| author | tv <tv@krebsco.de> | 2019-04-17 22:04:03 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2019-04-17 22:04:03 +0200 |
| commit | ffd36f5554256f74beb6ade469666b00f72b22a9 (patch) | |
| tree | 51e77c75388d9f9e032bdb09427bcaace2b846c7 /lass/1systems/green | |
| parent | e051fecf9c19d446d6588bd21070fd1a799b97a3 (diff) | |
| parent | 1314eb9284697b46d8208c138cf2349816e15c5f (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'lass/1systems/green')
| -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"; |