From 9fd6262358b1e287b3ef19ba5ecc9595e8e48f00 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 24 Oct 2017 11:38:37 -0700
Subject: [PATCH] [taffybar] Switch to in progress gtk3 support

---
 .../config/taffybar/imalison-taffybar.cabal    |  4 ++--
 dotfiles/config/taffybar/stack.yaml            | 18 ++++++++++--------
 dotfiles/config/taffybar/taffybar              |  2 +-
 dotfiles/config/taffybar/taffybar.hs           | 12 ++++++------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal
index f9016ab7..4480be7e 100644
--- a/dotfiles/config/taffybar/imalison-taffybar.cabal
+++ b/dotfiles/config/taffybar/imalison-taffybar.cabal
@@ -18,8 +18,8 @@ executable imalison-taffybar
                      , containers
                      , directory
                      , filepath
-                     , gtk
-                     , gtk-traymanager>=0.1.6
+                     , gtk3
+                     , gtk-traymanager>=1.0.0
                      , mtl
                      , process
                      , split
diff --git a/dotfiles/config/taffybar/stack.yaml b/dotfiles/config/taffybar/stack.yaml
index 35b37ec9..7279ee6b 100644
--- a/dotfiles/config/taffybar/stack.yaml
+++ b/dotfiles/config/taffybar/stack.yaml
@@ -1,21 +1,23 @@
 flags: {}
 extra-package-dbs: []
 packages:
-- '.'
-- location: "./taffybar"
+- .
+- location: ./taffybar
   extra-dep: true
 - location:
     git: git@github.com:willdonnelly/dyre.git
     commit: 11412752b483135e0c151ab90be17b217f837c4b
   extra-dep: true
+- location:
+    git: git@github.com:IvanMalison/gtk-traymanager.git
+    commit: 39cddcf77f3e4a8ecbc4d82894457fd61c1faff1
+  extra-dep: true
 extra-deps:
-- dyre-0.8.11
+- X11-xft-0.3.1
+- dbus-0.10.13
+- libxml-sax-0.7.5
 - rate-limit-1.1.1
 - time-units-1.0.0
-- taffybar-0.4.6
-- dbus-0.10.13
-- gtk-traymanager-0.1.6
+- xml-helpers-1.0.0
 - xmonad-contrib-0.13
-- X11-xft-0.3.1
-- libxml-sax-0.7.5
 resolver: lts-8.2
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 32a0d25a..835a593c 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 32a0d25a3f0898d2972bb231cf95db608096f6a2
+Subproject commit 835a593c0bf66e4f7bbc846fb686f04ebf4dc43b
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index a6f356e5..3a1f8657 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -176,7 +176,7 @@ main = do
         { underlineHeight = 3
         , underlinePadding = 2
         , minWSWidgetSize = Nothing
-        , minIcons = 3
+        , minIcons = 1
         , getIconInfo = myGetIconInfo
         , windowIconSize = 32
         , widgetGap = 0
@@ -212,11 +212,11 @@ main = do
         defaultTaffybarConfig
         { startWidgets = [hud, los, wnd]
         , endWidgets =
-            [ makeUnderline systrayNew "yellow"
-            , makeUnderline clock "teal"
-            , makeUnderline mem "blue"
-            , makeUnderline cpu "green"
-            , makeUnderline netMonitor "yellow"
+            [ makeUnderline clock "teal"
+            -- , makeUnderline systrayNew "yellow"
+            -- , makeUnderline mem "blue"
+            -- , makeUnderline cpu "green"
+            -- , makeUnderline netMonitor "yellow"
             , makeUnderline mpris "red"
             ]
         , barPosition = Top