[taffybar] Misc

This commit is contained in:
Ivan Malison 2017-03-28 22:16:08 -07:00
parent 373ee8750e
commit baed58786a
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8

View File

@ -1,7 +1,9 @@
import qualified Control.Concurrent.MVar as MV import qualified Control.Concurrent.MVar as MV
import Control.Exception.Base import Control.Exception.Base
import Control.Monad
import Data.List import Data.List
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe
import qualified Graphics.UI.Gtk as Gtk import qualified Graphics.UI.Gtk as Gtk
import qualified Graphics.UI.Gtk.Abstract.Widget as W import qualified Graphics.UI.Gtk.Abstract.Widget as W
import qualified Graphics.UI.Gtk.Layout.Table as T import qualified Graphics.UI.Gtk.Layout.Table as T
@ -23,6 +25,7 @@ import System.Taffybar.WorkspaceHUD
import Text.Printf import Text.Printf
import Text.Read hiding (get) import Text.Read hiding (get)
import ToggleMonitor import ToggleMonitor
import XMonad.Core ( whenJust )
memCallback = do memCallback = do
@ -88,7 +91,7 @@ main = do
Right monString -> Right monString ->
case readMaybe monString of case readMaybe monString of
Nothing -> (allMonitors, 0) Nothing -> (allMonitors, 0)
Just num -> (Nothing, num) Just num -> (useMonitorNumber, num)
memCfg = memCfg =
defaultGraphConfig defaultGraphConfig
{graphDataColors = [(0.129, 0.588, 0.953, 1)], graphLabel = Just "mem"} {graphDataColors = [(0.129, 0.588, 0.953, 1)], graphLabel = Just "mem"}
@ -127,20 +130,22 @@ main = do
, innerPadding = 5 , innerPadding = 5
, outerPadding = 5 , outerPadding = 5
} }
netMonitor = netMonitorMultiNew ["wlp2s0"]
pagerConfig = defaultPagerConfig {useImages = True} pagerConfig = defaultPagerConfig {useImages = True}
pager = taffyPagerNew pagerConfig pager = taffyPagerNew pagerConfig
makeUnderline = underlineWidget hudConfig makeUnderline = underlineWidget hudConfig
pgr <- pagerNew pagerConfig pgr <- pagerNew pagerConfig
enabledVar <- MV.newMVar M.empty enabledVar <- MV.newMVar M.empty
tray2 <- movableWidget tray
let hud = buildWorkspaceHUD hudConfig pgr let hud = buildWorkspaceHUD hudConfig pgr
los = makeUnderline (layoutSwitcherNew pgr) "red" los = makeUnderline (layoutSwitcherNew pgr) "red"
wnd = makeUnderline (windowSwitcherNew pgr) "teal" wnd = makeUnderline (windowSwitcherNew pgr) "teal"
taffyConfig = taffyConfig =
defaultTaffybarConfig defaultTaffybarConfig
{ startWidgets = [hud, los, wnd] { startWidgets = [hud, los, wnd]
, endWidgets = , endWidgets =
[ makeUnderline tray "yellow" [ -- tray2
makeUnderline tray "yellow"
, makeUnderline clock "teal" , makeUnderline clock "teal"
, makeUnderline mem "blue" , makeUnderline mem "blue"
, makeUnderline cpu "green" , makeUnderline cpu "green"
@ -150,8 +155,8 @@ main = do
, barPosition = Top , barPosition = Top
, barHeight = 50 , barHeight = 50
, widgetSpacing = 5 , widgetSpacing = 5
, startRefresher = Just $ handleToggleRequests enabledVar , startRefresher = handleToggleRequests enabledVar
, getMonitorConfig = Just $ toggleableMonitors enabledVar , getMonitorConfig = toggleableMonitors enabledVar
} }
defaultTaffybar taffyConfig defaultTaffybar taffyConfig