diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-10-28 23:46:11 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-10-28 23:46:11 +0200 |
| commit | 962e6c0a9abd7a54b739a473fff20451df8f4ebd (patch) | |
| tree | ded8519a53f0224aad837b957a92ebabedbee427 /custom | |
| parent | 663c4110fcb9fd21c9a8134ceb1b48ab3aa45a54 (diff) | |
| download | nixos-962e6c0a9abd7a54b739a473fff20451df8f4ebd.tar nixos-962e6c0a9abd7a54b739a473fff20451df8f4ebd.tar.gz nixos-962e6c0a9abd7a54b739a473fff20451df8f4ebd.tar.bz2 nixos-962e6c0a9abd7a54b739a473fff20451df8f4ebd.tar.xz nixos-962e6c0a9abd7a54b739a473fff20451df8f4ebd.zip | |
typing
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/tinc/def.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix index 0fa0b912..c360c4d5 100644 --- a/custom/tinc/def.nix +++ b/custom/tinc/def.nix | |||
| @@ -143,9 +143,9 @@ in | |||
| 143 | } // data.interfaceConfig) | 143 | } // data.interfaceConfig) |
| 144 | ); | 144 | ); |
| 145 | 145 | ||
| 146 | networking.networkmanager.dispatcherScripts = flip mapAttrs' cfg.networks (network: data: optional data.nmDispatch { | 146 | networking.networkmanager.dispatcherScripts = flatten (flip mapAttrs' cfg.networks (network: data: optional data.nmDispatch { |
| 147 | type = "basic"; | 147 | type = "basic"; |
| 148 | source = pkgs.writeScript "connectRemotes.sh" '' | 148 | source = pkgs.writeScript "connect-${network}.sh" '' |
| 149 | #!${pkgs.stdenv.shell} | 149 | #!${pkgs.stdenv.shell} |
| 150 | 150 | ||
| 151 | shopt -s extglob | 151 | shopt -s extglob |
| @@ -156,7 +156,7 @@ in | |||
| 156 | ;; | 156 | ;; |
| 157 | esac | 157 | esac |
| 158 | ''; | 158 | ''; |
| 159 | }); | 159 | })); |
| 160 | 160 | ||
| 161 | systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair | 161 | systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair |
| 162 | ("tinc.${network}") | 162 | ("tinc.${network}") |