Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2021-08-11 19:25:02 -06:00
commit 2d99e5337f
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 15 additions and 11 deletions

View File

@ -1,6 +1,4 @@
# Inserts a blank line between shell prompts add_newline = false
add_newline = true [character]
success_symbol = "[➜](bold green)"
# Replace the "" symbol in the prompt with "➜" error_symbol = "[➜](bold red)"
[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"

View File

@ -127,7 +127,7 @@ logDebug = do
cssFileByHostname = cssFileByHostname =
[ ("uber-loaner", "uber-loaner.css") [ ("uber-loaner", "uber-loaner.css")
, ("imalison-home", "taffybar.css") , ("imalison-home", "taffybar.css")
, ("ivanm-dfinity-razer", "ivanm-dfinity-razer.css") , ("ivanm-dfinity-razer", "taffybar.css")
, ("ryzen-shine", "taffybar.css") , ("ryzen-shine", "taffybar.css")
] ]
@ -193,7 +193,6 @@ main = do
shortLaptopEndWidgets = shortLaptopEndWidgets =
[ myBatteryIcon [ myBatteryIcon
, myBatteryText , myBatteryText
, myClock
, myTray , myTray
, myICP , myICP
, myMpris , myMpris

View File

@ -255,6 +255,7 @@ hostNameToAction =
] ]
myStartup = do myStartup = do
setToggleActiveAll AVOIDSTRUTS True
setToggleActiveAll GAPS True setToggleActiveAll GAPS True
setToggleActiveAll NOBORDERS True setToggleActiveAll NOBORDERS True
hostName <- io getHostName hostName <- io getHostName
@ -283,6 +284,7 @@ data MyToggles
| GAPS | GAPS
| MAGICFOCUS | MAGICFOCUS
| MAGNIFY | MAGNIFY
| AVOIDSTRUTS
deriving (Read, Show, Eq, Typeable) deriving (Read, Show, Eq, Typeable)
instance Transformer MyToggles Window where instance Transformer MyToggles Window where
@ -290,10 +292,15 @@ instance Transformer MyToggles Window where
transform GAPS x k = k (smartSpacing 5 x) unmodifyLayout transform GAPS x k = k (smartSpacing 5 x) unmodifyLayout
transform MAGICFOCUS x k = k (magicFocus x) unmodifyLayout transform MAGICFOCUS x k = k (magicFocus x) unmodifyLayout
transform MAGNIFY x k = k (myMagnify 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] 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 instance Eq (Toggle Window) where
(Toggle v) == v2 = Just v == fromToggle v2 (Toggle v) == v2 = Just v == fromToggle v2
@ -397,9 +404,9 @@ layoutNames = [description layout | layout <- layoutList]
selectLayout = myDmenu layoutNames >>= (sendMessage . JumpToLayout) selectLayout = myDmenu layoutNames >>= (sendMessage . JumpToLayout)
myLayoutHook = myLayoutHook =
avoidStruts .
minimizeNoDescription . minimizeNoDescription .
boringAuto . boringAuto .
mkToggle1 AVOIDSTRUTS .
mkToggle1 MIRROR . mkToggle1 MIRROR .
mkToggle1 LIMIT . mkToggle1 LIMIT .
mkToggle1 GAPS . mkToggle1 GAPS .