From a249429cb15c3aacdf1d44e68cd9dbb75b6d7fbf Mon Sep 17 00:00:00 2001 From: jao Date: Fri, 4 Aug 2023 02:50:45 +0100 Subject: nits and test target --- lib/Monitors.hs | 8 ++++- src/Emacs.hs | 13 +++++--- src/Single.hs | 23 ++++++++------ src/Sway.hs | 4 +-- src/Test.hs | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++ xmobar-config.cabal | 7 +++++ 6 files changed, 128 insertions(+), 18 deletions(-) create mode 100644 src/Test.hs diff --git a/lib/Monitors.hs b/lib/Monitors.hs index ddff5b4..5438e53 100644 --- a/lib/Monitors.hs +++ b/lib/Monitors.hs @@ -21,6 +21,12 @@ wireless p n = Wireless n (p >~< ["-t", "" -- \xf09e , "-W", "5", "-M", "15" , "-m", "3" , "-L", "20", "-H", "80"]) 20 +wirelessx p n = Wireless n (p >~< ["-t", "" ++ + fn 1 "โ†‘ " ++ " " ++ fn 1 "โ†“" ++ " " + -- fc (pLow p) (fni "\xf1eb " ++ "") + -- \xf09e + , "-W", "5", "-M", "15" , "-m", "3" + , "-L", "20", "-H", "80"]) 20 cpu p = MultiCpu (p <~> ["-t", "" , "-S", "on", "-c", " " , "-L", "30", "-H", "70" @@ -67,7 +73,7 @@ weather' tmp st p = , ("light snow", "๐ŸŒจ๏ธ") , ("snow", "โ„๏ธ") ] - (mkArgs p ["-t", tmp , "-L", "10", "-H", "25" , "-T", "25", "-E", "โ€ฆ"] + (mkArgs p ["-t", tmp , "-L", "10", "-H", "25" , "-T", "20"] ["-w", ""]) 18000 diff --git a/src/Emacs.hs b/src/Emacs.hs index 5c6cb26..315c29e 100644 --- a/src/Emacs.hs +++ b/src/Emacs.hs @@ -71,6 +71,7 @@ weath st p = config p = (baseConfig p) { position = TopSize C 100 22 + , textOutput = True , font = "Hack 10" , commands = [ Run (topProcL p) , Run (batt0 p) @@ -81,7 +82,7 @@ config p = (baseConfig p) { , Run (diskIOS p) , Run (kbd p) , Run (coreTemp p) - , Run (wireless p "wlp164s0") + , Run (wireless p "wlan0") , Run (dynNetwork p) , Run (vpnMark "wg-mullvad") , Run tun0 @@ -90,15 +91,17 @@ config p = (baseConfig p) { , Run laTime , Run localTime , Run (weath "EGPH" p) + , Run (NamedXPropertyLog "_EMACS_LOG" "elog") ] , template = " |batt0| " - ++ " ๐Ÿ–ง |wg-mullvad||tun0||wlp164s0wi|" - -- ++ " |wg-mullvad||tun0||wlp164s0wi|" + ++ " ๐Ÿ–ง |wg-mullvad||tun0||wlan0wi|" + -- ++ " |wg-mullvad||tun0||wlan0wi|" ++ " |dynnetwork| " ++ " |default:Master| ๐ŸŽ™๏ธ |default:Capture|" ++ " |EGPH|" - ++ "{*}" - -- ++ "|kbd|" + ++ " |elog|" + ++ "{}" + ++ "|kbd|" ++ " |cpufreq|" ++ " |multicpu|" ++ " |multicoretemp|" diff --git a/src/Single.hs b/src/Single.hs index e7ecee6..166ceec 100644 --- a/src/Single.hs +++ b/src/Single.hs @@ -25,9 +25,10 @@ config p = (baseConfig p) { , textOffsets = [] , textOffset = 0 , iconOffset = 0 - -- , font = "Source Code Pro, Noto Color Emoji Regular 9, Italic 9" - -- , font = "DejaVu Sans Mono, Noto Color Emoji 9, Regular 9" - , font = "Hack, Noto Color Emoji Regular 9, Light 9" + , dpi = 0 + -- , font = "Source Code Pro, Noto Color Emoji Regular 9, Regular 9" + , font = "DejaVu Sans Mono, Noto Color Emoji 9, Regular 9" + -- , font = "Hack, Noto Color Emoji Regular 9, Light 9" , commands = [ Run (topProcL p isXmonad) , Run (load p) , Run (iconBatt p) @@ -37,7 +38,7 @@ config p = (baseConfig p) { , Run (diskIOS p) , Run (kbd p) , Run (coreTemp p) - , Run (wireless p "wlp164s0") + , Run (wireless p "wlan0") , Run (dynNetwork p) , Run (vpnMark "wg-mullvad") , Run tun0 @@ -47,24 +48,23 @@ config p = (baseConfig p) { , Run localTime , Run (cpuFreq' p) , Run (weather "EGPH" p) - -- , Run nmmail ] ++ extraCmds , template = trayT ++ " |batt0| " ++ "" - ++ " |wg-mullvad||tun0||wlp164s0wi|" + ++ " |wg-mullvad||tun0||wlan0wi|" ++ "" ++ " |dynnetwork| " ++ "" ++ " |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|" ++ "" ++ " |EGPH|" - -- ++ fc "sienna4" " |mail|" + ++ mail ++ " |kbd|" - ++ "{" ++ eLog p + ++ "{" ++ "}" - ++ " |multicpu|" + ++ "|multicpu|" ++ " |cpufreq|" ++ " |multicoretemp|" ++ " |top| " @@ -76,9 +76,12 @@ config p = (baseConfig p) { isXmonad = pWm p == Just "xmonad" trayT = if isXmonad then "|tray|" else "" eLog p = if isXmonad then "|XMonadLog|" else fc (pHigh p) "|elog|" + mail = if isXmonad then fc "sienna4" " |mail|" else "" extraCmds = if isXmonad then [ Run (NamedXPropertyLog "_XMONAD_TRAYPAD" "tray") - , Run XMonadLog] + , Run XMonadLog + , Run nmmail + ] else [Run (NamedXPropertyLog "_EMACS_LOG" "elog")] main :: IO () diff --git a/src/Sway.hs b/src/Sway.hs index 5c7ecc2..737c591 100644 --- a/src/Sway.hs +++ b/src/Sway.hs @@ -39,7 +39,7 @@ config p = (baseConfig p) { , Run brightness , Run (kbd p) , Run (coreTemp p) - , Run (wireless p "wlp164s0") + , Run (wireless p "wlan0") , Run (dynNetwork p) , Run (vpnMark "wg-mullvad") , Run tun0 @@ -55,7 +55,7 @@ config p = (baseConfig p) { ++ " |batt0| " ++ " " ++ "" - ++ " |wg-mullvad||tun0||wlp164s0wi|" + ++ " |wg-mullvad||tun0||wlan0wi|" ++ "" ++ " |dynnetwork| " ++ "" diff --git a/src/Test.hs b/src/Test.hs new file mode 100644 index 0000000..84b38e5 --- /dev/null +++ b/src/Test.hs @@ -0,0 +1,91 @@ +import Xmobar +import Config +import Monitors + +topProcL p s = TopProc (p <~> args) 15 + where temp | s = " ยท " + | otherwise = " " + ++ "ยท " + args = ["-t", temp, "-w", "12", "-L" , "10", "-H", "80"] + +diskIOS p = DiskIO [("/", " ")] (diskArgs p) 10 + +cpuFreq' p = CpuFreq (p <~> args) 50 + where args = ["-t" , "" , "-L", "1", "-H", "2", "-d", "2"] + +memory' = Memory args 20 + where template = " " + args = ["-t", template , "-p", "2", "-d", "1", "--", "--scale", "1024"] + +config p = (baseConfig p) { + position = TopSize C 100 24 + , bgColor = if pIsLight p then "#f0f0f0" else "black" + , alpha = 255 -- 233 + , border = FullB + , textOffsets = [] + , textOffset = 0 + , iconOffset = 0 + , iconRoot = "/home/jao/tmp" + -- , font = "Source Code Pro, Noto Color Emoji Regular 9, Italic 9" + , font = "DejaVu Sans Mono, Noto Color Emoji 9, Regular 9" + , commands = [ Run (topProcL p isXmonad) + , Run (load p) + , Run (iconBatt p) + , Run (cpuBars p) + , Run memory' + , Run (diskU p) + , Run (diskIOS p) + , Run (kbd p) + , Run (coreTemp p) + , Run (wireless p "wlan0") + , Run (dynNetwork p) + , Run (vpnMark "wg-mullvad") + , Run tun0 + , Run (masterVol p) + , Run captureVol + , Run laTime + , Run localTime + , Run (cpuFreq' p) + , Run (weather "EGPH" p) + , Run nmmail + ] ++ extraCmds + , template = "{something in the middle}" + -- , template = trayT + -- ++ " |batt0| " + -- ++ "" + -- -- ++ " |wg-mullvad||tun0||wlan0wi|" + -- ++ " |wg-mullvad||tun0||wlan0wi|" + -- ++ "" + -- ++ " |dynnetwork| " + -- ++ "" + -- ++ " |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|" + -- ++ "" + -- ++ " |EGPH|" + -- ++ fc "sienna4" " |mail|" + -- ++ " |kbd|" + -- ++ "{" + -- ++ box "color=red width=1 mt=2 mb=2 ml=2 mr=2" "" + -- -- "something in the middle something in the middle something in the middle something in the middle" + -- ++ "" + -- ++ "}" + -- ++ box "type=HBoth" " |multicpu|" + -- ++ " |cpufreq|" + -- ++ box "type=VBoth mt=2 mb=2 color=green" " |multicoretemp|" + -- ++ box "" " something loooooonger on the right side " -- " |top| " + -- ++ dimi "\xf080" ++ " |memory| " + -- ++ dimi "\xf0a0" ++ "|diskio| |disku| " + -- ++ " |datetime| " + -- ++ " |laTime| " + } where dimi = fc "grey40" . fn 1 + box _ str = str + -- box args str = "" ++ str ++ "" + isXmonad = pWm p == Just "xmonad" + trayT = if isXmonad then "|tray|" else "" + eLog p = if isXmonad then "|XMonadLog|" else fc (pHigh p) "|elog|" + extraCmds = if isXmonad + then [ Run (NamedXPropertyLog "_XMONAD_TRAYPAD" "tray") + , Run XMonadLog] + else [Run (NamedXPropertyLog "_EMACS_LOG" "elog")] + +main :: IO () +main = palette >>= configFromArgs . config >>= xmobar diff --git a/xmobar-config.cabal b/xmobar-config.cabal index ef64410..31aa799 100644 --- a/xmobar-config.cabal +++ b/xmobar-config.cabal @@ -47,3 +47,10 @@ executable xmobar-sway ghc-options: -rtsopts -with-rtsopts=-V0 -threaded build-depends: base, xmobar, xmobar-config default-language: Haskell2010 + +executable xmobar-test + main-is: Test.hs + hs-source-dirs: src + ghc-options: -rtsopts -with-rtsopts=-V0 -threaded + build-depends: base, xmobar, xmobar-config + default-language: Haskell2010 -- cgit v1.2.3