summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-12-11 12:08:17 -0400
committerJoey Hess2018-12-11 12:08:17 -0400
commitc4f91da56d5ba7e77bf3c642b4e7c9e88a0e935a (patch)
tree23286a80726de2baaae7ea8b19b9a213aa040dac
parentc29cfda430c85a2b0a4ee26c7f2ebd4e7a5b3654 (diff)
update
-rw-r--r--joeyconfig.hs5
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 2 insertions, 5 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 5c72e19b..d22c393c 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -186,11 +186,6 @@ honeybee = host "honeybee.kitenet.net" $ props
& JoeySites.cubieTruckOneWire
& Apt.installed ["firmware-atheros"]
- & Apt.installed ["firmware-misc-nonfree"]
- & Apt.installed ["firmware-brcm80211"]
- -- Workaround for https://bugs.debian.org/844056
- `requires` File.hasPrivContent "/lib/firmware/brcm/brcmfmac43362-sdio.txt" anyContext
- `requires` File.dirExists "/lib/firmware/brcm"
& Apt.serviceInstalledRunning "ntp" -- no hardware clock
& bootstrappedFrom GitRepoOutsideChroot
& Ssh.hostKeys hostContext
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 6087336d..eabcd8c2 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1155,6 +1155,8 @@ laptopSoftware = Apt.installed
, "yeahconsole", "xkbset", "xinput"
, "assword", "pumpa"
, "vorbis-tools", "audacity"
+ , "ekiga"
+ , "bluez-firmware", "blueman", "pulseaudio-module-bluetooth"
, "xul-ext-ublock-origin", "xul-ext-pdf.js", "xul-ext-status4evar"
, "vim-syntastic", "vim-fugitive"
, "adb", "gthumb"