summary refs log tree commit diff
diff options
context:
space:
mode:
authorTomasz Kontusz <tomasz.kontusz@gmail.com>2015-11-07 14:06:33 +0100
committerRok Garbas <rok@garbas.si>2015-11-10 12:20:55 +0100
commit6681c66db865a65a1ccdd321a6100c8d50887ac5 (patch)
tree91265f1e974c817cab774f860b703ee43faecd29
parent91fe21c854407dede0776e7bda415ae5b62d744a (diff)
downloadnixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.tar
nixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.tar.gz
nixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.tar.bz2
nixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.tar.lz
nixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.tar.xz
nixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.tar.zst
nixpkgs-6681c66db865a65a1ccdd321a6100c8d50887ac5.zip
networkmanager service: add unmanaged option
-rw-r--r--nixos/modules/services/networking/networkmanager.nix17
1 files changed, 14 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 39dcd5fef60..7df194fa419 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -14,9 +14,10 @@ let
     plugins=keyfile
 
     [keyfile]
-    ${optionalString (config.networking.hostName != "") ''
-      hostname=${config.networking.hostName}
-    ''}
+    ${optionalString (config.networking.hostName != "")
+      ''hostname=${config.networking.hostName}''}
+    ${optionalString (cfg.unmanaged != [])
+      ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''}
 
     [logging]
     level=WARN
@@ -97,6 +98,16 @@ in {
         '';
       };
 
+      unmanaged = mkOption {
+        type = types.listOf types.string;
+        default = [];
+        description = ''
+          List of interfaces that will not be managed by NetworkManager.
+          Interface name can be specified here, but if you need more fidelity
+          see "Device List Format" in NetworkManager.conf man page.
+        '';
+      };
+
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
         type = types.attrsOf types.path;