From e53dd0004f415bdc52e809b615dcbfbabdebd67f Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 9 Aug 2021 03:13:16 -0600
Subject: [PATCH 1/5] [taffybar] Remove clock from end of laptop widgets

---
 dotfiles/config/taffybar/taffybar.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index c98fc3c7..a6b8f487 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -187,7 +187,6 @@ main = do
       shortLaptopEndWidgets =
         [ myBatteryIcon
         , myBatteryText
-        , myClock
         , myTray
         , myICP
         , myMpris

From fe3375e6911fefe0368e3f41f094282a85daeac6 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 9 Aug 2021 03:33:24 -0600
Subject: [PATCH 2/5] [taffybar] Bump, use taffybar.css for all

---
 dotfiles/config/taffybar/taffybar    | 2 +-
 dotfiles/config/taffybar/taffybar.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 00d8e0f8..f4c1d3b5 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 00d8e0f88de31aed0f7a3baf2dc308e51763bcc6
+Subproject commit f4c1d3b5a628a128ef7c115cb42a48449f1fe1bb
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index a6b8f487..b8c7c209 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -127,7 +127,7 @@ logDebug = do
 cssFileByHostname =
   [ ("uber-loaner", "uber-loaner.css")
   , ("imalison-home", "taffybar.css")
-  , ("ivanm-dfinity-razer", "ivanm-dfinity-razer.css")
+  , ("ivanm-dfinity-razer", "taffybar.css")
   , ("ryzen-shine", "taffybar.css")
   ]
 

From 4db7617ad62041dc465c44f0a5b31e1ff09ff978 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 9 Aug 2021 14:10:30 -0600
Subject: [PATCH 3/5] [XMonad] Make AVOIDSTRUTS a toggle

---
 dotfiles/config/xmonad/xmonad.hs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 1ae21755..d49f97f6 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -244,6 +244,7 @@ hostNameToAction =
              ]
 
 myStartup = do
+  setToggleActiveAll AVOIDSTRUTS True
   setToggleActiveAll GAPS True
   setToggleActiveAll NOBORDERS True
   hostName <- io getHostName
@@ -272,6 +273,7 @@ data MyToggles
   | GAPS
   | MAGICFOCUS
   | MAGNIFY
+  | AVOIDSTRUTS
   deriving (Read, Show, Eq, Typeable)
 
 instance Transformer MyToggles Window where
@@ -279,10 +281,15 @@ instance Transformer MyToggles Window where
   transform GAPS x k = k (smartSpacing 5 x) unmodifyLayout
   transform MAGICFOCUS x k = k (magicFocus x) unmodifyLayout
   transform MAGNIFY x k = k (myMagnify x) unmodifyLayout
+  transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout
 
-myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY]
+myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS]
 otherToggles = [NBFULL, MIRROR, NOBORDERS, SMARTBORDERS]
-toggleHandlers = [(Toggle GAPS, toggleAll), (Toggle MAGNIFY, toggleAll)]
+toggleHandlers =
+  [ (Toggle GAPS, toggleAll)
+  , (Toggle MAGNIFY, toggleAll)
+  , (Toggle AVOIDSTRUTS, toggleAll)
+  ]
 
 instance Eq (Toggle Window) where
   (Toggle v) == v2 = Just v == fromToggle v2
@@ -386,9 +393,9 @@ layoutNames = [description layout | layout <- layoutList]
 selectLayout = myDmenu layoutNames >>= (sendMessage . JumpToLayout)
 
 myLayoutHook =
-  avoidStruts .
   minimizeNoDescription .
   boringAuto .
+  mkToggle1 AVOIDSTRUTS .
   mkToggle1 MIRROR .
   mkToggle1 LIMIT .
   mkToggle1 GAPS .

From 3819c32bf30f8dd422276caf340f24fe067fefcb Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 9 Aug 2021 18:24:59 -0600
Subject: [PATCH 4/5] [Starship] Remove comments

---
 dotfiles/config/starship.toml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dotfiles/config/starship.toml b/dotfiles/config/starship.toml
index 39113f18..5a1fbca6 100644
--- a/dotfiles/config/starship.toml
+++ b/dotfiles/config/starship.toml
@@ -1,6 +1,4 @@
 # Inserts a blank line between shell prompts
-add_newline = true
-
-# Replace the "❯" symbol in the prompt with "➜"
-[character]                            # The name of the module we are configuring is "character"
-success_symbol = "[➜](bold green)"     # The "success_symbol" segment is being set to "➜" with the color "bold green"
+add_newline = false
+[character]
+success_symbol = "[➜](bold green)"     

From 58836b981fd57cc3107de776e01d4e04d97170a5 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 9 Aug 2021 18:26:53 -0600
Subject: [PATCH 5/5] [Starship] Make error and success symbol consistent

---
 dotfiles/config/starship.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotfiles/config/starship.toml b/dotfiles/config/starship.toml
index 5a1fbca6..9d6bd0a7 100644
--- a/dotfiles/config/starship.toml
+++ b/dotfiles/config/starship.toml
@@ -1,4 +1,4 @@
-# Inserts a blank line between shell prompts
 add_newline = false
 [character]
-success_symbol = "[➜](bold green)"     
+success_symbol = "[➜](bold green)"
+error_symbol = "[➜](bold red)"