From 8cdeb1afbd571393386012f4fc7b428acdeabb9c Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 4 Jul 2021 01:33:58 -0600
Subject: [PATCH] [XMonad] Bump all versions

---
 dotfiles/config/xmonad/xmonad         | 2 +-
 dotfiles/config/xmonad/xmonad-contrib | 2 +-
 dotfiles/config/xmonad/xmonad.hs      | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad
index a5cee9ba..af354f75 160000
--- a/dotfiles/config/xmonad/xmonad
+++ b/dotfiles/config/xmonad/xmonad
@@ -1 +1 @@
-Subproject commit a5cee9bac265485d3e85ea707aeeac5e34a94ba3
+Subproject commit af354f7528ada1de451365a0f5138ef10a318360
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index 6aa7e179..7b83d924 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit 6aa7e1795c7bdc9092a666325a5389068179aa12
+Subproject commit 7b83d924d19171f4ba98e7956a72e99ed815e022
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 7bccc72a..5c475ff6 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -414,14 +414,15 @@ getEWMHClasses w = do
   mValue <- fmap (UTF8.decode . map fromIntegral) <$> xGetWindowProperty8 atom w
   pure $ filter (not . null) $ splitOn "\NUL" $ join $ maybeToList mValue
 
+myDecorateName :: WindowSpace -> Window -> X String
 myDecorateName ws w = do
   name <- show <$> getName w
   classes <- getEWMHClasses w
   classTitle <- getClass w
-  workspaceToName <- getWorkspaceNames
+  workspaceToName <- getWorkspaceNames'
   let iconName = fromMaybe (map toLower $ head classes) $ lookupIconFromClasses classes
       entryString = printf "%-20s%-40s %+30s in %s \0icon\x1f%s"
-                    classTitle (take 40 name) " " (workspaceToName (W.tag ws)) iconName
+                    classTitle (take 40 name) " " (fromMaybe "" $ workspaceToName (W.tag ws)) iconName
   return entryString
 
 data ChromeInfo = ChromeInfo