summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-12-01 14:04:07 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-12-01 14:04:07 +0100
commit8a2017bc1ae62362c256cc0a18f4226291c027ea (patch)
tree2c9069404d01fe769e452baaa3e90e89fbf3fa63
parent3c65a41b89dd539de55e897e32c74b12a5c07a5a (diff)
downloadnixos-8a2017bc1ae62362c256cc0a18f4226291c027ea.tar
nixos-8a2017bc1ae62362c256cc0a18f4226291c027ea.tar.gz
nixos-8a2017bc1ae62362c256cc0a18f4226291c027ea.tar.bz2
nixos-8a2017bc1ae62362c256cc0a18f4226291c027ea.tar.xz
nixos-8a2017bc1ae62362c256cc0a18f4226291c027ea.zip
yggdrasil-wg: networkmanager unmanaged
-rw-r--r--hosts/sif/default.nix1
-rw-r--r--modules/yggdrasil-wg/default.nix1
2 files changed, 1 insertions, 1 deletions
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index bdd6653a..b79dc6ef 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -302,7 +302,6 @@
302 services.udev.extraRules = with pkgs; lib.mkAfter '' 302 services.udev.extraRules = with pkgs; lib.mkAfter ''
303 SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${systemd}/bin/systemctl --no-block stop ac-plugged.service" 303 SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${systemd}/bin/systemctl --no-block stop ac-plugged.service"
304 SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${systemd}/bin/systemctl --no-block start ac-plugged.service" 304 SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${systemd}/bin/systemctl --no-block start ac-plugged.service"
305 ACTION=="add", SUBSYSTEM=="net", DEVTYPE!="?*", ATTR{address}=="3c:e1:a1:b9:cd:e5", NAME="dock0"
306 ''; 305 '';
307 306
308 services.borgbackup = { 307 services.borgbackup = {
diff --git a/modules/yggdrasil-wg/default.nix b/modules/yggdrasil-wg/default.nix
index c3940d4d..b1d4ee5d 100644
--- a/modules/yggdrasil-wg/default.nix
+++ b/modules/yggdrasil-wg/default.nix
@@ -217,5 +217,6 @@ in {
217 217
218 boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard ++ [kernel.batman_adv]; 218 boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard ++ [kernel.batman_adv];
219 environment.systemPackages = with pkgs; [ wireguard-tools batctl ]; 219 environment.systemPackages = with pkgs; [ wireguard-tools batctl ];
220 services.udev.extraRules = mkIf config.networking.networkmanager.enable (lib.mkAfter (concatMapStringsSep "\n" (dev: "ACTION==\"add\", SUBSYSTEM==\"net\", KERNEL==\"${dev}\", ENV{NM_UNMANAGED}=\"1\"") (["yggdrasil"] ++ map (family: "yggdrasil-wg-${family}") hostFamilies ++ concatMap (family: map ({from, to, ...}: let other = if thisHost from then to else from; in "yggre-${other}-${family}") hostLinks.${family}) hostFamilies)));
220 }; 221 };
221} 222}