From c18863cd22399f8150ee4c67cc00ae6fe2802f40 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@ideascup.me>
Date: Thu, 25 Aug 2022 17:25:46 +0300
Subject: [PATCH] nix/wm/xmonad: some cosmetic changes

---
 nix/wm/xmonad/config.hs | 44 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/nix/wm/xmonad/config.hs b/nix/wm/xmonad/config.hs
index 30a5040..fd56569 100644
--- a/nix/wm/xmonad/config.hs
+++ b/nix/wm/xmonad/config.hs
@@ -61,21 +61,23 @@ myBorderWidth   = 2
 --
 myModMask       = mod1Mask
 
--- The default number of workspaces (virtual screens) and their names.
--- By default we use numeric strings, but any string may be used as a
--- workspace name. The number of workspaces is determined by the length
--- of this list.
---
--- A tagging example:
---
--- > workspaces = ["web", "irc", "code" ] ++ map show [4..9]
---
-myWorkspaces    = ["web", "dev", "dev2", "dev3", "fin", "sys", "com"]
+webWs = "web"
+finWs = "fin"
+sysWs = "sys"
+comWs = "com"
+devWs = ["dev", "dev2", "dev3"]
+myWorkspaces = [webWs] <> devWs <> [finWs, sysWs, comWs]
 
+
+blue   = "#2E9AFE"
+gray   = "#7F7F7F"
+orange = "#ea4300"
+purple = "#9058c7"
+red    = "#722222"
 -- Border colors for unfocused and focused windows, respectively.
 --
-myNormalBorderColor  = "#444"
-myFocusedBorderColor = "#2E9AFE"
+myNormalBorderColor  = gray
+myFocusedBorderColor = blue
 
 main :: IO ()
 main = mkDbusClient >>= main'
@@ -128,12 +130,6 @@ dbusOutput dbus str =
 polybarHook :: D.Client -> PP
 polybarHook dbus =
   let wrapper c = wrap ("%{F" <> c <> "}") "%{F-}"
-
-      blue   = "#2E9AFE"
-      gray   = "#7F7F7F"
-      orange = "#ea4300"
-      purple = "#9058c7"
-      red    = "#722222"
   in  def { ppOutput          = dbusOutput dbus
           , ppCurrent         = wrapper blue
           , ppVisible         = wrapper purple
@@ -159,8 +155,12 @@ myPolybarLogHook dbus = myLogHook <+> dynamicLogWithPP (polybarHook dbus)
 myLayout = avoidStruts . smartBorders $ (Mirror tiled ||| tiled ||| column3 ||| full)
   where
     full = Full
-    tiled = gapSpaced 5 $ Tall 1 (3/100) (1/2)
-    column3 = gapSpaced 5 $ ThreeColMid 1 (3/100) (1/2)
+    tiled = gapSpaced 5 $ Tall nmaster incRatio ratio
+    column3 = gapSpaced 5 $ ThreeColMid nmaster incRatio ratio
+
+    nmaster = 1
+    incRatio = (3/100)
+    ratio = (1/2)
 
     gapSpaced g = spacing g . myGaps g
     myGaps gap = gaps [(U, gap), (D, gap), (L, gap), (R, gap)]
@@ -218,8 +218,8 @@ myManageHook = composeAll
   , className =? "Gnome-calculator"       --> doFloat
   , className =? "Gnome-font-viewer"      --> doFloat
   , className =? "Org.gnome.Nautilus"     --> doFloat
-  , resource  =? "telegram-desktop"       --> doShift "com"
-  , className =? "Thunderbird"            --> doShift "com"
+  , resource  =? "telegram-desktop"       --> doShift comWs
+  , className =? "Thunderbird"            --> doShift comWs
   -- my libs
   , resource  =? "hwt"                    --> doFloat
   ]