fix deprecation warnings and add scrot_cmd

also remove unused dm-scripts bindings.

2 files changed, 13 insertions, 18 deletions

diff --git a/README.md b/README.md
index d71fedc..d561df8 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ fonts.
 
 ## dependencies
 
+this config will work only for xmonad >=0.17!
+
 ### libraries
 
 this list can be different depending on distro,
diff --git a/xmonad.hs b/xmonad.hs
index f769e1a..8efd6e1 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -47,12 +47,13 @@ import qualified XMonad.Actions.Search as S
 import XMonad.Hooks.DynamicLog 
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ManageDocks ( avoidStruts
-                                , docksEventHook
+                                , docks
                                 , manageDocks
                                 , ToggleStruts(..))
 import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat)
 import XMonad.Hooks.ServerMode
 import XMonad.Hooks.SetWMName
+import XMonad.Hooks.StatusBar.PP (filterOutWsPP)
 import XMonad.Hooks.WorkspaceHistory
 
 import XMonad.Layout.SimplestFloat
@@ -287,20 +288,7 @@ myKeys =
         , ("M-S-q", io exitSuccess)             -- Quits xmonad
 
     -- Run Prompt
-        , ("M-r", spawn "dmenu_run -i -p \"Run: \"") -- Dmenu
-
-    -- Other Dmenu Prompts
-    -- In Xmonad and many tiling window managers, M-p is the default keybinding to
-    -- launch dmenu_run, so I've decided to use M-p plus KEY for these dmenu scripts.
-        , ("M-p p", spawn "passmenu")     -- passmenu
-        , ("M-p c", spawn "dm-colpick")   -- pick color from our scheme
-        , ("M-p e", spawn "dm-confedit")  -- edit config files
-        , ("M-p i", spawn "dm-maim")      -- screenshots (images)
-        , ("M-p k", spawn "dm-kill")      -- kill processes
-        , ("M-p m", spawn "dm-man")       -- manpages
-        , ("M-p q", spawn "dm-logout")    -- logout menu
-        , ("M-p s", spawn "dm-websearch") -- search various search engines
-        , ("M-p h", spawn "dm-hub")       -- hub of all scripts to choose one
+        , ("M-p", spawn "dmenu_run -i -p \"Run: \"") -- Dmenu
 
     -- Useful programs to have a keybinding for launch
         , ("M-<Return>", spawn myTerminal)
@@ -404,6 +392,11 @@ myKeys =
         , ("M-u h", spawn (myMocp ++ " --previous"))
         , ("M-u <Space>", spawn (myMocp ++ " --toggle-pause"))
 
+    -- screenshots
+        , ("<Print>",    spawn "scrot_cmd -f")
+        , ("C-<Print>",  spawn "scrot_cmd -a")
+        , ("M1-<Print>", spawn "scrot_cmd -w")
+
     -- Multimedia Keys
         , ("<XF86AudioPlay>", spawn (myMocp ++ " --toggle-pause"))
         , ("<XF86AudioPrev>", spawn (myMocp ++ " --previous"))
@@ -426,9 +419,9 @@ main :: IO ()
 main = do
     xmproc <- spawnPipe "xmobar ~/.xmonad/xmobar/xmobarrc"
     -- the xmonad, ya know...what the wm is named after!
-    xmonad $ ewmh def
+    xmonad $ docks . ewmh $ def
         { manageHook         = myManageHook <+> manageDocks
-        , handleEventHook    = docksEventHook
+        --, handleEventHook    = docksEventHook
         , modMask            = myModMask
         , terminal           = myTerminal
         , startupHook        = myStartupHook
@@ -438,7 +431,7 @@ main = do
         , normalBorderColor  = myNormColor
         , focusedBorderColor = myFocusColor
         , logHook = dynamicLogWithPP
-                    $ namedScratchpadFilterOutWorkspacePP
+                    $ filterOutWsPP ["NSP"]
                     $ xmobarPP
               { ppOutput  = hPutStrLn xmproc
               , ppCurrent = xmobarColor (col_fg_alt def) ""