Merge branch 'master' into carbon

1 files changed, 21 insertions, 0 deletions

diff --git a/xmonad.hs b/xmonad.hs
index 9a1ef95..1a4b0c8 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,9 +1,15 @@
+import           Control.Monad
+import           Data.List
+import           System.Exit
+
+
 import           XMonad
 import           XMonad.Config.Desktop
 
 -- Utilities
 import           XMonad.Util.EZConfig        (additionalKeysP, additionalKeys)
 import           XMonad.Util.SpawnOnce
+import           XMonad.Util.Dmenu
 
 -- Layouts
 import           XMonad.Layout.NoBorders
@@ -39,8 +45,23 @@ myKeys = [ ("<XF86AudioRaiseVolume>",  spawn "~/bin/volume-ctl up")
          , ("<XF86MonBrightnessUp>",   spawn "~/bin/backlight-ctl up")
          , ("<XF86MonBrightnessDown>", spawn "~/bin/backlight-ctl down")
          , ("<XF86ScreenSaver>",       spawn "slock")
+         , ("<XF86TouchpadToggle>",    spawn "~/bin/touchpad-toggle")
 
          , ("M-o",                     spawn "~/bin/project-open")
          , ("M-m",                     spawn "st -e mocp")
          , ("M-S-d",                   spawn "notify-send \"$(date +\"%H:%M %A %d/%m/%Y %B\")\"")
+         , ("M-q",                     spawn "notify-send Restart" >> spawn restartCmd)
+         , ("M-S-q",                   confirm "Are you sure you want to shutdown?" $ io (exitWith ExitSuccess))
          ]
+
+confirm :: String -> X () -> X ()
+confirm prompt f = do
+    result <- menuArgs "dmenu" ["-p", prompt] ["yes", "no"]
+    when (result == "yes") f
+
+restartCmd :: String
+restartCmd = intercalate "; " [ "if type xmonad"
+                              , "then xmonad --recompile && xmonad --restart"
+                              , "else xmessage xmonad not in \\$PATH: \"$PATH\""
+                              , "fi"
+                              ]