From b0b03881e98cd85272a3cf721d27543c04ac3b38 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 11 Sep 2021 18:24:56 -0600
Subject: [PATCH] [XMonad] Use nix-flake recompilation support

---
 dotfiles/config/xmonad/xmonad    |  2 +-
 dotfiles/config/xmonad/xmonad.hs | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad
index aa18707c..485a0ad5 160000
--- a/dotfiles/config/xmonad/xmonad
+++ b/dotfiles/config/xmonad/xmonad
@@ -1 +1 @@
-Subproject commit aa18707c3ef96db88208509c2a18c6670e831661
+Subproject commit 485a0ad506b8fb4a93a01a7cdd437121ecf5e40c
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 198e3948..c405c489 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -110,7 +110,7 @@ myConfig = def
   , handleEventHook
   =  followIfNoMagicFocus
   <> minimizeEventHook
-  <> restartEventHook
+  -- <> restartEventHook
   <> myScratchPadEventHook
   , startupHook = myStartup
   , keys = customKeys (const []) addKeys
@@ -137,14 +137,13 @@ restartEventHook _ = return $ All True
 
 myNavigation2DConfig = def { defaultTiledNavigation = centerNavigation }
 
-main = do
-  dirs <- getDirectories
-  (`launch` dirs)
-       . docks
-       . pagerHints
-       . ewmh
-       . ewmhFullscreen
-       . withNavigation2DConfig myNavigation2DConfig $ myConfig
+main =
+  xmonad
+      . docks
+      . pagerHints
+      . ewmh
+      . ewmhFullscreen
+      . withNavigation2DConfig myNavigation2DConfig $ myConfig
 
 -- Utility functions
 
@@ -316,7 +315,7 @@ instance Transformer MyToggles Window where
   transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout
 
 myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS]
-otherToggles = [NBFULL, MIRROR, NOBORDERS, SMARTBORDERS]
+otherToggles = [NBFULL, NOBORDERS, MIRROR, SMARTBORDERS]
 toggleHandlers =
   [ (Toggle GAPS, toggleAll)
   , (Toggle MAGNIFY, toggleAll)