From 838a55807fad78514b52e5771210db5191a61be1 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Fri, 14 Oct 2022 10:30:52 +0200 Subject: [PATCH] Add nm-networks per machine --- machines/nucturne/default.nix | 4 ++++ machines/stel-xps/default.nix | 6 ++++++ modules/network-manager/default.nix | 14 +++++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/machines/nucturne/default.nix b/machines/nucturne/default.nix index da20b12..b541340 100644 --- a/machines/nucturne/default.nix +++ b/machines/nucturne/default.nix @@ -35,6 +35,10 @@ # add TUD vpn openvpn.enable = true; + # nm-networks + networking.nmConnections = [ + ]; + # enable sops sops = { enable = true; diff --git a/machines/stel-xps/default.nix b/machines/stel-xps/default.nix index dca968b..aa01c9d 100644 --- a/machines/stel-xps/default.nix +++ b/machines/stel-xps/default.nix @@ -37,6 +37,12 @@ # add TUD vpn openvpn.enable = true; + # nm-networks + networking.nmConnections = [ + "tartaros" + "eduroam" + ]; + # enable sops sops = { enable = true; diff --git a/modules/network-manager/default.nix b/modules/network-manager/default.nix index 6be7aee..521e4ad 100644 --- a/modules/network-manager/default.nix +++ b/modules/network-manager/default.nix @@ -5,14 +5,18 @@ ... }: with lib; { - options.elss.networking.useNetworkManager = mkEnableOption "enable networkmanager"; + options.elss.networking = { + useNetworkManager = mkEnableOption "enable networkmanager"; + nmConnections = mkOption { + type = types.listOf types.str; + description = "Connections to instantiate for the machine"; + default = []; + }; + }; config = let hostName = config.system.name; - connections = [ - "tartaros" - "eduroam" - ]; + connections = config.elss.networking.nmConnections; mkSopsSecrets = connection: { "${connection}" = {