diff options
| -rw-r--r-- | lib/Music.hs | 4 | ||||
| -rw-r--r-- | src/Single.hs | 7 | ||||
| -rw-r--r-- | xmobar-config.cabal | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lib/Music.hs b/lib/Music.hs index 3b7bec4..7b712dc 100644 --- a/lib/Music.hs +++ b/lib/Music.hs @@ -3,7 +3,9 @@ module Music where import Xmobar import Monitors import qualified Bottom -import Config (defaultHeight, pIsLight, pHigh, fc, fni) +import Config (defaultHeight, pIsLight, pHigh, fc, fn) + +fni = fn 1 mpris p client width = Mpris2 client diff --git a/src/Single.hs b/src/Single.hs index 1ea4a38..707cc15 100644 --- a/src/Single.hs +++ b/src/Single.hs @@ -1,6 +1,7 @@ import Xmobar import Config import Monitors +import Music (mpdMon) topProcL p s = TopProc (p <~> args) 15 where temp | s = "<both1> <both2> <both3> ยท <mboth1> <mboth2> <mboth3>" @@ -50,10 +51,11 @@ config p = (baseConfig p) { -- , Run captureVol , Run (masterAlsa p) , Run captureAlsa - , Run laTime +-- , Run laTime , Run localTime , Run (cpuFreq' p) , Run (weather "EGPH" p) + , Run mpdMon -- , edinWeather ] ++ extraCmds , template = trayT @@ -67,6 +69,7 @@ config p = (baseConfig p) { ++ " |alsa:default:Master| " ++ dimi "\xf130" ++ " |alsa:default:Capture|" ++ "</action>" ++ " |EGPH|" + ++ " |mpd|" -- ++ " |wttr|" ++ mail ++ " |kbd| " @@ -80,7 +83,7 @@ config p = (baseConfig p) { ++ dimi "\xf080" ++ " |memory| " ++ dimi "\xf0a0" ++ "|diskio| |disku| " ++ " |datetime| " - ++ " |laTime| " +-- ++ " |laTime| " } where dimi = fc "grey40" . fn 1 isXmonad = pWm p == Just "xmonad" trayT = if isXmonad then "|tray|" else "" diff --git a/xmobar-config.cabal b/xmobar-config.cabal index 4538d8f..2160f21 100644 --- a/xmobar-config.cabal +++ b/xmobar-config.cabal @@ -3,7 +3,7 @@ version: 0.1 description: xmobar configs author: jao maintainer: jao@gnu.org -copyright: 2018, 2019, 2020, 2022, 2023 Jose A Ortega Ruiz +copyright: 2018, 2019, 2020, 2022, 2023, 2025 Jose A Ortega Ruiz license: GPL-3 build-type: Simple cabal-version: >= 1.10 @@ -13,7 +13,7 @@ extra-source-files: library hs-source-dirs: lib - exposed-modules: Config, Monitors, Bottom + exposed-modules: Config, Monitors, Bottom, Music build-depends: base >=4.7 && <5, async > 2.2, stm >= 2.5, aeson, text, bytestring, http-conduit, hinotify, xmobar |