huge XMonad update

3 files changed, 59 insertions, 26 deletions

diff --git a/xmonad/.config/xmobar/xmobarrc b/xmonad/.config/xmobar/xmobarrc
index 8d9ca95..b33f9d6 100644
--- a/xmonad/.config/xmobar/xmobarrc
+++ b/xmonad/.config/xmobar/xmobarrc
@@ -1,27 +1,20 @@
 Config {
-  bgColor = "#0f0e06"
-  , fgColor = "#cfbcba"
-  , border      = BottomB
+  bgColor = "#222524"
+  , fgColor = "#eaf2ef"
   , font        = "xft:Iosevka Comfy-12"
-  , additionalFonts = ["Noto Color Emoji-10", "Iosevka Nerd Font"]
+  , additionalFonts = ["Noto Color Emoji-12"]
   , position    = TopH 22
   , commands = [
       -- Network activity monitor (dynamic interface resolution)
-    Run Date "%Y-%m-%d (%a) %H:%M" "mydate" 10
+    Run Date "📅 %Y-%m-%d (%a) | 🕘 %H:%M:%S" "mydate" 10
     -- Run Com "<terminal app/script>" [<app arguments>] <template identifier> <refreshrate>
     , Run Com "notmuch" ["count", "tag:unread"] "unread-mail" 100
     , Run Com "notmuch" ["count", "tag:inbox"] "inbox-mail" 100
-    , Run Com "music-plain" [] "music" 50
-    , Run Com "weather-plain" [] "weather" 100
+    , Run Com "music" [] "music" 50
+    , Run Com "weather" [] "weather" 100
     , Run StdinReader -- text coming from xmonad
-    , Run DynNetwork [ "--template" , " :  <tx>kB/s  <rx>kB/s"
-                             , "--Low"      , "1000"       -- units: B/s
-                             , "--High"     , "5000"       -- units: B/s
-                             , "--low"      , "#64aa0f"
-                             , "--normal"   , "#d0730f"
-                             , "--high"     , "#ff4f58"
-                             ] 10
-    , Run ThermalZone 0 ["-t"," : <temp>C"] 30
+    , Run Com "memory" [] "memory" 100
+    , Run Com "internet" [] "internet" 100
     , Run MultiCpu       [ "--template" , "󰍛 : <total0>%|<total1>%"
                              , "--Low"      , "50"         -- units: %
                              , "--High"     , "85"         -- units: %
@@ -30,5 +23,5 @@ Config {
                              , "--high"     , "#ff4f58"
                              ] 10
     ]
-  , template = " %StdinReader% }{ <fc=#d0730f>%weather%</fc> | <fc=#64aa0f> : </fc><fc=#6a84af>[U]</fc> %unread-mail% <fc=#82a0af>[I]</fc> %inbox-mail% | <fc=#6a84af>%music%</fc> | %multicpu% | %thermal0% | %dynnetwork% | 󰃰: %mydate% "
+  , template = " %StdinReader% }{ <action=`st -c 'floatterm' -e btop` button=2>%memory%</action> | <action=`st -c 'floatterm' -e nmtui` button=2>%internet%</action> | <action=`st -c 'floatterm' -e less -Sfr ~/.cache/weather` button=2>%weather%</action> | <action=`emacs-launcher mail` button=2>📬: %unread-mail%/%inbox-mail%</action> | <action=`st -c 'floatterm' -e alsamixer` button=2>%volume-pulseaudio% </action>| <action=`emacs-launcher music` button=1>%music%</action> | %mydate% "
 }
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs b/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs
new file mode 100644
index 0000000..3546cde
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs
@@ -0,0 +1,17 @@
+module Colors.Ef.EleaDark where
+
+import XMonad
+
+fg              = "#eaf2ef"
+bg              = "#222524"
+bg_active       = "#35605d"
+bg_alt          = "#3e4140"
+red             = "#ff656a"
+green           = "#7fca5a"
+yellow          = "#e0b02f"
+active_fg       = "#8fcfbb"
+active_border   = "#35605d"
+tab_fg          = "#ecf0ff"
+inactive_border = "#2b2e2d"
+purple          = "#f59acf"
+inactive_fg     = "#969faf"
diff --git a/xmonad/.config/xmonad/xmonad.hs b/xmonad/.config/xmonad/xmonad.hs
index ce5223f..7228485 100644
--- a/xmonad/.config/xmonad/xmonad.hs
+++ b/xmonad/.config/xmonad/xmonad.hs
@@ -8,6 +8,10 @@ import XMonad.Layout.Tabbed
 import XMonad.Layout.NoBorders
 import XMonad.Layout.ResizableTile
 import XMonad.Layout.Simplest
+import XMonad.Layout.Spacing
+import XMonad.Layout.ToggleLayouts
+import XMonad.Layout.LayoutCombinators (JumpToLayout(..))
+import XMonad.Layout.Renamed (renamed, Rename(Replace))
 
 -- window swallowing
 import XMonad.Hooks.WindowSwallowing
@@ -21,13 +25,14 @@ import XMonad.Util.Run(spawnPipe)
 import XMonad.Hooks.DynamicLog
 import System.IO
 import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.ManageHelpers
 
 import qualified XMonad.StackSet as W
 
 import XMonad.Hooks.EwmhDesktops
 
 -- Custom theme
-import Colors.Ef.Autumn
+import Colors.Ef.EleaDark
 
 main :: IO()
 main = do
@@ -45,7 +50,7 @@ term = "st"
 myConfig xmprocs = def
   {
     modMask = mod4Mask
-  , layoutHook = avoidStruts $ myLayout
+  , layoutHook = myLayout
   , workspaces = myWorkspaces
   , handleEventHook = swallowEventHook (className =? "St" <||> className =? "st") (return True)
   , logHook = myLogHook xmprocs
@@ -57,7 +62,7 @@ myConfig xmprocs = def
   }
   `additionalKeysP` myKeys
 
-myWorkspaces = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"]
+myWorkspaces = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十" ]
 
 myKeys =
   [("M-q", kill)
@@ -126,7 +131,8 @@ myKeys =
   , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 10")
 
   -- main programs
-  , ("M-w", spawn "firefox-bin")
+  , ("M-w", spawn "librewolf-bin")
+  , ("M-S-w", spawn "firefox-bin")
 
   -- emacs
   , ("M-e", spawn "emacs")
@@ -136,6 +142,11 @@ myKeys =
   , ("M-S-n", spawn "emacs-launcher")
   , ("M-b", spawn "scratch.sh")
 
+  , ("M-f", sendMessage $ ToggleLayout)
+  , ("M-t", sendMessage $ JumpToLayout "[T]")
+  , ("M-S-t", sendMessage $ JumpToLayout "|||")
+  , ("M-i", sendMessage $ JumpToLayout "|M|")
+
   ]
 
 
@@ -152,13 +163,24 @@ myTabConfig = def { activeColor = bg_active
                   , fontName = "xft:Iosevka Comfy:size=13"
                   }
 
-myLayout = tiled ||| Mirror tiled ||| tabbedBottom
+
+
+mySpacing = spacingRaw False            -- False=Apply even when single window
+                       (Border 5 5 5 5) -- Screen border size top bot rght lft
+                       True             -- Enable screen border
+                       (Border 5 5 5 5) -- Window border size
+                       True             -- Enable window borders
+
+myLayout = avoidStruts $ toggleLayouts full (tiled ||| bstack ||| tabbedBottom ||| column ||| full)
   where
-    tiled    = Tall nmaster delta ratio
-    nmaster  = 1      -- Default number of windows in the master pane
-    ratio    = 1/2    -- Default proportion of screen occupied by master pane
-    delta    = 3/100  -- Percent of screen to increment by when resizing panes
-    tabbedBottom = tabbed shrinkText myTabConfig
+    tiled        = renamed [Replace "[]"] $ mySpacing (Tall nmaster delta ratio)
+    bstack        = renamed [Replace "TTT"] $ Mirror tiled
+    nmaster      = 1
+    ratio        = 1/2
+    delta        = 3/100
+    tabbedBottom = renamed [Replace "[T]"] $ tabbed shrinkText myTabConfig
+    column       = renamed [Replace "|M|"] $ mySpacing (ThreeColMid 1 (3/100) (1/2))
+    full         = renamed [Replace "[M]"] $ Full
 
 myLogHook xmprocs = mapM_ (\xmproc -> dynamicLogWithPP xmobarPP
     { ppOutput = hPutStrLn xmproc
@@ -174,5 +196,6 @@ myLogHook xmprocs = mapM_ (\xmproc -> dynamicLogWithPP xmobarPP
 
 myManageHook = composeAll
   [ className =? "conky" --> doIgnore  -- Ignore Conky so it doesn't get tiled
+  , className =? "floatterm" --> doRectFloat (W.RationalRect 0.125 0.125 0.75 0.75)
   , manageDocks  -- Ensure docks (like xmobar) are managed correctly
   ] <+> manageHook def