net: rework NM support

Non-GUI packages moved to base+nm pkglist to enable standalone
installation of those; and GTK bits left in desktop+nm for use
by images lacking their own new and improved(tm) variant.

Note that both GNOME3 and KDE4 aren't lacking anymore.

features.in/net/config.mk

@@ -8,8 +8,9 @@ use/net: use/services
 use/net/dhcp: use/net
 	@$(call add,THE_PACKAGES,dhcpcd)
 
+# base service, no GUI
 use/net/nm: use/net
-	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_LISTS,$(call tags,base nm))
 	@$(call add,LIVE_PACKAGES,livecd-save-nfs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up

pkg.in/lists/tagged/base+nm

@@ -0,0 +1,10 @@
+NetworkManager
+
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+
+# this one pulls strongswan, a bit too much?
+#NetworkManager-l2tp
+
+usb-modeswitch

pkg.in/lists/tagged/desktop+nm

@@ -1,10 +1,8 @@
-NetworkManager
-NetworkManager-vpnc
-NetworkManager-openvpn
-NetworkManager-pptp
-#NetworkManager-l2tp
-NetworkManager-openvpn-gnome
-NetworkManager-pptp-gnome
-NetworkManager-vpnc-gnome
-#NetworkManager-l2tp-gnome
-usb-modeswitch
+NetworkManager-applet-gtk
+
+NetworkManager-openvpn-gtk
+NetworkManager-pptp-gtk
+NetworkManager-vpnc-gtk
+
+# pulls in strongswan
+#NetworkManager-l2tp-gtk