diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2017-08-15 23:42:48 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-30 02:58:29 +0200 |
| commit | bd545892332ede39cd5c1c0ba26e7101b0d2c971 (patch) | |
| tree | f80475cf7c5c859a764edc42db131b4bca74ecf3 /nixos/modules | |
| parent | c699694cbf4400480fe4267b7bee33b77747db07 (diff) | |
| download | nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.tar nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.tar.gz nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.tar.bz2 nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.tar.lz nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.tar.xz nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.tar.zst nixlib-bd545892332ede39cd5c1c0ba26e7101b0d2c971.zip | |
networkmanager_iodine: init at 1.2.0
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/no-x-libs.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 11 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 4b7787302521..ae3e17ac27b6 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -34,6 +34,7 @@ with lib; networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; }; networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; + networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; }; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2b7086afe7e8..e03309c87299 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -130,7 +130,8 @@ in { default = { inherit networkmanager modemmanager wpa_supplicant networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect networkmanager_fortisslvpn - networkmanager_pptp networkmanager_l2tp; }; + networkmanager_pptp networkmanager_l2tp + networkmanager_iodine; }; internal = true; }; @@ -255,6 +256,9 @@ in { { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name"; } + { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; + target = "NetworkManager/VPN/nm-iodine-service.name"; + } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; @@ -278,6 +282,11 @@ in { name = "nm-openvpn"; uid = config.ids.uids.nm-openvpn; extraGroups = [ "networkmanager" ]; + } + { + name = "nm-iodine"; + isSystemUser = true; + group = "networkmanager"; }]; systemd.packages = cfg.packages; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 2434aa1654a6..0abdc27bbfc6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -186,7 +186,8 @@ in { networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; inherit (gnome3) networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp + networkmanager_openconnect networkmanager_fortisslvpn + networkmanager_pptp networkmanager_iodine networkmanager_l2tp; }; # Needed for themes and backgrounds |