diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-13 02:12:39 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-01-13 02:13:51 +0100 |
| commit | 5df343aae5fcb7f4d3f2730b02c59a2c7af6f2fe (patch) | |
| tree | 5ac89e92c1668c9a130455621f3696c0477e044d | |
| parent | 9e87afcb4e35be6035991fdf15dfd1681183f0a7 (diff) | |
networking: rename networkservices -> knownNetworkServices
| -rw-r--r-- | modules/alias.nix | 7 | ||||
| -rw-r--r-- | modules/networking/default.nix | 10 | ||||
| -rw-r--r-- | tests/networking-networkservices.nix | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/modules/alias.nix b/modules/alias.nix index 21dfd45..bd372fe 100644 --- a/modules/alias.nix +++ b/modules/alias.nix @@ -9,6 +9,7 @@ in { options = { + networking.networkservices = mkOption { internal = true; default = null; }; nix.profile = mkOption { internal = true; default = null; }; security.enableAccessibilityAccess = mkOption { internal = true; default = null; }; security.accessibilityPrograms = mkOption { internal = true; default = null; }; @@ -22,6 +23,12 @@ in { assertion = config.security.enableAccessibilityAccess == null; message = "security.enableAccessibilityAccess was removed, it's broken since 10.12 because of SIP"; } ]; + warnings = mkIf (config.networking.networkservices != null) [ + "networking.networkservices was renamed to networking.knownNetworkServices" + ]; + + networking.knownNetworkServices = mkIf (config.networking.networkservices != null) config.networking.networkservices; + nix.package = mkIf (config.nix.profile != null) config.nix.profile; }; diff --git a/modules/networking/default.nix b/modules/networking/default.nix index 9ba1fe5..9f4ca8c 100644 --- a/modules/networking/default.nix +++ b/modules/networking/default.nix @@ -14,7 +14,7 @@ let scutil --set HostName '${cfg.hostName}' ''; - setNetworkServices = optionalString (cfg.networkservices != []) '' + setNetworkServices = optionalString (cfg.knownNetworkServices != []) '' networkservices=$(networksetup -listallnetworkservices) ${concatMapStringsSep "\n" (srv: '' case "$networkservices" in @@ -23,7 +23,7 @@ let networksetup -setsearchdomains '${srv}' ${quoteStrings (emptyList cfg.search)} ;; esac - '') cfg.networkservices} + '') cfg.knownNetworkServices} ''; in @@ -36,7 +36,7 @@ in description = "Hostname for your machine."; }; - networking.networkservices = mkOption { + networking.knownNetworkServices = mkOption { type = types.listOf types.str; default = []; example = [ "Wi-Fi" "Ethernet Adaptor" "Thunderbolt Ethernet" ]; @@ -65,8 +65,8 @@ in config = { warnings = [ - (mkIf (cfg.networkservices == [] && cfg.dns != []) "networking.networkservices is empty, dns servers will not be configured.") - (mkIf (cfg.networkservices == [] && cfg.search != []) "networking.networkservices is empty, dns searchdomains will not be configured.") + (mkIf (cfg.knownNetworkServices == [] && cfg.dns != []) "networking.knownNetworkServices is empty, dns servers will not be configured.") + (mkIf (cfg.knownNetworkServices == [] && cfg.search != []) "networking.knownNetworkServices is empty, dns searchdomains will not be configured.") ]; system.defaults.smb.NetBIOSName = cfg.hostName; diff --git a/tests/networking-networkservices.nix b/tests/networking-networkservices.nix index ceb6fd8..4621317 100644 --- a/tests/networking-networkservices.nix +++ b/tests/networking-networkservices.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - networking.networkservices = [ "Wi-Fi" "Thunderbolt Ethernet" ]; + networking.knownNetworkServices = [ "Wi-Fi" "Thunderbolt Ethernet" ]; networking.dns = [ "8.8.8.8" "8.8.4.4" ]; test = '' |