From 129222c7e6172332868d336ec51e1674c1324c74 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Sat, 2 Jul 2022 20:08:37 -0400
Subject: [PATCH] ENH print dynamic workspace features

---
 bin/xmonad.hs | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/xmonad.hs b/bin/xmonad.hs
index 385b18f..372615a 100644
--- a/bin/xmonad.hs
+++ b/bin/xmonad.hs
@@ -127,21 +127,22 @@ printDeps = do
   ses <- getDBusClient False
   sys <- getDBusClient True
   let db = DBusState ses sys
-  (i, f) <- allFeatures db
+  (i, f, d) <- allFeatures db
   is <- mapM dumpSometimes i
   fs <- mapM dumpFeature f
-  let (UQ u) = jsonArray $ fmap JSON_UQ $ is ++ fs
+  ds <- mapM dumpSometimes d
+  let (UQ u) = jsonArray $ fmap JSON_UQ $ is ++ fs ++ ds
   putStrLn u
   forM_ ses disconnect
   forM_ sys disconnect
 
-allFeatures :: DBusState -> IO ([SometimesIO], [FeatureX])
+allFeatures :: DBusState -> IO ([SometimesIO], [FeatureX], [Sometimes DynWorkspace])
 allFeatures db = do
   let bfs = concatMap (fmap kbMaybeAction . kgBindings)
             $ externalBindings ts db
   let dbus = fmap (\f -> f $ dbSessionClient db) dbusExporters
-  let others =  [runRemovableMon $ dbSystemClient db, runPowermon]
-  return (dbus ++ others, Left runScreenLock:bfs)
+  let others = [runRemovableMon $ dbSystemClient db, runPowermon]
+  return (dbus ++ others, Left runScreenLock:bfs, allDWs')
   where
     ts = ThreadState { tsChildPIDs = [], tsChildHandles = [] }
 
@@ -285,12 +286,15 @@ f5vpnDynamicWorkspace = sometimesIO_ "F5 VPN workspace" "f5vpn" tree dw
          }
     c = "F5 VPN"
 
+allDWs' :: [Sometimes DynWorkspace]
+allDWs' = [xsaneDynamicWorkspace
+          , vmDynamicWorkspace
+          , gimpDynamicWorkspace
+          , f5vpnDynamicWorkspace
+          ]
+
 allDWs :: IO [DynWorkspace]
-allDWs = catMaybes <$> mapM evalSometimes [ xsaneDynamicWorkspace
-                                          , vmDynamicWorkspace
-                                          , gimpDynamicWorkspace
-                                          , f5vpnDynamicWorkspace
-                                          ]
+allDWs = catMaybes <$> mapM evalSometimes allDWs'
 
 --------------------------------------------------------------------------------
 -- | Layout configuration