summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs3
-rw-r--r--src/Propellor/Property/XFCE.hs7
2 files changed, 8 insertions, 2 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 37b8fafb..1be4ff14 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -118,9 +118,10 @@ demo = host "demo" $ props
& root `User.hasInsecurePassword` "debian"
& user `User.hasInsecurePassword` "debian"
& XFCE.installedMin
+ & XFCE.networkManager
& XFCE.defaultPanelFor user File.OverwriteExisting
& LightDM.autoLogin user
- & Apt.installed ["network-manager", "network-manager-gnome", "firefox"]
+ & Apt.installed ["firefox"]
where
user = User "user"
root = User "root"
diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index 6241326e..dc57660f 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -10,11 +10,16 @@ installed = Apt.installed ["task-xfce-desktop"]
`describe` "XFCE desktop installed"
-- | Minimal install of XFCE, with a terminal emulator and panel,
--- and X, but not any of the extras.
+-- and X and network-manager, but not any of the extra apps.
installedMin :: Property DebianLike
installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
`describe` "minimal XFCE desktop installed"
+-- | Installs network-manager-gnome, which is the way to get
+-- network-manager to manage networking in XFCE too.
+networkManager :: Property DebianLike
+networkManager = Apt.installedMin ["network-manager-gnome"]
+
-- | Normally at first login, XFCE asks what kind of panel the user wants.
-- This enables the default configuration noninteractively.
defaultPanelFor :: User -> File.Overwrite -> Property DebianLike