From 66523acc00742798e3435d9b6a14ed22b008e541 Mon Sep 17 00:00:00 2001 From: Daniele Fucini Date: Fri, 26 Apr 2024 20:21:28 +0200 Subject: [PATCH] Update xmonad colors --- .bash_aliases | 2 +- .config/xmobar/xmobarrc_hdmi | 41 ++++++++++++++++------------------ .config/xmobar/xmobarrc_laptop | 38 +++++++++++++++---------------- .config/xmonad/xmonad.hs | 32 +++++++++++++------------- 4 files changed, 55 insertions(+), 58 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 7492538..7785a69 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -7,7 +7,7 @@ alias rm='rm -I' alias sort='sort -n' alias ssh='kitten ssh' alias sudo='sudo ' -alias trayer='trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 7 --transparent true --tint 0x1f2022 --height 18 --monitor 0' +alias trayer='trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 7 --transparent true --tint 0x232634 --height 18 --monitor 0' alias trc='trash-empty' alias trl='trash-list' alias trm='trash-rm' diff --git a/.config/xmobar/xmobarrc_hdmi b/.config/xmobar/xmobarrc_hdmi index ed754ad..2acccc2 100644 --- a/.config/xmobar/xmobarrc_hdmi +++ b/.config/xmobar/xmobarrc_hdmi @@ -1,53 +1,50 @@ Config { overrideRedirect = False , font = "Jetbrains Mono Nerd Font Bold 9" - , bgColor = "black" - , fgColor = "#646464" + , bgColor = "#232634" + , fgColor = "#626880" , position = TopW L 93 , border = NoBorder - , borderColor = "#646464" + , borderColor = "#232634" , allDesktops = True , pickBroadest = True , commands = [ Run Weather "LZIB" [ "--template", " °C" , "-L", "0" , "-H", "25" - , "--low" , "lightblue" - , "--normal" , "#f8f8f2" - , "--high" , "darkred" + , "--low" , "#8caaee" + , "--normal" , "#a6d189" + , "--high" , "#eebebe" ] 9000 , Run MultiCpu [ "--template" , "Cpu: %" , "--Low" , "25" , "--High" , "75" - , "--low" , "darkgreen" - , "--normal" , "darkorange" - , "--high" , "darkred" + , "--low" , "#a6d189" + , "--normal" , "#ef9f76" + , "--high" , "#eebebe" ] 10 , Run CoreTemp [ "--template" , "Temp: °C|°C|°C|°C|°C|°C" , "--Low" , "60" , "--High" , "85" - , "--low" , "darkgreen" - , "--normal" , "darkorange" - , "--high" , "darkred" + , "--low" , "#a6d189" + , "--normal" , "#ef9f76" + , "--high" , "#eebebe" ] 50 , Run Memory [ "--template" , "Mem: %" , "--Low" , "20" , "--High" , "60" - , "--low" , "darkgreen" - , "--normal" , "darkorange" - , "--high" , "darkred" + , "--low" , "#a6d189" + , "--normal" , "#ef9f76" + , "--high" , "#eebebe" ] 10 , Run Kbd - [ ("it" , "IT") - , ("us" , "US") - , ("sk(qwerty)" , "SK") + [ ("it" , "IT") + , ("us" , "US") + , ("sk(qwerty)" , "SK") ] - , Run Date "%a %Y-%m-%d %H:%M" "date" 10 - , Run Uptime - [ "--template" , "Uptime: d h m" - ] 600 + , Run Date "%a %Y-%m-%d %H:%M" "date" 10 , Run XMonadLog ] , sepChar = "%" diff --git a/.config/xmobar/xmobarrc_laptop b/.config/xmobar/xmobarrc_laptop index 48b1c00..0a1dc30 100644 --- a/.config/xmobar/xmobarrc_laptop +++ b/.config/xmobar/xmobarrc_laptop @@ -1,50 +1,50 @@ Config { overrideRedirect = False , font = "Jetbrains Mono Nerd Font Bold 9" - , bgColor = "black" - , fgColor = "#646464" + , bgColor = "#232634" + , fgColor = "#626880" , position = Top , border = NoBorder - , borderColor = "#646464" + , borderColor = "#232634" , allDesktops = True , pickBroadest = True , commands = [ Run Weather "LZIB" [ "--template", " °C" , "-L", "0" , "-H", "25" - , "--low" , "lightblue" - , "--normal" , "#f8f8f2" - , "--high" , "darkred" + , "--low" , "#8caaee" + , "--normal" , "#a6d189" + , "--high" , "#eebebe" ] 9000 , Run MultiCpu [ "--template" , "Cpu: %" , "--Low" , "25" , "--High" , "75" - , "--low" , "darkgreen" - , "--normal" , "darkorange" - , "--high" , "darkred" + , "--low" , "#a6d189" + , "--normal" , "#ef9f76" + , "--high" , "#eebebe" ] 10 , Run CoreTemp [ "--template" , "Temp: °C|°C|°C|°C|°C|°C" , "--Low" , "60" , "--High" , "85" - , "--low" , "darkgreen" - , "--normal" , "darkorange" - , "--high" , "darkred" + , "--low" , "#a6d189" + , "--normal" , "#ef9f76" + , "--high" , "#eebebe" ] 50 , Run Memory [ "--template" , "Mem: %" , "--Low" , "20" , "--High" , "60" - , "--low" , "darkgreen" - , "--normal" , "darkorange" - , "--high" , "darkred" + , "--low" , "#a6d189" + , "--normal" , "#ef9f76" + , "--high" , "#eebebe" ] 10 , Run Kbd - [ ("it" , "IT") - , ("us" , "US") - , ("sk(qwerty)" , "SK") + [ ("it" , "IT") + , ("us" , "US") + , ("sk(qwerty)" , "SK") ] - , Run Date "%a %Y-%m-%d %H:%M" "date" 10 + , Run Date "%a %Y-%m-%d %H:%M" "date" 10 , Run Uptime [ "--template" , "Uptime: d h m" ] 600 diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index d28cf6b..7a2cc19 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -56,10 +56,10 @@ myBrowser :: String myBrowser = "vivaldi" myNormBorderColor :: String -myNormBorderColor = "#000000" +myNormBorderColor = "#232634" myFocusBorderColor :: String -myFocusBorderColor = "#006700" +myFocusBorderColor = "#81c8be" myKeyboardLayoutIT :: String myKeyboardLayoutIT = " -layout it" @@ -141,8 +141,8 @@ myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myG myTabbed = renamed [Replace "Tabbed"] $ tabbed shrinkText myTabConfig - myTabConfig = def { activeColor = "#393939" - , inactiveColor = "#191b1c" + myTabConfig = def { activeColor = "#737994" + , inactiveColor = "#232634" } tiled = Tall nmaster delta ratio nmaster = 1 @@ -155,28 +155,28 @@ xmobar2 = statusBarProp "xmobar -x 1 ~/.config/xmobar/xmobarrc_hdmi" (pure myXmo myXmobarPP :: PP myXmobarPP = def - { ppSep = darkgreen " • " + { ppSep = teal " • " , ppTitleSanitize = xmobarStrip - , ppCurrent = wrap " " "" . xmobarBorder "Top" "#8be9fd" 2 + , ppCurrent = wrap " " "" . xmobarBorder "Top" "#81c8be" 2 , ppHidden = white . wrap " " "" - , ppHiddenNoWindows = lowWhite . wrap " " "" + , ppHiddenNoWindows = surface0 . wrap " " "" , ppUrgent = red . wrap (yellow "!") (yellow "!") , ppOrder = \[ws, l, _, wins] -> [ws, l, wins] , ppExtras = [logTitles formatFocused formatUnfocused] } where - formatFocused = wrap (white "[") (white "]") . darkgreen . ppWindow - formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . white . ppWindow + formatFocused = wrap (white "[") (white "]") . teal . ppWindow + formatUnfocused = wrap (surface0 "[") (surface0 "]") . white . ppWindow ppWindow :: String -> String - ppWindow = xmobarRaw . (\w -> if null w then "untitled" else w) . shorten 25 + ppWindow = xmobarRaw . (\w -> if null w then "untitled" else w) . shorten 30 - lowWhite, darkgreen, red, white, yellow :: String -> String - darkgreen = xmobarColor "#013220" "" + surface0, teal, red, white, yellow :: String -> String + teal = xmobarColor "#81c8be" "" white = xmobarColor "#f8f8f2" "" - yellow = xmobarColor "#f1fa8c" "" - red = xmobarColor "#ff5555" "" - lowWhite = xmobarColor "#bbbbbb" "" + yellow = xmobarColor "#e5c890" "" + red = xmobarColor "#e78284" "" + surface0 = xmobarColor "#414559" "" -- Autostart myStartupHook :: X () @@ -187,7 +187,7 @@ myStartupHook = do spawnOnce "xautolock -time 10 -locker slock -detectsleep" spawnOnce "trayer --edge top --align right --SetDockType true \ \--SetPartialStrut true --expand true --width 7 \ - \--transparent true --tint 0x1f2022 --height 18 \ + \--transparent true --tint 0x232634 --height 18 \ \--monitor 0" spawnOnce "redshift-gtk" spawnOnce "udiskie"