From 96cb9298d72a696ed1dc6e7fcc4a7927edf62697 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sun, 12 Feb 2023 23:13:46 -0500 Subject: [PATCH] ENH remove prelude from main bin --- bin/xmonad.hs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/xmonad.hs b/bin/xmonad.hs index a274b9c..c4faf89 100644 --- a/bin/xmonad.hs +++ b/bin/xmonad.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE ImplicitPrelude #-} - -------------------------------------------------------------------------------- -- XMonad binary @@ -23,7 +21,7 @@ import System.Process ( getPid , getProcessExitCode ) -import XMonad +import XMonad hiding (display) import XMonad.Actions.CopyWindow import XMonad.Actions.CycleWS import XMonad.Actions.PhysicalScreens @@ -141,21 +139,21 @@ run = do , normalBorderColor = T.unpack XT.bordersColor , focusedBorderColor = T.unpack XT.selectedBordersColor } - io $ runXMonad conf + runXMonad conf where startDynWorkspaces fs = do dws <- catMaybes <$> mapM evalSometimes (fsDynWorkspaces fs) void $ async $ runWorkspaceMon dws return dws -runXMonad :: (LayoutClass l Window, Read (l Window)) => XConfig l -> IO () +runXMonad :: (LayoutClass l Window, Read (l Window)) => XConfig l -> XIO () runXMonad conf = do dirs <- getCreateDirectories - launch conf dirs + liftIO $ launch conf dirs -getCreateDirectories :: IO Directories +getCreateDirectories :: XIO Directories getCreateDirectories = do - ds <- getDirectories + ds <- liftIO getDirectories mapM_ (createIfMissing ds) [dataDir, cfgDir, cacheDir] return ds where @@ -163,7 +161,7 @@ getCreateDirectories = do let d = f ds r <- tryIO $ createDirectoryIfMissing True d case r of - (Left e) -> print e + (Left e) -> logError $ display e _ -> return () data FeatureSet = FeatureSet