From 92fb9f03c1c06a9971e5f53c01990c2cfff4f205 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 10 Jun 2019 08:13:19 -0700
Subject: [PATCH] [XMonad] Remove minimize naming of layouts

---
 dotfiles/config/xmonad/PagerHints.hs  | 14 +++++---------
 dotfiles/config/xmonad/overlay.nix    |  8 ++------
 dotfiles/config/xmonad/xmonad-contrib |  2 +-
 dotfiles/config/xmonad/xmonad.hs      |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/dotfiles/config/xmonad/PagerHints.hs b/dotfiles/config/xmonad/PagerHints.hs
index 1deb7a70..4ffe2a66 100644
--- a/dotfiles/config/xmonad/PagerHints.hs
+++ b/dotfiles/config/xmonad/PagerHints.hs
@@ -1,8 +1,4 @@
-module PagerHints (
-  -- * Usage
-  -- $usage
-  pagerHints
-) where
+module PagerHints where
 
 import Codec.Binary.UTF8.String (encode)
 import Control.Monad
@@ -66,10 +62,10 @@ setVisibleWorkspaces vis = withDisplay $ \dpy -> do
 -- | Handle all \"Current Layout\" events received from pager widgets, and
 -- set the current layout accordingly.
 pagerHintsEventHook :: Event -> X All
-pagerHintsEventHook ClientMessageEvent {
-    ev_message_type = mt,
-    ev_data = d
-  } = withWindowSet $ \_ -> do
+pagerHintsEventHook ClientMessageEvent
+                      { ev_message_type = mt
+                      , ev_data = d
+                      } = withWindowSet $ \_ -> do
   a <- xLayoutProp
   when (mt == a) $ sendLayoutMessage d
   return (All True)
diff --git a/dotfiles/config/xmonad/overlay.nix b/dotfiles/config/xmonad/overlay.nix
index 1f1cf24e..75d46de7 100644
--- a/dotfiles/config/xmonad/overlay.nix
+++ b/dotfiles/config/xmonad/overlay.nix
@@ -1,12 +1,8 @@
 _: pkgs: rec {
   haskellPackages = pkgs.haskellPackages.override (old: {
     overrides = pkgs.lib.composeExtensions (old.overrides or (_: _: {})) (self: super: rec {
-      xmonad = super.xmonad.overrideAttrs (_: {
-        src = fetchGit ./xmonad;
-      });
-      xmonad-contrib = super.xmonad-contrib.overrideAttrs (_: {
-        src = fetchGit ./xmonad-contrib;
-      });
+      xmonad = self.callCabal2nix "xmonad" (fetchGit ./xmonad) { };
+      xmonad-contrib = self.callCabal2nix "xmonad-contrib" (fetchGit ./xmonad-contrib) { };
     });
   });
 }
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index f1039909..3239bf74 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit f10399096794addfd121f014b687a0298354f410
+Subproject commit 3239bf74cf85794be2e427a3fb2518738d613866
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 8e31c8b1..093d4bc1 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -361,7 +361,7 @@ selectLayout = myDmenu layoutNames >>= (sendMessage . JumpToLayout)
 
 myLayoutHook =
   avoidStruts .
-  minimize .
+  minimizeNoDescription .
   boringAuto .
   mkToggle1 MIRROR .
   mkToggle1 LIMIT .