From 1a6a9a4461ed54233d532360c098d0a0e0da3a8c Mon Sep 17 00:00:00 2001
From: Ethan Schoonover <es@ethanschoonover.com>
Date: Thu, 8 Nov 2012 21:16:26 -0800
Subject: [PATCH] mutt/cron updated blocks

---
 blocks/appsets/mutt_basics.sh                 |  4 +-
 .../hardware/laptop/lenovo_thinkpad_x220.sh   | 49 ++++---------------
 blocks/xorg/desktop_xmonad_minimal.sh         |  5 +-
 dev_full.sh                                   |  2 +-
 4 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/blocks/appsets/mutt_basics.sh b/blocks/appsets/mutt_basics.sh
index aa31be9..77c3cf3 100644
--- a/blocks/appsets/mutt_basics.sh
+++ b/blocks/appsets/mutt_basics.sh
@@ -2,4 +2,6 @@
 #
 # mutt, mta, mail indexing
 
-_installpkg mutt
+_installpkg mutt offlineimap msmtp-mta
+_installpkg python2-gdata python2-simplejson
+_installaur goobook-git
diff --git a/blocks/hardware/laptop/lenovo_thinkpad_x220.sh b/blocks/hardware/laptop/lenovo_thinkpad_x220.sh
index a2f0630..9397509 100644
--- a/blocks/hardware/laptop/lenovo_thinkpad_x220.sh
+++ b/blocks/hardware/laptop/lenovo_thinkpad_x220.sh
@@ -33,50 +33,19 @@ cat > /etc/acpi/handler.sh << EOF
 set $*
 
 case $1 in
-ac_adapter) /usr/bin/power auto ;; # unplug or plug ac cord
+    ac_adapter) power auto ;; # unplug or plug ac cord
 esac
 
 case $2 in
-
-#VOLDN) /usr/bin/volume down ;; # handling in xmonad
-#VOLUP) /usr/bin/volume up ;; # handling in xmonad
-#MUTE) /usr/bin/volume toggle ;; # handling in xmonad
-
-CDSTOP) ;;
-CDPREV) ;;
-CDPLAY) ;;
-CDNEXT) ;;
-
-BRTDN) ;;
-BRTUP) ;;
-VMOD) ;;
-
-WLAN) ;; # handled by bios
-F24) /usr/bin/wireless bluetooth toggle ;; # fn-F9
-FF11) : ;; # fn-F11
-PROG1) ;; # thinkvantage button
-
-ZOOM) ;;
-
-SCRNLCK) /usr/bin/display lock; ;;
-BAT) /usr/bin/power cycle; ;;
-PBTN)
-     if [ "$(cat /sys/devices/platform/thinkpad_acpi/hotkey_tablet_mode)" -gt 0 ];
-     then /usr/bin/display tablet on
-     else /usr/bin/power off; fi
-;;
-SBTN) /usr/bin/power sleep ;; # sleep button
-SUSP) /usr/bin/power reboot ;; # suspend button (hibernate)
-LID) case $3 in open) : ;; close) /usr/bin/power sleep ;; esac ;;
-TBLT) case $3 in on) /usr/bin/display tablet on ;; off) /usr/bin/display tablet off ;; esac ;; # rotate to tablet mode
-
-LEN0068:00) case $3 in
-	0000500c) ;; # undock tablet pen
-	0000500b) ;; # dock tablet pen
-	00004011) ;; # undock battery
-	00004010) ;; # dock battery
-        esac ;;
+    LID)     [ ${3:-} == "open" ] || system sleep ;;
+    TBLT)    [ ${3:-} == "on" ] && display tablet on || display tablet off ;;
 esac
+
+case $4 in
+    #0000500c) trigger trigger XF86_LaunchA ;; # undock tablet pen
+    #0000500b) trigger shift+LaunchA        ;; # dock tablet pen
+esac ;;
+
 EOF
 
 # SYSTEMD LOGIND.CONF -------------------------------------------------
diff --git a/blocks/xorg/desktop_xmonad_minimal.sh b/blocks/xorg/desktop_xmonad_minimal.sh
index cd09265..f05a64e 100644
--- a/blocks/xorg/desktop_xmonad_minimal.sh
+++ b/blocks/xorg/desktop_xmonad_minimal.sh
@@ -4,7 +4,7 @@ _enable_haskell_repos
 
 # install haskell-xmonad, related from haskell-testing
 
-_installpkg ghc cabal-install haskell-xmonad haskell-xmonad-contrib haskell-xmonad-extras xmobar trayer
+_installpkg ghc cabal-install haskell-xmonad haskell-xmonad-contrib haskell-xmonad-extras xmobar trayer dunst
 
 # depending on xmonad config
 
@@ -13,7 +13,8 @@ _installpkg haskell-edit-distance
 # environment/wm/etc.
 # ------------------------------------------------------------------------
 #_installpkg xfce4 compiz ccsm
-_installpkg xcompmgr xscreensaver hsetroot
+_installpkg xscreensaver hsetroot
+_installaur compton-git # xcompmgr no longer maintained
 
 #_installpkg rxvt-unicode urxvt-url-select
 _installaur termite-git
diff --git a/dev_full.sh b/dev_full.sh
index e6c9ca5..029d5a9 100644
--- a/dev_full.sh
+++ b/dev_full.sh
@@ -52,7 +52,7 @@ VIDEO=video/video_intel
 SOUND=sound/sound_intel
 DESKTOP=xorg/desktop_xmonad_minimal
 HARDWARE=hardware/laptop/lenovo_thinkpad_x220
-APPSETS="appsets/hw_utils appsets/cli_hardcore appsets/vim_basics appsets/mutt_basics appsets/git_basics appsets/server_utils appsets/chromium_basics"
+APPSETS="common/cron_default appsets/hw_utils appsets/cli_hardcore appsets/vim_basics appsets/mutt_advanced appsets/git_basics appsets/server_utils appsets/chromium_basics"
 
 # EXTRA PACKAGES ---------------------------------------------------------
 # if you don't want to create a new block, you can specify extra packages