diff --git a/gruvbox_colors.sh b/gruvbox_colors.sh new file mode 100755 index 0000000..5e1ece6 --- /dev/null +++ b/gruvbox_colors.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +export GRUVBOX_DARK0_HARD="#1d2021" +export GRUVBOX_DARK0="#282828" +export GRUVBOX_DARK0_SOFT="#32302f" +export GRUVBOX_DARK1="#3c3836" +export GRUVBOX_DARK2="#504945" +export GRUVBOX_DARK3="#665c54" +export GRUVBOX_DARK4="#7c6f64" + +export GRUVBOX_GRAY_245="#928374" +export GRUVBOX_GRAY_244="#928374" + +export GRUVBOX_LIGHT0_HARD="#f9f5d7" +export GRUVBOX_LIGHT0="#fbf1c7" +export GRUVBOX_LIGHT0_SOFT="#f2e5bc" +export GRUVBOX_LIGHT1="#ebdbb2" +export GRUVBOX_LIGHT2="#d5c4a1" +export GRUVBOX_LIGHT3="#bdae93" +export GRUVBOX_LIGHT4="#a89984" + +export GRUVBOX_BRIGHT_RED="#fb4934" +export GRUVBOX_BRIGHT_GREEN="#b8bb26" +export GRUVBOX_BRIGHT_YELLOW="#fabd2f" +export GRUVBOX_BRIGHT_BLUE="#83a598" +export GRUVBOX_BRIGHT_PURPLE="#d3869b" +export GRUVBOX_BRIGHT_AQUA="#8ec07c" +export GRUVBOX_BRIGHT_ORANGE="#fe8019" + +export GRUVBOX_NEUTRAL_RED="#cc241d" +export GRUVBOX_NEUTRAL_GREEN="#98971a" +export GRUVBOX_NEUTRAL_YELLOW="#d79921" +export GRUVBOX_NEUTRAL_BLUE="#458588" +export GRUVBOX_NEUTRAL_PURPLE="#b16286" +export GRUVBOX_NEUTRAL_AQUA="#689d6a" +export GRUVBOX_NEUTRAL_ORANGE="#d65d0e" + +export GRUVBOX_FADED_RED="#9d0006" +export GRUVBOX_FADED_GREEN="#79740e" +export GRUVBOX_FADED_YELLOW="#b57614" +export GRUVBOX_FADED_BLUE="#076678" +export GRUVBOX_FADED_PURPLE="#8f3f71" +export GRUVBOX_FADED_AQUA="#427b58" +export GRUVBOX_FADED_ORANGE="#af3a03" diff --git a/statusbar.sh b/statusbar.sh index 7960684..5d3cc25 100755 --- a/statusbar.sh +++ b/statusbar.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash -source ~/.config/herbstluftwm/settings.sh + +source ./gruvbox_colors.sh +font="Fira Code:pixelsize=11" function uniq_linebuffered() { awk -W interactive '$0 != l { print ; l=$0 ; fflush(); }' "$@" @@ -50,5 +52,5 @@ panelGeometry=${geometry[2]}x${statusbar_height}+${x}+${y} | lemonbar \ -g $panelGeometry \ -f "$font" \ - -B $bgcolor -F $fgcolor \ + -B $GRUVBOX_DARK0 -F $GRUVBOX_LIGHT0 \ -u 2 diff --git a/styling.sh b/styling.sh index 404f515..771efa4 100755 --- a/styling.sh +++ b/styling.sh @@ -1,47 +1,27 @@ #!/usr/bin/env bash -set -e hc() { herbstclient "$@" } +source ./gruvbox_colors.sh + ./wallpaper.sh # frame/window styling -hc attr theme.tiling.reset 1 -hc attr theme.floating.reset 1 - -hc attr theme.active.color '#9fbc00' -hc attr theme.normal.color '#454545' -hc attr theme.urgent.color orange -hc attr theme.inner_width 1 -hc attr theme.inner_color black -hc attr theme.border_width 3 -hc attr theme.floating.border_width 4 -hc attr theme.floating.outer_width 1 -hc attr theme.floating.outer_color black -hc attr theme.active.inner_color '#3E4A00' -hc attr theme.active.outer_color '#3E4A00' -hc attr theme.background_color '#141414' - -hc set frame_border_active_color '#eee8d5' -hc set frame_border_normal_color '#475152' +hc set frame_border_active_color "$GRUVBOX_DARK4" +hc set frame_border_normal_color "$GRUVBOX_DARK0" hc set frame_bg_transparent 1 hc set frame_border_width 1 -hc set frame_active_opacity 80 -hc set frame_normal_opacity 80 hc set frame_gap 4 hc set frame_padding 0 -hc set always_show_frame 1 hc set smart_frame_surroundings 1 -hc set window_border_width 2 +hc set window_border_width 1 hc set window_border_inner_width 0 -hc set window_border_normal_color '#0a1b22' -hc set window_border_active_color '#d9e5e7' +hc set window_border_normal_color "$GRUVBOX_DARK1" +hc set window_border_active_color "$GRUVBOX_BRIGHT_AQUA" hc set window_gap 0 hc set smart_window_surroundings 1 - hc set mouse_recenter_gap 0 - diff --git a/tray.sh b/tray.sh index 40e6fb5..549535d 100755 --- a/tray.sh +++ b/tray.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash -source ~/.config/herbstluftwm/settings.sh +source ./gruvbox_colors.sh set $(herbstclient monitor_rect 0) TRAY_GEOMETRY=5x1+$(($3 - 100))+0 stalonetray \ - --background "#002b36" \ + --background "$GRUVBOX_DARK0" \ --geometry $TRAY_GEOMETRY \ --icon-size 20 \ --kludges force_icons_size \