summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2018-04-03 18:42:34 -0400
committerJoey Hess2018-04-03 18:42:34 -0400
commit0d47b3f9ee0d55fd660f2393db03e8812eabaf67 (patch)
tree56c4e22eb34babe7c117c34753abb612a21f99f0 /src/Propellor
parentfaef5bc684cbb928877914f8b505293c049b155f (diff)
parent300147f5fce7b3d873b57eab5e18db85c40f6b7f (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e45b1ffa..8aa2f3bd 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1040,7 +1040,7 @@ ipmasq intif = File.hasContent ifupscript
laptopSoftware :: Property DebianLike
laptopSoftware = Apt.installed
- [ "intel-microcode"
+ [ "intel-microcode", "acpi"
, "procmeter3", "xfce4", "procmeter3", "unclutter"
, "mplayer", "fbreader", "firefox", "chromium"
, "libdatetime-event-sunrise-perl", "libtime-duration-perl"
@@ -1055,6 +1055,7 @@ laptopSoftware = Apt.installed
, "pmount", "tree", "pv"
, "arbtt", "hledger", "bc"
, "apache2", "ikiwiki", "libhighlight-perl"
+ , "avahi-daemon", "avahi-discover"
, "pal"
, "yeahconsole", "xkbset", "xinput"
, "assword", "pumpa"