diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Config.hs | 8 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 31 |
2 files changed, 31 insertions, 8 deletions
diff --git a/src/lib/Config.hs b/src/lib/Config.hs index b4db0b9..0cc4f8b 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -1,6 +1,6 @@ module Config ( Palette(..), baseConfig, palette, (<~>), (>~<), - mkArgs, defaultHeight, fc, fn) + mkArgs, defaultHeight, fc, fn, fni) where import System.Environment (lookupEnv) @@ -24,6 +24,7 @@ data Palette = Palette { pNormal :: String fc color thing = "<fc=" ++ color ++ ">" ++ thing ++ "</fc>" fn n thing = "<fn=" ++ show n ++ ">" ++ thing ++ "</fn>" +fni = fn 6 lightTheme :: IO Bool lightTheme = fmap (== Just "light") (lookupEnv "JAO_COLOR_SCHEME") @@ -61,7 +62,7 @@ darkPalette = Palette { pNormal = zenburnFg , pBorder = "black" -- zenburnBackLight , pForeground = zenburnFg , pBackground = doomBack -- zenburnBack - , pAlpha = 100 + , pAlpha = 0 , pIconRoot = icons "dark" , pIsLight = False } @@ -81,7 +82,8 @@ baseConfig p = defaultConfig { , "xft:Symbola-10" , "xft:Symbola-11" , "xft:Symbola-11" - , "xft:Hack-7"] + , "xft:Hack-7" + , "xft:FontAwesome-9"] , border = NoBorder , alpha = pAlpha p , overrideRedirect = True diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index a7dbf9a..99cd1ce 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -48,7 +48,8 @@ topProc' p = TopProc (p <~> ["-t" , "<mboth1> <mboth2> <mboth3> \ \ยท <both1> <both2> <both3>" , "-w", "10", "-L" , "10", "-H", "80"]) 15 -wireless p n = Wireless n (p >~< ["-t" , "<essid> <quality>" +wireless p n = Wireless n (p >~< ["-t" , fc (pLow p) (fni "\xf1eb " ++ "<essid>") + -- <quality> , "-W", "5", "-M", "15" , "-m", "3" , "-L", "20", "-H", "80"]) 20 @@ -112,6 +113,24 @@ batt p = , "-H", "10", "-L", "7" , "-h", pHigh p, "-l", pLow p] 50 "batt0" +miniBatt p = + BatteryN ["BAT0"] + ["-t", "<acstatus>" + , "-S", "Off", "-d", "0", "-m", "3" + , "-L", "10", "-H", "90", "-p", "3" + , "-W", "0", "-f", + "\xf244\xf243\xf243\xf243\xf242\xf242\xf242\xf241\xf241\xf240" + , "--low", pHigh p, "--normal", pNormal p, "--high", pLow p + , "--" + , "-P" + , "-a", "notify-send -u critical 'Battery running out!!!!!!'" + , "-A", "5" + , "-i", fni "\xf1e6" + , "-O", fni "<leftbar> \xf1e6" ++ " <timeleft>" + , "-o", fni "<leftbar>" ++ " <timeleft>" + , "-H", "10", "-L", "7" + , "-h", pHigh p, "-l", pLow p] 50 "batt0" + thinkTemp p = MultiCoreTemp (mkArgs p ["-t", "<core1>ยฐC", "-L", "40", "-H", "70", "-d", "0"] @@ -156,19 +175,21 @@ masterVol p = Volume "default" "Master" ["-t", "<status> <volume>" , "--", "-C", pForeground p, "-c", "sienna4" - , "-O", fn 2 "๐ง" - , "-o", fn 4 "๐"] 10 + , "-O", fni "\xf025" -- "\xf130" -- fn 2 "๐ง" + , "-o", fn 4 "๐" + ] 10 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10 -kbd = Kbd [("us", ""), ("us(intl)", " โฃ")] +kbd = Kbd [("us", ""), ("us(intl)", fni " \xf11c")] -- " โฃ" brightness = Brightness ["--", "-D", "intel_backlight"] 10 brightness' = Brightness ["--", "-D", "amdgpu_bl0", "-C", "brightness"] 10 memory = Memory ["-t","<available> M", "-p", "2", "-W", "7"] 20 -netdev name = Network name ["-t", "<up>", "-x", "", "--", "--up", fn 2 "๐ "] 20 +netdev name = + Network name ["-t", "<up>", "-x", "", "--", "--up", fni "\xf0e8 "] 20 -- fn 2 "๐ " proton0 = netdev "proton0" laTime = DateZone "%H" "en_US" "US/Pacific" "laTime" 10 |