summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/emacs.nix2
-rw-r--r--modules/wg/module.nix27
2 files changed, 14 insertions, 15 deletions
diff --git a/modules/emacs.nix b/modules/emacs.nix
index 39c2db8..13ce0ee 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -55,6 +55,6 @@
]
)
);
- defaultEditor = lib.mkForce true;
+ defaultEditor = lib.mkForce false;
};
}
diff --git a/modules/wg/module.nix b/modules/wg/module.nix
index 1bb6f41..53ed2bb 100644
--- a/modules/wg/module.nix
+++ b/modules/wg/module.nix
@@ -18,20 +18,19 @@
name = "30-wg-${net.networkName}";
value = {
matchConfig.Name = "wg-${net.networkName}";
- networkConfig =
- {
- Address = net.hosts.${currenthost}.address;
- IPv6AcceptRA = false; # for now static IPv6
- }
- // (
- if net.hosts.${currenthost}.endpoint.enable then
- {
- IPv4Forwarding = true;
- IPv6Forwarding = true;
- }
- else
- { }
- );
+ networkConfig = {
+ Address = net.hosts.${currenthost}.address;
+ IPv6AcceptRA = false; # for now static IPv6
+ }
+ // (
+ if net.hosts.${currenthost}.endpoint.enable then
+ {
+ IPv4Forwarding = true;
+ IPv6Forwarding = true;
+ }
+ else
+ { }
+ );
};
}) networks;