From 8d9f02da8daa914a1c92665a5c3b96e9b97478d2 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Fri, 3 Dec 2021 13:39:39 -0600 Subject: [PATCH] Adding modular colorschemes to Xmonad. --- .config/alacritty/alacritty.yml | 24 +++++----- .config/xmobar/palenight-xmobarrc | 66 ++++++++++++++++++++++++++++ .xmonad/README.org | 21 ++++----- .xmonad/lib/Colors/DoomOne.hs | 4 ++ .xmonad/lib/Colors/Dracula.hs | 32 +++++++------- .xmonad/lib/Colors/GruvboxDark.hs | 32 +++++++------- .xmonad/lib/Colors/MonokaiPro.hs | 36 ++++++++------- .xmonad/lib/Colors/Nord.hs | 36 ++++++++------- .xmonad/lib/Colors/OceanicNext.hs | 36 ++++++++------- .xmonad/lib/Colors/SolarizedDark.hs | 36 ++++++++------- .xmonad/lib/Colors/SolarizedLight.hs | 36 ++++++++------- .xmonad/lib/Colors/TomorrowNight.hs | 36 ++++++++------- .xmonad/xmonad.hs | 39 ++++++++-------- 13 files changed, 265 insertions(+), 169 deletions(-) create mode 100644 .config/xmobar/palenight-xmobarrc diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 899e1f8..2bb74e1 100755 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -455,17 +455,17 @@ schemes: cyan: '#a3f7ff' white: '#ffffff' - ### Solarized Light ### - solarized-light: &solarized-light + ### Solarized Dark ### + solarized-dark: &solarized-dark # Default colors primary: - background: '#fdf6e3' # base3 - foreground: '#657b83' # base00 + background: '#002b36' # base03 + foreground: '#839496' # base0 # Cursor colors cursor: - text: '#fdf6e3' # base3 - cursor: '#657b83' # base00 + text: '#002b36' # base03 + cursor: '#839496' # base0 # Normal colors normal: @@ -489,17 +489,17 @@ schemes: cyan: '#93a1a1' # base1 white: '#fdf6e3' # base3 - ### Solarized Dark ### - solarized-dark: &solarized-dark + ### Solarized Light ### + solarized-light: &solarized-light # Default colors primary: - background: '#002b36' # base03 - foreground: '#839496' # base0 + background: '#fdf6e3' # base3 + foreground: '#657b83' # base00 # Cursor colors cursor: - text: '#002b36' # base03 - cursor: '#839496' # base0 + text: '#fdf6e3' # base3 + cursor: '#657b83' # base00 # Normal colors normal: diff --git a/.config/xmobar/palenight-xmobarrc b/.config/xmobar/palenight-xmobarrc new file mode 100644 index 0000000..51c0cf9 --- /dev/null +++ b/.config/xmobar/palenight-xmobarrc @@ -0,0 +1,66 @@ +-- Xmobar (http://projects.haskell.org/xmobar/) +-- This is one of the xmobar configurations for DTOS. +-- This config is packaged in the DTOS repo as 'dtos-xmobar' +-- Color scheme: Palenight +-- Dependencies: + -- otf-font-awesome + -- ttf-mononoki + -- ttf-ubuntu-font-family + -- htop + -- emacs + -- pacman (Arch Linux) + -- trayer + -- 'dtos-local-bin' (from dtos-core-repo) + +Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=true" + , additionalFonts = [ "xft:Mononoki:pixelsize=11:antialias=true:hinting=true" + , "xft:Font Awesome 5 Free Solid:pixelsize=12" + , "xft:Font Awesome 5 Brands:pixelsize=12" + ] + , bgColor = "#292d3e" + , fgColor = "#f07178" + -- Position TopSize and BottomSize take 3 arguments: + -- an alignment parameter (L/R/C) for Left, Right or Center. + -- an integer for the percentage width, so 100 would be 100%. + -- an integer for the minimum pixel height for xmobar, so 24 would force a height of at least 24 pixels. + -- NOTE: The height should be the same as the trayer (system tray) height. + , position = TopSize L 100 24 + , lowerOnStart = True + , hideOnStart = False + , allDesktops = True + , persistent = True + , iconRoot = ".xmonad/xpm/" -- default: "." + , commands = [ + -- Echos a "penguin" icon in front of the kernel output. + Run Com "echo" ["\xf17c"] "penguin" 3600 + -- Get kernel version (script found in .local/bin) + , Run Com ".local/bin/kernel" [] "kernel" 36000 + -- Cpu usage in percent + , Run Cpu ["-t", "\xf108 cpu: (%)","-H","50","--high","red"] 20 + -- Ram used number and percent + , Run Memory ["-t", "\xf233 mem: M (%)"] 20 + -- Disk space free + , Run DiskU [("/", "\xf0c7 hdd: free")] [] 60 + -- Echos an "up arrow" icon in front of the uptime output. + , Run Com "echo" ["\xf0aa"] "uparrow" 3600 + -- Uptime + , Run Uptime ["-t", "uptime: d h"] 360 + -- Echos a "bell" icon in front of the pacman updates. + , Run Com "echo" ["\xf0f3"] "bell" 3600 + -- Check for pacman updates (script found in .local/bin) + , Run Com ".local/bin/pacupdate" [] "pacupdate" 36000 + -- Echos a "battery" icon in front of the pacman updates. + , Run Com "echo" ["\xf242"] "baticon" 3600 + -- Battery + , Run BatteryP ["BAT0"] ["-t", " (%)"] 360 + -- Time and date + , Run Date "\xf017 %b %d %Y - (%H:%M) " "date" 50 + -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. + , Run Com ".config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 + -- Prints out the left side items such as workspaces, layout, etc. + , Run UnsafeStdinReader + ] + , sepChar = "%" + , alignSep = "}{" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + } diff --git a/.xmonad/README.org b/.xmonad/README.org index 339ef6e..61af44c 100644 --- a/.xmonad/README.org +++ b/.xmonad/README.org @@ -113,6 +113,7 @@ import XMonad.Util.SpawnOnce -- MonokaiPro -- Nord -- OceanicNext + -- Palenight -- SolarizedDark -- SolarizedLight -- TomorrowNight @@ -145,11 +146,11 @@ myEditor = "emacsclient -c -a 'emacs' " -- Sets emacs as editor myBorderWidth :: Dimension myBorderWidth = 2 -- Sets border width for windows -myNormColor :: String -myNormColor = "#282c34" -- Border color of normal windows +myNormColor :: String -- Border color of normal windows +myNormColor = colorBack -- This variable is imported from Colors.THEME -myFocusColor :: String -myFocusColor = "#46d9ff" -- Border color of focused windows +myFocusColor :: String -- Border color of focused windows +myFocusColor = color15 -- This variable is imported from Colors.THEME windowCount :: X (Maybe String) windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset @@ -352,12 +353,12 @@ wideAccordion = renamed [Replace "wideAccordion"] -- setting colors for tabs layout and tabs sublayout. myTabTheme = def { fontName = myFont - , activeColor = "#46d9ff" - , inactiveColor = "#313846" - , activeBorderColor = "#46d9ff" - , inactiveBorderColor = "#282c34" - , activeTextColor = "#282c34" - , inactiveTextColor = "#d0d0d0" + , activeColor = color15 + , inactiveColor = color08 + , activeBorderColor = color15 + , inactiveBorderColor = colorBack + , activeTextColor = colorBack + , inactiveTextColor = color16 } -- Theme for showWName which prints current workspace when you change workspaces. diff --git a/.xmonad/lib/Colors/DoomOne.hs b/.xmonad/lib/Colors/DoomOne.hs index 9e26946..0c17402 100644 --- a/.xmonad/lib/Colors/DoomOne.hs +++ b/.xmonad/lib/Colors/DoomOne.hs @@ -3,6 +3,10 @@ module Colors.DoomOne where import XMonad colorScheme = "doom-one" + +colorBack = "#282c34" +colorFore = "#bbc2cf" + color01 = "#1c1f24" color02 = "#ff6c6b" color03 = "#98be65" diff --git a/.xmonad/lib/Colors/Dracula.hs b/.xmonad/lib/Colors/Dracula.hs index 0c4e661..98aafe1 100644 --- a/.xmonad/lib/Colors/Dracula.hs +++ b/.xmonad/lib/Colors/Dracula.hs @@ -3,19 +3,19 @@ module Colors.Dracula where import XMonad colorScheme = "dracula" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" +color01="#000000" +color02="#ff5555" +color03="#50fa7b" +color04="#f1fa8c" +color05="#bd93f9" +color06="#ff79c6" +color07="#8be9fd" +color08="#bfbfbf" +color09="#4d4d4d" +color10="#ff6e67" +color11="#5af78e" +color12="#f4f99d" +color13="#caa9fa" +color14="#ff92d0" +color15="#9aedfe" +color16="#e6e6e6" diff --git a/.xmonad/lib/Colors/GruvboxDark.hs b/.xmonad/lib/Colors/GruvboxDark.hs index e0c6fac..64d4f6e 100644 --- a/.xmonad/lib/Colors/GruvboxDark.hs +++ b/.xmonad/lib/Colors/GruvboxDark.hs @@ -3,19 +3,19 @@ module Colors.GruvboxDark where import XMonad colorScheme = "gruvbox-dark" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" +color01 = "#282828" +color02 = "#cc241d" +color03 = "#98971a" +color04 = "#d79921" +color05 = "#458588" +color06 = "#b16286" +color07 = "#689d6a" +color08 = "#a89984" +color09 = "#928374" +color10 = "#fb4934" +color11 = "#b8bb26" +color12 = "#fabd2f" +color13 = "#83a598" +color14 = "#d3869b" +color15 = "#8ec07c" +color16 = "#ebdbb2" diff --git a/.xmonad/lib/Colors/MonokaiPro.hs b/.xmonad/lib/Colors/MonokaiPro.hs index 29a5ef5..131cdad 100644 --- a/.xmonad/lib/Colors/MonokaiPro.hs +++ b/.xmonad/lib/Colors/MonokaiPro.hs @@ -3,19 +3,23 @@ module Colors.MonokaiPro where import XMonad colorScheme = "monokai-pro" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" + +colorBack = "#2D2A2E" +colorFore = "#FCFCFA" + +color01 = "#403E41" +color02 = "#FF6188" +color03 = "#A9DC76" +color04 = "#FFD866" +color05 = "#FC9867" +color06 = "#AB9DF2" +color07 = "#78DCE8" +color08 = "#FCFCFA" +color09 = "#727072" +color10 = "#FF6188" +color11 = "#A9DC76" +color12 = "#FFD866" +color13 = "#FC9867" +color14 = "#AB9DF2" +color15 = "#78DCE8" +color16 = "#FCFCFA" diff --git a/.xmonad/lib/Colors/Nord.hs b/.xmonad/lib/Colors/Nord.hs index 33a4510..909f54a 100644 --- a/.xmonad/lib/Colors/Nord.hs +++ b/.xmonad/lib/Colors/Nord.hs @@ -3,19 +3,23 @@ module Colors.Nord where import XMonad colorScheme = "nord" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" + +colorBack = "#2E3440" +colorFore = "#D8DEE9" + +color01 = "#343d46" +color02 = "#EC5f67" +color03 = "#99C794" +color04 = "#FAC863" +color05 = "#6699cc" +color06 = "#c594c5" +color07 = "#5fb3b3" +color08 = "#d8dee9" +color09 = "#343d46" +color10 = "#EC5f67" +color11 = "#99C794" +color12 = "#FAC863" +color13 = "#6699cc" +color14 = "#c594c5" +color15 = "#5fb3b3" +color16 = "#d8dee9" diff --git a/.xmonad/lib/Colors/OceanicNext.hs b/.xmonad/lib/Colors/OceanicNext.hs index 4ae177e..40f6cc5 100644 --- a/.xmonad/lib/Colors/OceanicNext.hs +++ b/.xmonad/lib/Colors/OceanicNext.hs @@ -3,19 +3,23 @@ module Colors.OceanicNext where import XMonad colorScheme = "oceanic-next" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" + +colorBack = "#1b2b34" +colorFore = "#d8dee9" + +color01 = "#343d46" +color02 = "#EC5f67" +color03 = "#99C794" +color04 = "#FAC863" +color05 = "#6699cc" +color06 = "#c594c5" +color07 = "#5fb3b3" +color08 = "#d8dee9" +color09 = "#343d46" +color10 = "#EC5f67" +color11 = "#99C794" +color12 = "#FAC863" +color13 = "#6699cc" +color14 = "#c594c5" +color15 = "#5fb3b3" +color16 = "#d8dee9" diff --git a/.xmonad/lib/Colors/SolarizedDark.hs b/.xmonad/lib/Colors/SolarizedDark.hs index 21e2dbc..e074c91 100644 --- a/.xmonad/lib/Colors/SolarizedDark.hs +++ b/.xmonad/lib/Colors/SolarizedDark.hs @@ -3,19 +3,23 @@ module Colors.SolarizedDark where import XMonad colorScheme = "solarized-dark" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" + +colorBack = "#002b36" +colorFore = "#839496" + +color01 = "#073642" +color02 = "#dc322f" +color03 = "#859900" +color04 = "#b58900" +color05 = "#268bd2" +color06 = "#d33682" +color07 = "#2aa198" +color08 = "#eee8d5" +color09 = "#002b36" +color10 = "#cb4b16" +color11 = "#586e75" +color12 = "#657b83" +color13 = "#839496" +color14 = "#6c71c4" +color15 = "#93a1a1" +color16 = "#fdf6e3" diff --git a/.xmonad/lib/Colors/SolarizedLight.hs b/.xmonad/lib/Colors/SolarizedLight.hs index a7a54e6..50dd4db 100644 --- a/.xmonad/lib/Colors/SolarizedLight.hs +++ b/.xmonad/lib/Colors/SolarizedLight.hs @@ -3,19 +3,23 @@ module Colors.SolarizedLight where import XMonad colorScheme = "solarized-light" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" + +colorBack = "#fdf6e3" +colorFore = "#657b83" + +color01 = "#073642" +color02 = "#dc322f" +color03 = "#859900" +color04 = "#b58900" +color05 = "#268bd2" +color06 = "#d33682" +color07 = "#2aa198" +color08 = "#eee8d5" +color09 = "#002b36" +color10 = "#cb4b16" +color11 = "#586e75" +color12 = "#657b83" +color13 = "#839496" +color14 = "#fdf6e3" -- Was color16 but too light for use in panel. +color15 = "#93a1a1" +color16 = "#6c71c4" -- Was color14 but needed a dark color in this spot. diff --git a/.xmonad/lib/Colors/TomorrowNight.hs b/.xmonad/lib/Colors/TomorrowNight.hs index 65ec832..69b9549 100644 --- a/.xmonad/lib/Colors/TomorrowNight.hs +++ b/.xmonad/lib/Colors/TomorrowNight.hs @@ -3,19 +3,23 @@ module Colors.TomorrowNight where import XMonad colorScheme = "tomorrow-night" -color01 = "#1c1f24" -color02 = "#ff6c6b" -color03 = "#98be65" -color04 = "#da8548" -color05 = "#51afef" -color06 = "#c678dd" -color07 = "#5699af" -color08 = "#202328" -color09 = "#5b6268" -color10 = "#da8548" -color11 = "#4db5bd" -color12 = "#ecbe7b" -color13 = "#3071db" -color14 = "#a9a1e1" -color15 = "#46d9ff" -color16 = "#dfdfdf" + +colorBack = "#1d1f21" +colorFore = "#c5c8c6" + +color01 = "#1d1f21" +color02 = "#cc6666" +color03 = "#b5bd68" +color04 = "#e6c547" +color05 = "#81a2be" +color06 = "#b294bb" +color07 = "#70c0ba" +color08 = "#373b41" +color09 = "#666666" +color10 = "#ff3334" +color11 = "#9ec400" +color12 = "#f0c674" +color13 = "#81a2be" +color14 = "#b77ee0" +color15 = "#54ced6" +color16 = "#282a2e" diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 7f4cbad..0fbc2e4 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -68,15 +68,16 @@ import XMonad.Util.SpawnOnce -- ColorScheme module (SET ONLY ONE!) -- Possible choice are: - -- doom-one - -- dracula - -- gruvbox-dark - -- monokai-pro - -- nord - -- oceanic-next - -- solarized-dark - -- solarized-light - -- tomorrow-night + -- DoomOne + -- Dracula + -- GruvboxDark + -- MonokaiPro + -- Nord + -- OceanicNext + -- Palenight + -- SolarizedDark + -- SolarizedLight + -- TomorrowNight import Colors.DoomOne myFont :: String @@ -101,11 +102,11 @@ myEditor = "emacsclient -c -a 'emacs' " -- Sets emacs as editor myBorderWidth :: Dimension myBorderWidth = 2 -- Sets border width for windows -myNormColor :: String -myNormColor = "#282c34" -- Border color of normal windows +myNormColor :: String -- Border color of normal windows +myNormColor = colorBack -- This variable is imported from Colors.THEME -myFocusColor :: String -myFocusColor = "#46d9ff" -- Border color of focused windows +myFocusColor :: String -- Border color of focused windows +myFocusColor = color15 -- This variable is imported from Colors.THEME windowCount :: X (Maybe String) windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset @@ -283,12 +284,12 @@ wideAccordion = renamed [Replace "wideAccordion"] -- setting colors for tabs layout and tabs sublayout. myTabTheme = def { fontName = myFont - , activeColor = "#46d9ff" - , inactiveColor = "#313846" - , activeBorderColor = "#46d9ff" - , inactiveBorderColor = "#282c34" - , activeTextColor = "#282c34" - , inactiveTextColor = "#d0d0d0" + , activeColor = color15 + , inactiveColor = color08 + , activeBorderColor = color15 + , inactiveBorderColor = colorBack + , activeTextColor = colorBack + , inactiveTextColor = color16 } -- Theme for showWName which prints current workspace when you change workspaces.