diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-03-18 13:49:52 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-03-18 13:49:52 -0400 |
| commit | a3a0e2fca25babea6c5b3ef0bb40f67806f97830 (patch) | |
| tree | 797d0fb4d57cb07bbe776e13268c0a4bf8a23d86 | |
| parent | 9f07d24d905a9844c598fe917c556c504e56c058 (diff) | |
| parent | 42c810e4d86f2e0a3520e27568c0b76ce3281ede (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | joeyconfig.hs | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/Laptop.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 23da8bb4..86233892 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -90,6 +90,7 @@ darkstar = host "darkstar.kitenet.net" $ props & Hostname.sane & Apt.serviceInstalledRunning "swapspace" & Laptop.powertopAutoTuneOnBoot + & Laptop.trimSSD & Grub.cmdline_Linux_default "i915.enable_psr=1" ! Grub.cmdline_Linux_default "quiet" diff --git a/src/Propellor/Property/Laptop.hs b/src/Propellor/Property/Laptop.hs index a36bda18..40b3adb9 100644 --- a/src/Propellor/Property/Laptop.hs +++ b/src/Propellor/Property/Laptop.hs @@ -26,3 +26,7 @@ powertopAutoTuneOnBoot = setup <!> undo `requires` check (doesFileExist servicefile) (Systemd.disabled "powertop") servicefile = "/etc/systemd/system/powertop.service" + +-- | Enables weekly TRIM for SSDs, using systemd's fstrim.timer, +trimSSD :: Property Linux +trimSSD = Systemd.enabled "fstrim.timer" diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 0997401c..80677322 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -636,6 +636,7 @@ dkimMilter = Postfix.mainCfFile `File.containsLines` `onChange` Postfix.dedupMainCf `onChange` Postfix.reloaded `requires` dkimInstalled + `requires` Postfix.installed -- This does not configure postfix to use the dkim milter, -- nor does it set up domainkey DNS. @@ -1050,7 +1051,7 @@ laptopSoftware = Apt.installed , "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev" , "ttf-bitstream-vera" , "mairix", "offlineimap", "mutt" - , "nmap", "whois", "wireshark", "tcpdump", "iftop" + , "mtr", "nmap", "whois", "wireshark", "tcpdump", "iftop" , "udevil", "pmount", "tree", "pv" , "arbtt", "hledger", "bc" , "apache2", "ikiwiki", "libhighlight-perl" |