ef-themes xmonad

4 files changed, 53 insertions, 18 deletions

diff --git a/xmonad/.config/xmobar/xmobarrc b/xmonad/.config/xmobar/xmobarrc
index 42196c2..8d9ca95 100644
--- a/xmonad/.config/xmobar/xmobarrc
+++ b/xmonad/.config/xmobar/xmobarrc
@@ -1,13 +1,13 @@
 Config {
-  bgColor = "#181818"
-  , fgColor = "#e4e4e4"
+  bgColor = "#0f0e06"
+  , fgColor = "#cfbcba"
   , border      = BottomB
   , font        = "xft:Iosevka Comfy-12"
-  , additionalFonts = ["Noto Color Emoji-12", "Iosevka Nerd Font"]
+  , additionalFonts = ["Noto Color Emoji-10", "Iosevka Nerd Font"]
   , position    = TopH 22
   , commands = [
       -- Network activity monitor (dynamic interface resolution)
-    Run Date "%Y-%m-%d (%a) %H:%M:%S" "mydate" 10
+    Run Date "%Y-%m-%d (%a) %H:%M" "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
@@ -17,18 +17,18 @@ Config {
     , Run DynNetwork [ "--template" , " :  <tx>kB/s  <rx>kB/s"
                              , "--Low"      , "1000"       -- units: B/s
                              , "--High"     , "5000"       -- units: B/s
-                             , "--low"      , "#73c936"
-                             , "--normal"   , "#ce5c00"
+                             , "--low"      , "#64aa0f"
+                             , "--normal"   , "#d0730f"
                              , "--high"     , "#ff4f58"
                              ] 10
     , Run ThermalZone 0 ["-t"," : <temp>C"] 30
     , Run MultiCpu       [ "--template" , "󰍛 : <total0>%|<total1>%"
                              , "--Low"      , "50"         -- units: %
                              , "--High"     , "85"         -- units: %
-                             , "--low"      , "#73c936"
-                             , "--normal"   , "#ce5c00"
+                             , "--low"      , "#64aa0f"
+                             , "--normal"   , "#d0730f"
                              , "--high"     , "#ff4f58"
                              ] 10
     ]
-  , template = " %StdinReader% }{ <fc=#ffdd33>%weather%</fc> | <fc=#73c936> : </fc><fc=#729FCF>[U]</fc> %unread-mail% <fc=#95a99f>[I]</fc> %inbox-mail% | <fc=#96a6c8>%music%</fc> | %multicpu% | %thermal0% | %dynnetwork% | 󰃰: %mydate% "
+  , 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% "
 }
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs b/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs
new file mode 100644
index 0000000..f11a9ba
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs
@@ -0,0 +1,17 @@
+module Colors.Ef.Arbutus where
+
+import XMonad
+
+fg              = "#393330"
+bg              = "#ffead8"
+bg_active       = "#e9a0a0"
+bg_alt          = "#c7b2ab"
+red             = "#b20f00"
+green           = "#007000"
+yellow          = "#906200"
+active_fg       = "#aa184f"
+active_border   = "#e9a0a0"
+tab_fg          = "#40231f"
+inactive_border = "#c7b2ab"
+purple          = "#a23ea4"
+inactive_fg     = "#6e678f"
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs b/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs
new file mode 100644
index 0000000..2df3390
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs
@@ -0,0 +1,17 @@
+module Colors.Ef.Autumn where
+
+import XMonad
+
+fg              = "#cfbcba"
+bg              = "#0f0e06"
+bg_active       = "#692a12"
+bg_alt          = "#36322f"
+red             = "#ef656a"
+green           = "#2fa526"
+yellow          = "#c48702"
+active_fg       = "#379cf6"
+active_border   = "#692a12"
+tab_fg          = "#feeeca"
+inactive_border = "#36322f"
+purple          = "#d570af"
+inactive_fg     = "#887c8a"
diff --git a/xmonad/.config/xmonad/xmonad.hs b/xmonad/.config/xmonad/xmonad.hs
index f00fff9..ce5223f 100644
--- a/xmonad/.config/xmonad/xmonad.hs
+++ b/xmonad/.config/xmonad/xmonad.hs
@@ -26,6 +26,9 @@ import qualified XMonad.StackSet as W
 
 import XMonad.Hooks.EwmhDesktops
 
+-- Custom theme
+import Colors.Ef.Autumn
+
 main :: IO()
 main = do
   nScreens <- countScreens
@@ -46,7 +49,7 @@ myConfig xmprocs = def
   , workspaces = myWorkspaces
   , handleEventHook = swallowEventHook (className =? "St" <||> className =? "st") (return True)
   , logHook = myLogHook xmprocs
-  , startupHook = spawn "conky -c ~/.config/conky/conky.conf"
+  -- , startupHook = spawn "conky -c ~/.config/conky/conky.conf"
   , manageHook = myManageHook
   , borderWidth = 3
   , focusedBorderColor = active_border  -- Focused window border color
@@ -60,7 +63,6 @@ myKeys =
   [("M-q", kill)
   -- window management
   , ("M-z", windows W.swapMaster)
-  , ("M-S-<Space>", withFocused $ windows . W.sink)
 
   -- workspaces
   -- viewing
@@ -95,6 +97,7 @@ myKeys =
 
   -- monitors
   , ("M-S-l", nextScreen)
+  , ("M-i", nextScreen)
   , ("M-S-h", prevScreen)
   , ("M-C-h", shiftPrevScreen)
   , ("M-C-l", shiftNextScreen)
@@ -114,17 +117,16 @@ myKeys =
   , ("<XF86AudioPause>", spawn "playerctl pause")
   , ("<XF86AudioNext>", spawn "playerctl next")
   , ("<XF86AudioPrev>", spawn "playerctl previous")
-  , ("<XF86AudioRaiseVolume>", spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+")
-  , ("<XF86AudioLowerVolume>", spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-")
-  , ("<XF86AudioMute>", spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")
+  , ("<XF86AudioRaiseVolume>", spawn "pactl set-sink-volume @DEFAULT_SINK@ +5%")
+  , ("<XF86AudioLowerVolume>", spawn "pactl set-sink-volume @DEFAULT_SINK@ -5%")
+  , ("<XF86AudioMute>", spawn "pactl set-sink-mute @DEFAULT_SINK@ toggle")
 
   -- brightness
   , ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 10")
   , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 10")
 
   -- main programs
-  -- , ("M-w", spawn "librewolf-bin")
-  , ("M-S-w", spawn "firefox")
+  , ("M-w", spawn "firefox-bin")
 
   -- emacs
   , ("M-e", spawn "emacs")
@@ -134,7 +136,6 @@ myKeys =
   , ("M-S-n", spawn "emacs-launcher")
   , ("M-b", spawn "scratch.sh")
 
-  -- mouse bindings
   ]
 
 
@@ -162,7 +163,7 @@ myLayout = tiled ||| Mirror tiled ||| tabbedBottom
 myLogHook xmprocs = mapM_ (\xmproc -> dynamicLogWithPP xmobarPP
     { ppOutput = hPutStrLn xmproc
     , ppTitle = xmobarColor green "" . shorten 50
-    , ppLayout = xmobarColor purple ""
+    , ppLayout = xmobarColor yellow ""
     , ppSep = " | "
     , ppCurrent = xmobarColor active_fg "" . wrap "[" "]"
     , ppVisible = wrap "[" "]"