From ff61b78ee94523ae629e556f2ec3b3a53fba15af Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 25 Nov 2016 14:09:01 -0800 Subject: [PATCH] [XMonad] Rewrite several functions w/o do notation --- dotfiles/xmonad/xmonad.hs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 56b85858..86e9b41c 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -249,11 +249,12 @@ myBringWindow WindowBringerConfig{ menuCommand = cmd -- Dynamic Workspace Renaming -getClassRemap = do - home <- getHomeDirectory - -- TODO: handle the case where this file does not exist - text <- B.readFile $ home ".lib/resources/window_class_to_fontawesome.json" - return $ fromMaybe M.empty (decode text) +windowClassFontAwesomeFile = + fmap ( ".lib/resources/window_class_to_fontawesome.json") getHomeDirectory + +getClassRemap = + fmap (fromMaybe M.empty . decode) $ + windowClassFontAwesomeFile >>= B.readFile setWorkspaceNameToFocusedWindow workspace = do namedWindows <- mapM getClass $ W.integrate' $ W.stack workspace @@ -267,9 +268,8 @@ remapNames namedWindows = do remap <- io getClassRemap return $ map (\orig -> M.findWithDefault orig orig remap) namedWindows -setWorkspaceNames = do - ws <- gets windowset - mapM_ setWorkspaceNameToFocusedWindow (W.workspaces ws) +setWorkspaceNames = + gets windowset >>= mapM_ setWorkspaceNameToFocusedWindow . W.workspaces data WorkspaceNamesHook a = WorkspaceNamesHook deriving (Show, Read)