Clean up import list in Keys.hs

1 files changed, 120 insertions, 41 deletions

diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs
index 6b484e5..ae18ee4 100644
--- a/src/Rahm/Desktop/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -1,70 +1,155 @@
 module Rahm.Desktop.Keys (applyKeys) where
 
-import Control.Applicative
 import Control.Monad
-import Control.Monad.Fix (fix)
-import Control.Monad.Loops (iterateWhile)
-import Control.Monad.Reader
-import Control.Monad.Trans.Class
+  ( filterM,
+    forM_,
+    unless,
+  )
 import Control.Monad.Trans.Maybe
+  ( runMaybeT,
+  )
 import Control.Monad.Writer
-import Data.Char
-import Data.List hiding ((!!))
+  ( WriterT,
+    execWriterT,
+    fix,
+    lift,
+    tell,
+  )
+import Data.Char (isAlpha)
+import Data.List (foldl')
 import Data.List.Safe ((!!))
 import Data.Map (Map)
 import qualified Data.Map as Map
-import Data.Maybe (fromMaybe, isJust, isNothing, mapMaybe)
+import Data.Maybe
+  ( fromMaybe,
+    mapMaybe,
+  )
 import Data.Monoid (Endo (..))
-import Data.Proxy
-import Debug.Trace
 import Graphics.X11.ExtraTypes.XF86
-import Graphics.X11.ExtraTypes.XorgDefault
-import Prettyprinter
+  ( xF86XK_AudioLowerVolume,
+    xF86XK_AudioMute,
+    xF86XK_AudioNext,
+    xF86XK_AudioPlay,
+    xF86XK_AudioPrev,
+    xF86XK_AudioRaiseVolume,
+    xF86XK_Calculator,
+    xF86XK_MonBrightnessDown,
+    xF86XK_MonBrightnessUp,
+  )
 import Rahm.Desktop.Common
-import Rahm.Desktop.DMenu
-import Rahm.Desktop.Desktop
+  ( focusLocation,
+    getCurrentWorkspace,
+    gotoWorkspace,
+    locationWindow,
+    locationWorkspace,
+    runMaybeT_,
+    withBorderColor,
+  )
+import Rahm.Desktop.DMenu (runDMenu)
 import Rahm.Desktop.History
+  ( historyBack,
+    historyForward,
+    jumpToLastLocation,
+  )
 import Rahm.Desktop.Keys.Dsl
+  ( ButtonBinding (..),
+    ButtonBindings,
+    Documented (..),
+    KeyBinding (..),
+    KeyBindings,
+    altMask,
+    altMod,
+    altgrMod,
+    bind,
+    buttonDocumentation,
+    controlMod,
+    doc,
+    documentation,
+    getConfig,
+    justMod,
+    noMod,
+    rawMask,
+    runButtons,
+    runKeys,
+    shiftMod,
+    (-|-),
+  )
 import Rahm.Desktop.Keys.Wml
-import Rahm.Desktop.Layout
+  ( gotoWorkspaceFn,
+    moveLocationToWorkspaceFn,
+    readNextLocationSet,
+    readNextWorkspace,
+    readWindowsetMacro,
+    readWorkspaceMacro,
+  )
+import Rahm.Desktop.Layout (nLayouts)
 import Rahm.Desktop.Layout.ConsistentMosaic
-import Rahm.Desktop.Layout.Flip (flipHorizontally, flipVertically)
+  ( expandPositionAlt,
+    shrinkPositionAlt,
+  )
+import Rahm.Desktop.Layout.Flip
+  ( flipHorizontally,
+    flipVertically,
+  )
 import Rahm.Desktop.Layout.Hole (toggleHole)
-import Rahm.Desktop.Layout.List (toFirstLayout, toIndexedLayout, toNextLayout, toPreviousLayout)
+import Rahm.Desktop.Layout.List
+  ( toFirstLayout,
+    toIndexedLayout,
+    toNextLayout,
+    toPreviousLayout,
+  )
 import Rahm.Desktop.Layout.Pop (togglePop)
 import Rahm.Desktop.Layout.Rotate (rotateLayout)
 import Rahm.Desktop.Logger
+  ( LogLevel (..),
+    getLogLevel,
+    logs,
+    setLogLevel,
+  )
 import Rahm.Desktop.Marking
-import Rahm.Desktop.MouseMotion
-import Rahm.Desktop.PassMenu
-import Rahm.Desktop.PromptConfig
+  ( markAllLocations,
+    setAlternateWindows,
+    setAlternateWorkspace,
+  )
+import Rahm.Desktop.PassMenu (runPassMenu)
 import Rahm.Desktop.RebindKeys
+  ( remapKey,
+    sendKey,
+  )
 import qualified Rahm.Desktop.StackSet as W
 import Rahm.Desktop.Submap
-import Rahm.Desktop.Swallow
+  ( mapNextString,
+    submap,
+    submapButtonsWithKey,
+  )
 import Rahm.Desktop.SwapMaster (swapMaster)
 import Rahm.Desktop.Theater
+  ( restoreTheater,
+  )
 import Rahm.Desktop.Workspaces
+  ( accompaningWorkspace,
+    next,
+    prev,
+    viewAdjacent,
+    withScreen,
+  )
 import Rahm.Desktop.XMobarLog.PendingBuffer
-import System.IO
-import System.Process
-import Text.Printf
+  ( pushAddPendingBuffer,
+    pushPendingBuffer,
+  )
+import Text.Printf (printf)
 import XMonad
 import XMonad.Actions.CopyWindow as CopyWindow
 import XMonad.Actions.RotSlaves
-import XMonad.Actions.SpawnOn as SpawnOn
-import XMonad.Actions.WindowNavigation
-import XMonad.Hooks.ManageDocks
-import XMonad.Layout.MosaicAlt
+  ( rotAllDown,
+    rotAllUp,
+  )
+import XMonad.Hooks.ManageDocks (ToggleStruts (..))
 import XMonad.Layout.Spacing
-import XMonad.Prompt
-import XMonad.Prompt.Input
-import XMonad.Prompt.Shell
-import XMonad.Util.CustomKeys
+  ( Border (..),
+    SpacingModifier (..),
+  )
 import XMonad.Util.Run (safeSpawn)
-import XMonad.Util.Scratchpad
-import XMonad.Util.Ungrab
-import XMonad.Util.XUtils
 import Prelude hiding ((!!))
 
 type KeyMap l = XConfig l -> Map (KeyMask, KeySym) (X ())
@@ -611,12 +696,6 @@ keymap = runKeys $ do
               doc "Open a file from the library" $
                 spawnX "library-view.sh"
 
-          bind xK_s $
-            (justMod -|- noMod) $
-              doc
-                "Toggle the ability for terminals to swallow child windows."
-                toggleSwallowEnabled
-
           bind xK_v $ do
             (justMod -|- noMod) $
               doc "Set the volume via rofi." $