From fb927daed709343c2823857230ac91bb9b37fe76 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Sat, 8 Dec 2007 00:38:27 +0100 Subject: Remove redundant imports darcs-hash:20071207233827-a5988-9e41d51120499637f14d115f2cf1428edaf326bb.gz --- XMonad/Actions/Commands.hs | 1 - XMonad/Actions/CopyWindow.hs | 4 +--- XMonad/Actions/CycleWS.hs | 2 -- XMonad/Actions/DeManage.hs | 1 - XMonad/Actions/DynamicWorkspaces.hs | 4 +--- XMonad/Actions/FindEmptyWorkspace.hs | 1 - XMonad/Actions/MouseGestures.hs | 2 +- XMonad/Actions/RotView.hs | 1 - XMonad/Actions/Submap.hs | 3 +-- XMonad/Actions/TagWindows.hs | 7 ++----- XMonad/Actions/Warp.hs | 3 --- XMonad/Actions/WindowBringer.hs | 4 +--- XMonad/Config/Arossato.hs | 1 - XMonad/Hooks/DynamicLog.hs | 1 - XMonad/Hooks/EwmhDesktops.hs | 2 +- XMonad/Hooks/ManageDocks.hs | 1 - XMonad/Hooks/SetWMName.hs | 1 - XMonad/Hooks/UrgencyHook.hs | 2 -- XMonad/Hooks/XPropManage.hs | 7 ++----- XMonad/Layout/Circle.hs | 1 - XMonad/Layout/DragPane.hs | 2 -- XMonad/Layout/HintedTile.hs | 2 +- XMonad/Layout/LayoutHints.hs | 3 --- XMonad/Layout/LayoutModifier.hs | 1 - XMonad/Layout/LayoutScreens.hs | 4 ---- XMonad/Layout/MagicFocus.hs | 1 - XMonad/Layout/Magnifier.hs | 1 - XMonad/Layout/Maximize.hs | 1 - XMonad/Layout/Mosaic.hs | 2 -- XMonad/Layout/NoBorders.hs | 4 ---- XMonad/Layout/PerWorkspace.hs | 1 - XMonad/Layout/ResizableTile.hs | 1 - XMonad/Layout/Spiral.hs | 1 - XMonad/Layout/Tabbed.hs | 5 ----- XMonad/Layout/ThreeColumns.hs | 5 +---- XMonad/Layout/WindowNavigation.hs | 5 +---- XMonad/Prompt.hs | 2 -- XMonad/Prompt/Layout.hs | 1 - XMonad/Prompt/Workspace.hs | 1 - XMonad/Util/CustomKeys.hs | 2 +- XMonad/Util/Dmenu.hs | 3 +-- XMonad/Util/Font.cpphs | 2 -- XMonad/Util/NamedWindows.hs | 5 ----- XMonad/Util/Run.hs | 2 +- XMonad/Util/XUtils.hs | 5 +---- 45 files changed, 17 insertions(+), 94 deletions(-) (limited to 'XMonad') diff --git a/XMonad/Actions/Commands.hs b/XMonad/Actions/Commands.hs index 7daccfe..9252e9b 100644 --- a/XMonad/Actions/Commands.hs +++ b/XMonad/Actions/Commands.hs @@ -31,7 +31,6 @@ import XMonad.StackSet hiding (workspaces) import XMonad.Util.Dmenu (dmenu) import XMonad.Layouts -import Control.Monad.Reader import qualified Data.Map as M import System.Exit import Data.Maybe diff --git a/XMonad/Actions/CopyWindow.hs b/XMonad/Actions/CopyWindow.hs index ac530da..cde5194 100644 --- a/XMonad/Actions/CopyWindow.hs +++ b/XMonad/Actions/CopyWindow.hs @@ -21,10 +21,8 @@ module XMonad.Actions.CopyWindow ( ) where import Prelude hiding ( filter ) -import Graphics.X11.Xlib ( Window ) -import Control.Monad.State ( gets ) import qualified Data.List as L -import XMonad +import XMonad hiding (modify) import XMonad.Operations ( windows, kill ) import XMonad.StackSet diff --git a/XMonad/Actions/CycleWS.hs b/XMonad/Actions/CycleWS.hs index bff11aa..24aa377 100644 --- a/XMonad/Actions/CycleWS.hs +++ b/XMonad/Actions/CycleWS.hs @@ -24,8 +24,6 @@ module XMonad.Actions.CycleWS ( toggleWS, ) where -import Control.Monad.Reader ( asks ) -import Control.Monad.State ( gets ) import Data.List ( sortBy, findIndex ) import Data.Maybe ( fromMaybe ) import Data.Ord ( comparing ) diff --git a/XMonad/Actions/DeManage.hs b/XMonad/Actions/DeManage.hs index 2171ec8..7866cd2 100644 --- a/XMonad/Actions/DeManage.hs +++ b/XMonad/Actions/DeManage.hs @@ -36,7 +36,6 @@ module XMonad.Actions.DeManage ( import qualified XMonad.StackSet as W import XMonad import XMonad.Operations -import Control.Monad.State import Graphics.X11 (Window) -- $usage diff --git a/XMonad/Actions/DynamicWorkspaces.hs b/XMonad/Actions/DynamicWorkspaces.hs index 9292f57..24d4847 100644 --- a/XMonad/Actions/DynamicWorkspaces.hs +++ b/XMonad/Actions/DynamicWorkspaces.hs @@ -22,11 +22,9 @@ module XMonad.Actions.DynamicWorkspaces ( toNthWorkspace, withNthWorkspace ) where -import Control.Monad.Reader ( asks ) -import Control.Monad.State ( gets ) import Data.List ( sort ) -import XMonad ( X, XState(..), WindowSet, config, layoutHook ) +import XMonad hiding (workspaces) import XMonad.Operations import XMonad.StackSet hiding (filter, modify, delete) import XMonad.Prompt.Workspace diff --git a/XMonad/Actions/FindEmptyWorkspace.hs b/XMonad/Actions/FindEmptyWorkspace.hs index 90459ba..6974ea3 100644 --- a/XMonad/Actions/FindEmptyWorkspace.hs +++ b/XMonad/Actions/FindEmptyWorkspace.hs @@ -18,7 +18,6 @@ module XMonad.Actions.FindEmptyWorkspace ( viewEmptyWorkspace, tagToEmptyWorkspace ) where -import Control.Monad.State import Data.List import Data.Maybe ( isNothing ) diff --git a/XMonad/Actions/MouseGestures.hs b/XMonad/Actions/MouseGestures.hs index f57f6a7..1edec0d 100644 --- a/XMonad/Actions/MouseGestures.hs +++ b/XMonad/Actions/MouseGestures.hs @@ -24,10 +24,10 @@ import XMonad.Operations import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras -import Control.Monad.Reader import Data.IORef import qualified Data.Map as M import Data.Map (Map) +import Control.Monad import System.IO diff --git a/XMonad/Actions/RotView.hs b/XMonad/Actions/RotView.hs index 794d717..ff2b93d 100644 --- a/XMonad/Actions/RotView.hs +++ b/XMonad/Actions/RotView.hs @@ -18,7 +18,6 @@ module XMonad.Actions.RotView ( rotView ) where -import Control.Monad.State ( gets ) import Data.List ( sortBy, find ) import Data.Maybe ( isJust ) import Data.Ord ( comparing ) diff --git a/XMonad/Actions/Submap.hs b/XMonad/Actions/Submap.hs index eb3c9c1..b4b1ec2 100644 --- a/XMonad/Actions/Submap.hs +++ b/XMonad/Actions/Submap.hs @@ -18,13 +18,12 @@ module XMonad.Actions.Submap ( submap ) where -import Control.Monad.Reader - import XMonad hiding (keys) import XMonad.Operations (cleanMask) import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras import qualified Data.Map as M +import Control.Monad.Fix (fix) {- $usage diff --git a/XMonad/Actions/TagWindows.hs b/XMonad/Actions/TagWindows.hs index 030338c..59ba9c7 100644 --- a/XMonad/Actions/TagWindows.hs +++ b/XMonad/Actions/TagWindows.hs @@ -26,14 +26,11 @@ module XMonad.Actions.TagWindows ( ) where import Data.List (nub,concat,sortBy) +import Control.Monad -import Control.Monad.State import XMonad.StackSet hiding (filter) import XMonad.Operations (windows, withFocused) -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras - import XMonad.Prompt import XMonad hiding (workspaces) @@ -88,7 +85,7 @@ getTags w = withDisplay $ \d -> -- | check a window for the given tag hasTag :: String -> Window -> X Bool -hasTag s w = (s `elem`) `liftM` getTags w +hasTag s w = (s `elem`) `fmap` getTags w -- | add a tag to the existing ones addTag :: String -> Window -> X () diff --git a/XMonad/Actions/Warp.hs b/XMonad/Actions/Warp.hs index 4f3bd5c..86e4d8d 100644 --- a/XMonad/Actions/Warp.hs +++ b/XMonad/Actions/Warp.hs @@ -21,9 +21,6 @@ module XMonad.Actions.Warp ( import Data.Ratio import Data.List -import Control.Monad.RWS -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras import XMonad.Operations import XMonad import XMonad.StackSet as W diff --git a/XMonad/Actions/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs index 7ce8391..411d32e 100644 --- a/XMonad/Actions/WindowBringer.hs +++ b/XMonad/Actions/WindowBringer.hs @@ -20,14 +20,12 @@ module XMonad.Actions.WindowBringer ( gotoMenu, bringMenu, windowMapWith ) where -import Control.Monad.State (gets) import Data.Char (toLower) import qualified Data.Map as M -import Graphics.X11.Xlib (Window()) import XMonad.Operations (windows) import qualified XMonad.StackSet as W -import XMonad (X) +import XMonad import qualified XMonad as X import XMonad.Util.Dmenu (dmenuMap) import XMonad.Util.NamedWindows (getName) diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs index 3c6d66d..dc1d1b7 100644 --- a/XMonad/Config/Arossato.hs +++ b/XMonad/Config/Arossato.hs @@ -21,7 +21,6 @@ module XMonad.Config.Arossato ) where import qualified Data.Map as M -import Graphics.X11.Xlib import XMonad import XMonad.Layouts diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs index c93b0e1..4f9f3b3 100644 --- a/XMonad/Hooks/DynamicLog.hs +++ b/XMonad/Hooks/DynamicLog.hs @@ -42,7 +42,6 @@ module XMonad.Hooks.DynamicLog ( -- import XMonad import XMonad.Layouts -import Control.Monad.Reader import Data.Maybe ( isJust ) import Data.List import Data.Ord ( comparing ) diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index 80f7ae2..899ea3d 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -21,8 +21,8 @@ import Data.List (elemIndex, sortBy) import Data.Ord (comparing) import Data.Maybe (fromMaybe) -import Control.Monad.Reader import XMonad +import Control.Monad import qualified XMonad.StackSet as W import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index e5774a9..6380f94 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -45,7 +45,6 @@ module XMonad.Hooks.ManageDocks ( ,avoidStruts, ToggleStruts(ToggleStruts) ) where -import Control.Monad.Reader import XMonad import XMonad.Operations import qualified XMonad.StackSet as W diff --git a/XMonad/Hooks/SetWMName.hs b/XMonad/Hooks/SetWMName.hs index 5a8f435..0da0bed 100644 --- a/XMonad/Hooks/SetWMName.hs +++ b/XMonad/Hooks/SetWMName.hs @@ -36,7 +36,6 @@ module XMonad.Hooks.SetWMName ( setWMName) where import Control.Monad (join) -import Control.Monad.Reader (asks) import Data.Char (ord) import Data.List (nub) import Data.Maybe (fromJust, listToMaybe, maybeToList) diff --git a/XMonad/Hooks/UrgencyHook.hs b/XMonad/Hooks/UrgencyHook.hs index 61c30b3..7c670ce 100644 --- a/XMonad/Hooks/UrgencyHook.hs +++ b/XMonad/Hooks/UrgencyHook.hs @@ -38,8 +38,6 @@ import XMonad.Util.Dzen (dzenWithArgs, seconds) import XMonad.Util.NamedWindows (getName) import Control.Monad (when) -import Control.Monad.Reader (asks) -import Control.Monad.State (gets) import Data.Bits (testBit, clearBit) import Data.IORef import Data.List ((\\), delete) diff --git a/XMonad/Hooks/XPropManage.hs b/XMonad/Hooks/XPropManage.hs index 1e4b135..3f6c90f 100644 --- a/XMonad/Hooks/XPropManage.hs +++ b/XMonad/Hooks/XPropManage.hs @@ -20,11 +20,8 @@ module XMonad.Hooks.XPropManage ( import Data.Char (chr) import Data.List (concat) import Data.Monoid (mconcat, Endo(..)) - -import Control.Monad.Reader -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras +import Control.Monad.Trans (lift) import XMonad import XMonad.ManageHook ((-->)) @@ -70,7 +67,7 @@ pmP f _ = return f xPropManageHook :: [XPropMatch] -> ManageHook xPropManageHook tms = mconcat $ map propToHook tms where - propToHook (ms, f) = liftM and (mapM mkQuery ms) --> mkHook f + propToHook (ms, f) = fmap and (mapM mkQuery ms) --> mkHook f mkQuery (a, tf) = fmap tf (getQuery a) mkHook func = ask >>= Query . lift . fmap Endo . func diff --git a/XMonad/Layout/Circle.hs b/XMonad/Layout/Circle.hs index c37873c..d2cf26f 100644 --- a/XMonad/Layout/Circle.hs +++ b/XMonad/Layout/Circle.hs @@ -21,7 +21,6 @@ module XMonad.Layout.Circle ( ) where -- actually it's an ellipse import Data.List -import Graphics.X11.Xlib import XMonad import XMonad.StackSet (integrate, peek) diff --git a/XMonad/Layout/DragPane.hs b/XMonad/Layout/DragPane.hs index d02cd65..07d90f2 100644 --- a/XMonad/Layout/DragPane.hs +++ b/XMonad/Layout/DragPane.hs @@ -28,8 +28,6 @@ module XMonad.Layout.DragPane ( , DragPane, DragType (..) ) where -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras import XMonad import Data.Bits import Data.Unique diff --git a/XMonad/Layout/HintedTile.hs b/XMonad/Layout/HintedTile.hs index b05f9e6..a3a81d7 100644 --- a/XMonad/Layout/HintedTile.hs +++ b/XMonad/Layout/HintedTile.hs @@ -27,7 +27,7 @@ import qualified XMonad.StackSet as W import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras import Control.Applicative ((<$>)) -import Control.Monad.Reader +import Control.Monad -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: diff --git a/XMonad/Layout/LayoutHints.hs b/XMonad/Layout/LayoutHints.hs index 67e3e57..1639873 100644 --- a/XMonad/Layout/LayoutHints.hs +++ b/XMonad/Layout/LayoutHints.hs @@ -20,11 +20,8 @@ module XMonad.Layout.LayoutHints ( LayoutHints) where import XMonad.Operations ( applySizeHints, D ) -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras ( getWMNormalHints ) import XMonad hiding ( trace ) import XMonad.Layout.LayoutModifier -import Control.Monad.Reader ( asks ) -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: diff --git a/XMonad/Layout/LayoutModifier.hs b/XMonad/Layout/LayoutModifier.hs index 15b0619..da0fad2 100644 --- a/XMonad/Layout/LayoutModifier.hs +++ b/XMonad/Layout/LayoutModifier.hs @@ -20,7 +20,6 @@ module XMonad.Layout.LayoutModifier ( LayoutModifier(..), ModifiedLayout(..) ) where -import Graphics.X11.Xlib ( Rectangle ) import XMonad import XMonad.StackSet ( Stack ) diff --git a/XMonad/Layout/LayoutScreens.hs b/XMonad/Layout/LayoutScreens.hs index deefbae..73b29af 100644 --- a/XMonad/Layout/LayoutScreens.hs +++ b/XMonad/Layout/LayoutScreens.hs @@ -18,13 +18,9 @@ module XMonad.Layout.LayoutScreens ( layoutScreens, fixedLayout ) where -import Control.Monad.Reader ( asks ) - import XMonad import qualified XMonad.StackSet as W import qualified XMonad.Operations as O -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras -- $usage -- This module allows you to pretend that you have more than one screen by diff --git a/XMonad/Layout/MagicFocus.hs b/XMonad/Layout/MagicFocus.hs index 1d2ccee..2a69df5 100644 --- a/XMonad/Layout/MagicFocus.hs +++ b/XMonad/Layout/MagicFocus.hs @@ -19,7 +19,6 @@ module XMonad.Layout.MagicFocus MagicFocus(MagicFocus) ) where -import Graphics.X11.Xlib import XMonad import XMonad.StackSet diff --git a/XMonad/Layout/Magnifier.hs b/XMonad/Layout/Magnifier.hs index 8ac5213..ebe74de 100644 --- a/XMonad/Layout/Magnifier.hs +++ b/XMonad/Layout/Magnifier.hs @@ -25,7 +25,6 @@ module XMonad.Layout.Magnifier MagnifyMsg (..) ) where -import Graphics.X11.Xlib (Window, Rectangle(..)) import XMonad import XMonad.StackSet import XMonad.Layout.LayoutModifier diff --git a/XMonad/Layout/Maximize.hs b/XMonad/Layout/Maximize.hs index 7eb6e8b..28d17a2 100644 --- a/XMonad/Layout/Maximize.hs +++ b/XMonad/Layout/Maximize.hs @@ -23,7 +23,6 @@ module XMonad.Layout.Maximize ( maximizeRestore ) where -import Graphics.X11.Xlib import XMonad import XMonad.Layout.LayoutModifier import Data.List ( partition ) diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs index 5dcd334..71d38ac 100644 --- a/XMonad/Layout/Mosaic.hs +++ b/XMonad/Layout/Mosaic.hs @@ -26,8 +26,6 @@ import Control.Monad.State ( State, put, get, runState ) import System.Random ( StdGen, mkStdGen ) import Data.Maybe ( isJust ) -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras ( SizeHints, getWMNormalHints, sh_aspect, sh_min_size, sh_max_size ) import XMonad hiding ( trace ) import XMonad.Layouts ( Resize(Shrink, Expand) ) import qualified XMonad.StackSet as W diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs index 25ae380..6b022ed 100644 --- a/XMonad/Layout/NoBorders.hs +++ b/XMonad/Layout/NoBorders.hs @@ -25,10 +25,6 @@ module XMonad.Layout.NoBorders ( withBorder ) where -import Control.Monad.State (gets) -import Control.Monad.Reader (asks) -import Graphics.X11.Xlib - import XMonad import XMonad.Layout.LayoutModifier import qualified XMonad.StackSet as W diff --git a/XMonad/Layout/PerWorkspace.hs b/XMonad/Layout/PerWorkspace.hs index ce63af9..25de2c8 100644 --- a/XMonad/Layout/PerWorkspace.hs +++ b/XMonad/Layout/PerWorkspace.hs @@ -24,7 +24,6 @@ module XMonad.Layout.PerWorkspace ( import XMonad import qualified XMonad.StackSet as W -import Control.Monad.State (gets) import Data.Maybe (fromMaybe) -- $usage diff --git a/XMonad/Layout/ResizableTile.hs b/XMonad/Layout/ResizableTile.hs index 97b4504..ca73a7c 100644 --- a/XMonad/Layout/ResizableTile.hs +++ b/XMonad/Layout/ResizableTile.hs @@ -25,7 +25,6 @@ import XMonad import XMonad.Layouts (Resize(..), IncMasterN(..)) import qualified XMonad.StackSet as W import Graphics.X11.Xlib -import Control.Monad.State import Control.Monad -- $usage diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs index b4b3b8a..f341d08 100644 --- a/XMonad/Layout/Spiral.hs +++ b/XMonad/Layout/Spiral.hs @@ -23,7 +23,6 @@ module XMonad.Layout.Spiral ( , Direction (..) ) where -import Graphics.X11.Xlib import Data.Ratio import XMonad import XMonad.Layouts diff --git a/XMonad/Layout/Tabbed.hs b/XMonad/Layout/Tabbed.hs index 1ddf214..a3c6ac2 100644 --- a/XMonad/Layout/Tabbed.hs +++ b/XMonad/Layout/Tabbed.hs @@ -22,14 +22,9 @@ module XMonad.Layout.Tabbed ( , Shrinker(..) ) where -import Control.Monad.State ( gets ) -import Control.Monad.Reader import Data.Maybe import Data.List -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras - import XMonad import XMonad.Operations import qualified XMonad.StackSet as W diff --git a/XMonad/Layout/ThreeColumns.hs b/XMonad/Layout/ThreeColumns.hs index 0612c3d..494f338 100644 --- a/XMonad/Layout/ThreeColumns.hs +++ b/XMonad/Layout/ThreeColumns.hs @@ -26,10 +26,7 @@ import XMonad.Layouts ( Resize(..), IncMasterN(..), splitVertically, splitHorizo import Data.Ratio ---import Control.Monad.State -import Control.Monad.Reader - -import Graphics.X11.Xlib +import Control.Monad -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: diff --git a/XMonad/Layout/WindowNavigation.hs b/XMonad/Layout/WindowNavigation.hs index a826798..78592b7 100644 --- a/XMonad/Layout/WindowNavigation.hs +++ b/XMonad/Layout/WindowNavigation.hs @@ -25,11 +25,8 @@ module XMonad.Layout.WindowNavigation ( noNavigateBorders, defaultWNConfig ) where -import Graphics.X11.Xlib ( Rectangle(..), Window, Pixel, setWindowBorder ) -import Control.Monad.Reader ( ask ) -import Control.Monad.State ( gets, modify ) import Data.List ( nub, sortBy, (\\) ) -import XMonad +import XMonad hiding (Point) import qualified XMonad.StackSet as W import XMonad.Operations ( windows ) import XMonad.Layout.LayoutModifier diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 69fff8c..7eefa5b 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -41,8 +41,6 @@ module XMonad.Prompt ( , uniqSort ) where -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras import XMonad hiding (config, io) import XMonad.Operations (initColor) import qualified XMonad.StackSet as W diff --git a/XMonad/Prompt/Layout.hs b/XMonad/Prompt/Layout.hs index beb3334..1e7fe61 100644 --- a/XMonad/Prompt/Layout.hs +++ b/XMonad/Prompt/Layout.hs @@ -18,7 +18,6 @@ module XMonad.Prompt.Layout ( layoutPrompt ) where -import Control.Monad.State ( gets ) import Data.List ( sort, nub ) import XMonad hiding ( workspaces ) import XMonad.Operations ( sendMessage ) diff --git a/XMonad/Prompt/Workspace.hs b/XMonad/Prompt/Workspace.hs index 343774b..12ece91 100644 --- a/XMonad/Prompt/Workspace.hs +++ b/XMonad/Prompt/Workspace.hs @@ -18,7 +18,6 @@ module XMonad.Prompt.Workspace ( workspacePrompt ) where -import Control.Monad.State ( gets ) import Data.List ( sort ) import XMonad hiding ( workspaces ) import XMonad.Prompt diff --git a/XMonad/Util/CustomKeys.hs b/XMonad/Util/CustomKeys.hs index 389a8d6..9d58f39 100644 --- a/XMonad/Util/CustomKeys.hs +++ b/XMonad/Util/CustomKeys.hs @@ -19,9 +19,9 @@ module XMonad.Util.CustomKeys ( ) where import XMonad +import Control.Monad.Reader import Graphics.X11.Xlib -import Control.Monad.Reader import qualified Data.Map as M -- $usage diff --git a/XMonad/Util/Dmenu.hs b/XMonad/Util/Dmenu.hs index 8eeb0d9..ea91f17 100644 --- a/XMonad/Util/Dmenu.hs +++ b/XMonad/Util/Dmenu.hs @@ -23,7 +23,6 @@ module XMonad.Util.Dmenu ( import XMonad import qualified XMonad.StackSet as W import qualified Data.Map as M -import Control.Monad.State import XMonad.Util.Run -- $usage @@ -37,7 +36,7 @@ import XMonad.Util.Run -- dmenuXinerama :: [String] -> X String dmenuXinerama opts = do - curscreen <- (fromIntegral . W.screen . W.current) `liftM` gets windowset :: X Int + curscreen <- (fromIntegral . W.screen . W.current) `fmap` gets windowset :: X Int io $ runProcessWithInput "dmenu" ["-xs", show (curscreen+1)] (unlines opts) dmenu :: [String] -> X String diff --git a/XMonad/Util/Font.cpphs b/XMonad/Util/Font.cpphs index 20ed576..13321c6 100644 --- a/XMonad/Util/Font.cpphs +++ b/XMonad/Util/Font.cpphs @@ -29,8 +29,6 @@ module XMonad.Util.Font ( ) where -import Graphics.X11.Xlib -import Control.Monad.Reader import XMonad import Foreign import XMonad.Operations diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs index 967095c..c38e25b 100644 --- a/XMonad/Util/NamedWindows.hs +++ b/XMonad/Util/NamedWindows.hs @@ -22,13 +22,8 @@ module XMonad.Util.NamedWindows ( unName ) where -import Control.Monad.Reader ( asks ) -import Control.Monad.State ( gets ) - import qualified XMonad.StackSet as W ( peek ) -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras import XMonad diff --git a/XMonad/Util/Run.hs b/XMonad/Util/Run.hs index 95e0415..dead778 100644 --- a/XMonad/Util/Run.hs +++ b/XMonad/Util/Run.hs @@ -28,7 +28,6 @@ module XMonad.Util.Run ( spawnPipe ) where -import Control.Monad.Reader import System.Posix.IO import System.Posix.Process (createSession, forkProcess, executeFile, getProcessStatus) @@ -38,6 +37,7 @@ import System.Exit (ExitCode(ExitSuccess), exitWith) import System.IO import System.Process (runInteractiveProcess, waitForProcess) import XMonad +import Control.Monad -- $usage -- For an example usage of 'runInTerm' see "XMonad.Prompt.Ssh" diff --git a/XMonad/Util/XUtils.hs b/XMonad/Util/XUtils.hs index 911826a..c8e403d 100644 --- a/XMonad/Util/XUtils.hs +++ b/XMonad/Util/XUtils.hs @@ -26,13 +26,10 @@ module XMonad.Util.XUtils ( ) where -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras - -import Control.Monad.Reader import Data.Maybe import XMonad import XMonad.Util.Font +import Control.Monad -- $usage -- See "XMonad.Layout.Tabbed" or "XMonad.Layout.DragPane" for usage -- cgit v1.2.3