From b7cdf1b67ab7391674a8d8b61c245cebba0ba422 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 5 Jul 2018 13:13:09 -0700
Subject: [PATCH 1/2] [taffybar] Fix build

---
 dotfiles/config/taffybar/stack.yaml  | 1 -
 dotfiles/config/taffybar/taffybar    | 2 +-
 dotfiles/config/taffybar/taffybar.hs | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dotfiles/config/taffybar/stack.yaml b/dotfiles/config/taffybar/stack.yaml
index 5fa594fb..5ac0b9b4 100644
--- a/dotfiles/config/taffybar/stack.yaml
+++ b/dotfiles/config/taffybar/stack.yaml
@@ -35,7 +35,6 @@ extra-deps:
 - gio-0.13.4.1
 - gtk-sni-tray-0.1.3.2
 - gtk-strut-0.1.2.1
-- gtk-traymanager-1.0.1
 - haskell-gi-0.21.2
 - haskell-gi-base-0.21.1
 - libxml-sax-0.7.5
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index d6806c8c..80bc3440 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit d6806c8cafe9a61370a62ef9c6493166ab4d99d7
+Subproject commit 80bc3440144ad3e8697677fde7480b5501f14f98
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 80af5511..b19f93c2 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -17,14 +17,12 @@ import           StatusNotifier.Tray
 import           System.Directory
 import           System.Environment
 import           System.FilePath.Posix
-import           System.Glib.GObject
 import           System.IO
 import           System.Log.Handler.Simple
 import           System.Log.Logger
 import           System.Process
 import           System.Taffybar
 import           System.Taffybar.Auth
-import           System.Taffybar.Compat.GtkLibs
 import           System.Taffybar.DBus
 import           System.Taffybar.DBus.Toggle
 import           System.Taffybar.Hooks
@@ -136,7 +134,6 @@ main = do
         defaultWorkspacesConfig
         { underlineHeight = 3
         , underlinePadding = 2
-        , minWSWidgetSize = Nothing
         , minIcons = 3
         , getWindowIconPixbuf = myIcons
         -- , windowIconSize = 31

From f0b672ed3da6d512051f81c618da14fa673df821 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 5 Jul 2018 13:14:28 -0700
Subject: [PATCH 2/2] [Emacs] Make main only when server not started

---
 dotfiles/emacs.d/README.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index d75df9ef..94cf65d8 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1442,8 +1442,8 @@ The file server file for this emacs instance no longer exists.")
       (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)))
         (expand-file-name server-name server-dir)))
     (setq server-use-tcp t)
-    (when (equal nil (server-running-p)) (server-start))
-    (imalison:make-main-emacs-server)))
+    (when (equal nil (server-running-p)) (server-start)
+          (imalison:make-main-emacs-server))))
 #+END_SRC
 ** list-environment
 #+BEGIN_SRC emacs-lisp