ENH use optparse for xmonad

bin/xmonad.hs

@@ -16,6 +16,7 @@ import Data.Text.IO (hPutStrLn)
 import Graphics.X11.Types
 import Graphics.X11.Xlib.Atom
 import Graphics.X11.Xlib.Extras
+import Options.Applicative hiding (action)
 import RIO
 import RIO.Directory
 import RIO.List
@@ -26,7 +27,6 @@ import System.Process
   ( getPid
   , getProcessExitCode
   )
-import UnliftIO.Environment
 import XMonad
 import XMonad.Actions.CopyWindow
 import XMonad.Actions.CycleWS
@@ -66,15 +66,38 @@ import XMonad.Util.NamedActions
 import XMonad.Util.WorkspaceCompare
 
 main :: IO ()
-main = getArgs >>= parse
+main = parse >>= xio
 
-parse :: [String] -> IO ()
+parse :: IO XOpts
-parse [] = run
+parse = execParser opts
-parse ["--deps"] = withCache printDeps
+  where
--- parse ["--test"] = void $ withCache . evalConf =<< connectDBusX
+    parseOpts = parseDeps <|> parseTest <|> pure XRun
-parse _ = usage
+    opts =
+      info (parseOpts <**> helper) $
+        fullDesc <> header "xmonad: the best window manager ever"
 
-run :: IO ()
+data XOpts = XDeps | XTest | XRun
+
+parseDeps :: Parser XOpts
+parseDeps =
+  flag'
+    XDeps
+    (long "deps" <> short 'd' <> help "print dependencies")
+
+parseTest :: Parser XOpts
+parseTest =
+  flag'
+    XTest
+    (long "test" <> short 't' <> help "test dependencies without running")
+
+xio :: XOpts -> IO ()
+xio o = withCache $
+  case o of
+    XDeps -> printDeps
+    XTest -> undefined
+    XRun -> run
+
+run :: FIO ()
 run = do
   -- These first two commands are only significant when xmonad is restarted.
   -- The 'launch' function below this will turn off buffering (so flushes are
@@ -89,41 +112,40 @@ run = do
   -- signal handlers to carry over to the top.
   uninstallSignalHandlers
   hSetBuffering stdout LineBuffering
-  withCache $ do
+  withDBusX_ $ \db -> do
-    withDBusX_ $ \db -> do
+    let fs = features $ dbSysClient db
-      let fs = features $ dbSysClient db
+    startDBusInterfaces db fs
-      startDBusInterfaces db fs
+    withXmobar $ \xmobarP -> do
-      withXmobar $ \xmobarP -> do
+      withChildDaemons fs $ \ds -> do
-        withChildDaemons fs $ \ds -> do
+        let ts = ThreadState ds (Just xmobarP)
-          let ts = ThreadState ds (Just xmobarP)
+        void $ executeSometimes $ fsRemovableMon fs $ dbSysClient db
-          void $ executeSometimes $ fsRemovableMon fs $ dbSysClient db
+        void $ async $ void $ executeSometimes $ fsPowerMon fs
-          void $ async $ void $ executeSometimes $ fsPowerMon fs
+        dws <- startDynWorkspaces fs
-          dws <- startDynWorkspaces fs
+        runIO <- askRunInIO
-          runIO <- askRunInIO
+        let cleanup = runCleanup runIO ts db
-          let cleanup = runCleanup runIO ts db
+        kbs <- filterExternal <$> evalExternal (fsKeys fs cleanup db)
-          kbs <- filterExternal <$> evalExternal (fsKeys fs cleanup db)
+        sk <- evalAlways $ fsShowKeys fs
-          sk <- evalAlways $ fsShowKeys fs
+        ha <- evalAlways $ fsACPIHandler fs
-          ha <- evalAlways $ fsACPIHandler fs
+        tt <- evalAlways $ fsTabbedTheme fs
-          tt <- evalAlways $ fsTabbedTheme fs
+        let conf =
-          let conf =
+              ewmh $
-                ewmh $
+                addKeymap dws sk kbs $
-                  addKeymap dws sk kbs $
+                  docks $
-                    docks $
+                    def
-                      def
+                      { terminal = myTerm
-                        { terminal = myTerm
+                      , modMask = myModMask
-                        , modMask = myModMask
+                      , layoutHook = myLayouts tt
-                        , layoutHook = myLayouts tt
+                      , manageHook = myManageHook dws
-                        , manageHook = myManageHook dws
+                      , handleEventHook = myEventHook ha
-                        , handleEventHook = myEventHook ha
+                      , startupHook = myStartupHook
-                        , startupHook = myStartupHook
+                      , workspaces = myWorkspaces
-                        , workspaces = myWorkspaces
+                      , logHook = myLoghook xmobarP
-                        , logHook = myLoghook xmobarP
+                      , clickJustFocuses = False
-                        , clickJustFocuses = False
+                      , focusFollowsMouse = False
-                        , focusFollowsMouse = False
+                      , normalBorderColor = T.unpack XT.bordersColor
-                        , normalBorderColor = T.unpack XT.bordersColor
+                      , focusedBorderColor = T.unpack XT.selectedBordersColor
-                        , focusedBorderColor = T.unpack XT.selectedBordersColor
+                      }
-                        }
+        io $ runXMonad conf
-          io $ runXMonad conf
   where
     startDynWorkspaces fs = do
       dws <- catMaybes <$> mapM evalSometimes (fsDynWorkspaces fs)
@@ -237,15 +259,6 @@ allFeatures db = withRunInIO $ \runIO -> do
   where
     ts = ThreadState {tsChildPIDs = [], tsXmobar = Nothing}
 
-usage :: IO ()
-usage =
-  putStrLn $
-    intercalate
-      "\n"
-      [ "xmonad: run greatest window manager"
-      , "xmonad --deps: print dependencies"
-      ]
-
 --------------------------------------------------------------------------------
 -- Concurrency configuration
 

package.yaml

@@ -35,6 +35,7 @@ dependencies:
   - typed-process >= 0.2.8.0
   - network >= 3.1.2.7
   - unliftio >= 0.2.21.0
+  - optparse-applicative >= 0.16.1.0
 
 library:
   source-dirs: lib/