From a0b7dd1df310dbebb7c0c33acb990c542b8dc884 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:24:03 -0400 Subject: [PATCH 01/11] add Gruvbox color scheme for qt5ct and KF5 --- .../.local/share/color-schemes/Gruvbox.colors | 105 ++++++++++++++++++ sway/.local/share/qt5ct/colors/gruvbox.conf | 4 + 2 files changed, 109 insertions(+) create mode 100644 sway/.local/share/color-schemes/Gruvbox.colors create mode 100644 sway/.local/share/qt5ct/colors/gruvbox.conf diff --git a/sway/.local/share/color-schemes/Gruvbox.colors b/sway/.local/share/color-schemes/Gruvbox.colors new file mode 100644 index 0000000..b4c8c60 --- /dev/null +++ b/sway/.local/share/color-schemes/Gruvbox.colors @@ -0,0 +1,105 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65000000000000002 +ContrastEffect=1 +IntensityAmount=0.10000000000000001 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025000000000000001 +ColorEffect=2 +ContrastAmount=0.10000000000000001 +ContrastEffect=2 +Enable=true +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=60,56,54 +BackgroundNormal=40,40,40 +DecorationFocus=131,165,152 +DecorationHover=131,165,152 +ForegroundActive=142,192,124 +ForegroundInactive=189,195,199 +ForegroundLink=184,187,38 +ForegroundNegative=218,68,83 +ForegroundNeutral=246,116,0 +ForegroundNormal=235,219,178 +ForegroundPositive=39,174,96 +ForegroundVisited=127,140,141 + +[Colors:Selection] +BackgroundAlternate=142,192,124 +BackgroundNormal=131,165,152 +DecorationFocus=131,165,152 +DecorationHover=131,165,152 +ForegroundActive=252,252,252 +ForegroundInactive=235,219,178 +ForegroundLink=253,188,75 +ForegroundNegative=218,68,83 +ForegroundNeutral=246,116,0 +ForegroundNormal=235,219,178 +ForegroundPositive=39,174,96 +ForegroundVisited=189,195,199 + +[Colors:Tooltip] +BackgroundAlternate=60,56,54 +BackgroundNormal=40,40,40 +DecorationFocus=131,165,152 +DecorationHover=131,165,152 +ForegroundActive=184,187,38 +ForegroundInactive=189,195,199 +ForegroundLink=142,192,124 +ForegroundNegative=218,68,83 +ForegroundNeutral=246,116,0 +ForegroundNormal=235,219,178 +ForegroundPositive=39,174,96 +ForegroundVisited=127,140,141 + +[Colors:View] +BackgroundAlternate=60,56,54 +BackgroundNormal=40,40,40 +DecorationFocus=131,165,152 +DecorationHover=131,165,152 +ForegroundActive=184,187,38 +ForegroundInactive=189,195,199 +ForegroundLink=142,192,124 +ForegroundNegative=218,68,83 +ForegroundNeutral=246,116,0 +ForegroundNormal=235,219,178 +ForegroundPositive=39,174,96 +ForegroundVisited=127,140,141 + +[Colors:Window] +BackgroundAlternate=60,56,54 +BackgroundNormal=40,40,40 +DecorationFocus=131,165,152 +DecorationHover=131,165,152 +ForegroundActive=184,187,38 +ForegroundInactive=189,195,199 +ForegroundLink=142,192,124 +ForegroundNegative=218,68,83 +ForegroundNeutral=246,116,0 +ForegroundNormal=235,219,178 +ForegroundPositive=39,174,96 +ForegroundVisited=127,140,141 + +[General] +ColorScheme=Gruvbox +Name=Gruvbox +shadeSortColumn=true + +[KDE] +contrast=4 + +[WM] +activeBackground=39,39,39 +activeBlend=235,219,178 +activeForeground=235,219,178 +inactiveBackground=40,40,40 +inactiveBlend=60,56,54 +inactiveForeground=204,190,155 diff --git a/sway/.local/share/qt5ct/colors/gruvbox.conf b/sway/.local/share/qt5ct/colors/gruvbox.conf new file mode 100644 index 0000000..6e738ae --- /dev/null +++ b/sway/.local/share/qt5ct/colors/gruvbox.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffffffff, #ff7c6f64, #ffebdbb2, #ffd5c4a1, #ff32302f, #ff665c54, #ffebdbb2, #fffbf1c7, #fffbf1c7, #ff282828, #ff1d2021, #ffe7e4e0, #ffa89984, #fffbf1c7, #ff458588, #ff458588, #ff3c3836, #ffebdbb2, #ff3c3836, #ffebdbb2, #80ffffff +disabled_colors=#ff808080, #ff7c6f64, #ffebdbb2, #ffd5c4a1, #ff32302f, #ff665c54, #ff808080, #fffbf1c7, #ff808080, #ff282828, #ff1d2021, #ffe7e4e0, #ffa89984, #ff808080, #ff458588, #ff458588, #ff3c3836, #ffebdbb2, #ff3c3836, #ffebdbb2, #80ffffff +inactive_colors=#ffffffff, #ff7c6f64, #ffebdbb2, #ffd5c4a1, #ff32302f, #ff665c54, #ffebdbb2, #fffbf1c7, #fffbf1c7, #ff282828, #ff1d2021, #ffe7e4e0, #ffa89984, #fffbf1c7, #ff458588, #ff458588, #ff3c3836, #ffebdbb2, #ff3c3836, #ffebdbb2, #80ffffff From 07d8ed78cfaf93ff7e9e2209fd0215fe1b98038f Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:40:31 -0400 Subject: [PATCH 02/11] waybar: use nerd font --- sway/.config/waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index 986fc0a..47b5d48 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -1,7 +1,7 @@ * { border: none; border-radius: 0; - font-family: JetBrains Mono; + font-family: 'JetBrainsMono Nerd Font', 'JetBrains Mono', 'Hack Nerd Font Mono', 'monospace'; font-size: 14px; min-height: 0; margin: 0 0px; From 1cbc562125996a30afd81f921fd4441b55bae7d0 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:44:44 -0400 Subject: [PATCH 03/11] waybar: style tooltip --- sway/.config/waybar/style.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index 47b5d48..df5b829 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -7,6 +7,12 @@ margin: 0 0px; } +tooltip, tooltip * { + color: #ebdbb2; + background-color: #3c3836; + font-family: 'sans-serif'; +} + window#waybar { background-color: #3c3836; border-bottom: none; From fd120ee8c1834ca102ceca263ab6910c97afbd6a Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:46:28 -0400 Subject: [PATCH 04/11] waybar: make pulseaudio the leftmost module --- sway/.config/waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index df5b829..c01046c 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -126,7 +126,6 @@ label:focus { #network { background-color: #ebdbb2; color: #000000; - border-radius: 5px 0px 0px 5px; } #network.disconnected { @@ -134,6 +133,7 @@ label:focus { } #pulseaudio { + border-radius: 5px 0px 0px 5px; background-color: #ebdbb2; color: #000000; } From 69a19cca2f5401686be6178d2b0c27560c506a9b Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:47:28 -0400 Subject: [PATCH 05/11] waybar: increase padding for the power button --- sway/.config/waybar/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index c01046c..5e77663 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -166,11 +166,16 @@ label:focus { background-color: #eb4d4b; } -#tray, #custom-power { +#tray { background-color: #3c3836; padding: 0 8px; } +#custom-power { + background-color: #3c3836; + padding: 0 16px; +} + #idle_inhibitor { background-color: rgba(0, 0, 0, 0); color: #ebdbb2; From fe04fc4ac0e9247754cb7d734d6af3527fddeddf Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:52:23 -0400 Subject: [PATCH 06/11] waybar: add height to the entire bar --- sway/.config/waybar/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index 5e77663..96fd4b0 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -26,7 +26,8 @@ window#waybar.hidden { } #workspaces button { - padding: 0 5px; + /* This padding top also increases the height of the entire bar */ + padding: 3px 5px; color: #ebdbb2; border-radius: 5px; } From 8bc0be34f9579005047f8993f3a38104629b6ac4 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:55:26 -0400 Subject: [PATCH 07/11] waybar: style popup menus --- sway/.config/waybar/style.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index 96fd4b0..b5e94e2 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -1,16 +1,17 @@ * { border: none; border-radius: 0; - font-family: 'JetBrainsMono Nerd Font', 'JetBrains Mono', 'Hack Nerd Font Mono', 'monospace'; - font-size: 14px; + font-family: inherit; + font-size: inherit; min-height: 0; margin: 0 0px; } -tooltip, tooltip * { +tooltip, tooltip *, menu { color: #ebdbb2; background-color: #3c3836; font-family: 'sans-serif'; + font-size: 14px; } window#waybar { @@ -19,6 +20,8 @@ window#waybar { color: #ebdbb2; transition-property: background-color; transition-duration: 0.5s; + font-family: 'JetBrainsMono Nerd Font', 'JetBrains Mono', 'Hack Nerd Font Mono', 'monospace'; + font-size: 14px; } window#waybar.hidden { From 691e0e8849f8f0c2276e9f22bb68d674389fbb5b Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 20:58:28 -0400 Subject: [PATCH 08/11] sway: change swaylock color to match gruvbox --- sway/.config/sway/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index af1881a..8f2d773 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -224,7 +224,7 @@ include /home/peter/.config/sway/local.d/* output "*" bg $wallpaper fill -bindsym Ctrl+Mod1+l exec swaylock -i $wallpaper --clock --fade-in 1 --indicator --indicator-thickness 6 --ring-color 5af78e --inside-color 00000055 --key-hl-color 4d4d4d --line-uses-ring --separator-color 00000000 --text-color ffffff --timestr "%H:%M" +bindsym Ctrl+Mod1+l exec swaylock -i $wallpaper --clock --fade-in 1 --indicator --indicator-thickness 6 --ring-color ebdbb2 --inside-color 00000055 --key-hl-color 4d4d4d --line-uses-ring --separator-color 00000000 --text-color ffffff --timestr "%H:%M" bindsym $mod+x exec bemenu-run | xargs swaymsg exec -- bindsym Print exec grimshot --notify save area From c9bc8619a93f0870f7603e8d2f762fdaa7fcecb6 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 21:43:59 -0400 Subject: [PATCH 09/11] waybar: decrease padding for buttons --- sway/.config/waybar/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index b5e94e2..589bd77 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -30,7 +30,8 @@ window#waybar.hidden { #workspaces button { /* This padding top also increases the height of the entire bar */ - padding: 3px 5px; + /* horizontal padding is set to 0px to compensate for the Gruvbox GTK theme (it increases padding for buttons) */ + padding: 3px 0px; color: #ebdbb2; border-radius: 5px; } From 0ef4187b14ffc30529f99fcbd05c7959bf784568 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 21:44:42 -0400 Subject: [PATCH 10/11] waybar: remove coloring for tooltip / menus This is supposed to be handled by the Gruvbox GTK theme --- sway/.config/waybar/style.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index 589bd77..fd42fc8 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -8,8 +8,6 @@ } tooltip, tooltip *, menu { - color: #ebdbb2; - background-color: #3c3836; font-family: 'sans-serif'; font-size: 14px; } From 0eca5f5874cdd8b2b31f74fd5c49b0174ce4c811 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 25 Mar 2022 21:57:38 -0400 Subject: [PATCH 11/11] waybar: use order instead of id for rounded corners --- sway/.config/waybar/style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sway/.config/waybar/style.css b/sway/.config/waybar/style.css index fd42fc8..e688bb0 100644 --- a/sway/.config/waybar/style.css +++ b/sway/.config/waybar/style.css @@ -58,6 +58,11 @@ window#waybar.hidden { border-bottom: 3px solid #ffffff; } +/* Rounded corner for the leftmost non-tray module on the right side */ +.modules-right > :nth-child(2) > * { + border-radius: 5px 0px 0px 5px; +} + #clock, #battery, #cpu, @@ -136,7 +141,6 @@ label:focus { } #pulseaudio { - border-radius: 5px 0px 0px 5px; background-color: #ebdbb2; color: #000000; } @@ -171,7 +175,7 @@ label:focus { #tray { background-color: #3c3836; - padding: 0 8px; + padding: 0 12px; } #custom-power {