diff options
| -rw-r--r-- | src/Sway.hs | 32 | ||||
| -rw-r--r-- | src/lib/Config.hs | 12 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 8 |
3 files changed, 32 insertions, 20 deletions
diff --git a/src/Sway.hs b/src/Sway.hs index 2129e20..44be8b5 100644 --- a/src/Sway.hs +++ b/src/Sway.hs @@ -17,14 +17,22 @@ diskIOS p = DiskIO [("/", "<total>"), ("/home", "<total>")] (diskArgs p) 10 mpd a p i = MPDX [ "-W", "12", "-t", "<statei> <remaining>" , "--", "-p", p, "-P", "\xf144", "-Z",fni i, "-S", fni i] 20 a -mpdMon = mpd "mpd" "6600" "\xf001" -mopMon = mpd "mopidy" "6669" "\xf1bc" +mpdMon = mpd "mpd" "6600" "🎶" + +mprisx client width = + Mpris2 client ["-t" , " <title> " + , "-T", show width + , "-E", "…", "-M", "100", "-x", ""] 40 + config p = (baseConfig p) { position = TopSize C 100 (defaultHeight - 1) , textOutput = True - , textOutputFormat = Pango - , bgColor = "#efefef" + , textOutputFormat = Swaybar + , font = "Source Code Pro Medium 9" + , additionalFonts = [] + , bgColor = "#ffffffc0" + , fgColor = "#000000" , border = FullB , commands = [ Run (topProcL p) , Run (iconBatt p) @@ -45,26 +53,28 @@ config p = (baseConfig p) { , Run laTime , Run localTime , Run w -- LEGE, LEBL, KCV0 +-- , Run (mprisx "playerctld" 20) ] - , template = "|batt0| " + , template = "" -- " |mpris2| " + ++ " |batt0| " ++ dimi "\xf26c" ++ " |bright| " - ++ "<action=`toggle-app.sh nm-applet`>" + ++ "<action=`toggle-app.sh nm-applet --indicator`>" ++ " |wg-mullvad||tun0||wlp164s0wi|" ++ "</action>" ++ " |dynnetwork| " - ++ "<action=`toggle-app.sh pasystray`>" + ++ "<action=`toggle-app.sh pavucontrol`>" ++ " |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|" ++ "</action> " ++ "|mpd|" ++ " |EGPH| " - ++ " {} <hspace=10/>" + ++ " {} <hspace=3/>" ++ "|multicpu| " ++ "|multicoretemp| " ++ " |top| " - ++ " " ++ fni "\xf0c9" ++ " |memory| " + ++ " " ++ "☸" ++ " |memory| " ++ " |diskio| |disku| " - ++ " |datetime| " - ++ "|laTime| " + ++ " |datetime| " + ++ " |laTime| " } where dimi = fc (pDim p) . fni w = weather' "<skyConditionS> <tempC>° <weather>" "EGPH" p diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 146cf5f..d9a3084 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -33,14 +33,14 @@ lightTheme = fmap (== Just "light") (lookupEnv "JAO_COLOR_SCHEME") icons k = "/home/jao/.config/xmobar/icons/" ++ k lightPalette :: Palette -lightPalette = Palette { pNormal = "black" +lightPalette = Palette { pNormal = "#000000" , pLow = "#4d4d4d" , pHigh = "#a0522d" - , pDim = "grey60" + , pDim = "#999999" , pFont = "xft:Source Code Pro Medium-9" - , pBorder = "grey80" + , pBorder = "#cccccc" , pForeground = "#000000" - , pBackground = "white" + , pBackground = "#ffffff" , pAlpha = 229 , pIconRoot = icons "light" , pIsLight = True @@ -64,9 +64,9 @@ darkPalette = Palette { pNormal = zenburnFg -- , pFont = "xft:PragmataPro-9" -- , pFont = "xft:Source Code Pro Medium-9" -- , pFont = "xft:IosevkaCC-9" - , pDim = "grey50" + , pDim = "#7f7f7f" -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11" - , pBorder = "black" -- zenburnBackLight + , pBorder = "#000000" -- zenburnBackLight , pForeground = zenburnFg , pBackground = doomBack -- zenburnBack , pAlpha = 255 diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index e61847a..32e9acb 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -85,7 +85,7 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S" weather' tmp st p = WeatherX st - [ ("", fc (pDim p) $ fni "\xf185") + [ ("", fc (pDim p) "") -- "🧚" , ("clear", fn 4 "🌣") , ("sunny", fc (pHigh p) $ fn 4 "🌣") , ("fair", fn 4 "🌣") @@ -94,9 +94,11 @@ weather' tmp st p = , ("partly sunny", fn 3 "⛅") , ("obscured", fn 4 "🌁") -- 🌫 , ("cloudy", fn 3 "☁") - , ("overcast", fn 3 "☁") + -- , ("overcast", fn 3 "☁") + , ("overcast", fn 3 "☁️") , ("partly cloudy", fn 3 "⛅") - , ("mostly cloudy", fn 3 "☁") + -- , ("mostly cloudy", fn 3 "☁") + , ("mostly cloudy", fn 3 "☁️") , ("considerable cloudiness", fn 4 "⛈") , ("light rain", fn 4 "🌧") , ("rain", fn 4 "⛆") |