From e9880655c47247b13b9d44a16603ec600fe5e7e4 Mon Sep 17 00:00:00 2001 From: Josh Rahm Date: Tue, 4 Feb 2020 11:14:32 -0700 Subject: Mave icons to the left. Change icon colors --- src/Internal/LayoutDraw.hs | 22 +++++++++++----------- src/Main.hs | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Internal/LayoutDraw.hs b/src/Internal/LayoutDraw.hs index 3b3d3f0..5f0572d 100644 --- a/src/Internal/LayoutDraw.hs +++ b/src/Internal/LayoutDraw.hs @@ -45,17 +45,17 @@ drawPng l = do let filepathXpm = pngCacheDir (quickHash descr ++ ".xpm") let colors = [ - (1.0, 1.0, 1.0), - (0.9, 0.9, 1.0), - (0.8, 0.8, 1.0), - (0.7, 0.7, 1.0), - (0.6, 0.6, 1.0), - (0.5, 0.5, 1.0), - (0.4, 0.4, 1.0), - (0.3, 0.3, 1.0), - (0.2, 0.2, 1.0), - (0.1, 0.1, 1.0), - (0.0, 0.0, 1.0) + -- (1.0, 1.0, 1.0), + -- (0.9, 0.9, 1.0), + -- (0.8, 0.8, 1.0), + -- (0.7, 0.7, 1.0), + (0.6, 0.6, 0.8), + (0.5, 0.5, 0.8), + (0.4, 0.4, 0.8), + (0.3, 0.3, 0.8), + (0.2, 0.2, 0.8), + (0.1, 0.1, 0.8), + (0.0, 0.0, 0.8) ] exists <- liftIO $ doesFileExist filepathXpm diff --git a/src/Main.hs b/src/Main.hs index 77a53a0..21bc4ba 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -12,6 +12,7 @@ import Text.Printf import Internal.Keys import Internal.LayoutDraw +import Data.List (partition, isPrefixOf) main = do @@ -59,6 +60,8 @@ main = do , ppSep = xmobarColor "#404040" "" " ──── " , ppExtras = [showLayout] + , ppOrder = \ss -> + let (icons, etc) = partition ("