ndwarshuis
/
xmonad-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

REF remove extra theadstate

This commit is contained in:
Nathan Dwarshuis 2023-01-01 00:01:06 -05:00
parent 609048f6b6
commit f875b7c71d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/xmonad.hs
View File

@ -101,7 +101,7 @@ run = do
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 ts 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
@ -154,7 +154,7 @@ getCreateDirectories = do
_ -> return () _ -> return ()
data FeatureSet = FeatureSet data FeatureSet = FeatureSet
{ fsKeys :: X () -> ThreadState -> DBusState -> [KeyGroup FeatureX] { fsKeys :: X () -> DBusState -> [KeyGroup FeatureX]
, fsDBusExporters :: [Maybe SesClient -> SometimesIO] , fsDBusExporters :: [Maybe SesClient -> SometimesIO]
, fsPowerMon :: SometimesIO , fsPowerMon :: SometimesIO
, fsRemovableMon :: Maybe SysClient -> SometimesIO , fsRemovableMon :: Maybe SysClient -> SometimesIO
@ -229,7 +229,7 @@ allFeatures db = withRunInIO $ \runIO -> do
let cleanup = runCleanup runIO ts db let cleanup = runCleanup runIO ts db
let bfs = let bfs =
concatMap (fmap kbMaybeAction . kgBindings) $ concatMap (fmap kbMaybeAction . kgBindings) $
externalBindings cleanup ts db externalBindings cleanup db
let dbus = fmap (\f -> f $ dbSesClient db) dbusExporters let dbus = fmap (\f -> f $ dbSesClient db) dbusExporters
let others = [runRemovableMon $ dbSysClient db, runPowermon] let others = [runRemovableMon $ dbSysClient db, runPowermon]
return (dbus ++ others, Left runScreenLock : bfs, allDWs') return (dbus ++ others, Left runScreenLock : bfs, allDWs')
@ -748,8 +748,8 @@ filterExternal = fmap go
] ]
} }
externalBindings :: X () -> ThreadState -> DBusState -> [KeyGroup FeatureX] externalBindings :: X () -> DBusState -> [KeyGroup FeatureX]
externalBindings cleanup _ db = externalBindings cleanup db =
[ KeyGroup [ KeyGroup
"Launchers" "Launchers"
[ KeyBinding "<XF86Search>" "select/launch app" $ Left runAppMenu [ KeyBinding "<XF86Search>" "select/launch app" $ Left runAppMenu