summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
3 files changed, 3 insertions, 4 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 9385493c..43ac822d 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1040,14 +1040,14 @@ laptopSoftware = Apt.installed
[ "procmeter3", "xfce4", "procmeter3", "unclutter"
, "mplayer", "fbreader", "firefox", "chromium"
, "libdatetime-event-sunrise-perl", "libtime-duration-perl"
- , "iftop", "network-manager", "gtk-redshift", "powertop"
+ , "network-manager", "gtk-redshift", "powertop"
, "gimp", "gthumb", "inkscape", "sozi", "xzgv", "hugin"
, "mpc", "mpd", "ncmpc", "sonata", "mpdtoys"
, "bsdgames", "nethack"
, "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev"
, "ttf-bitstream-vera"
, "mairix", "offlineimap", "mutt"
- , "nmap"
+ , "nmap", "whois", "wireshark", "tcpdump", "iftop"
, "udevil", "pmount"
, "arbtt", "hledger", "bc"
, "apache2", "ikiwiki", "libhighlight-perl"