From a654abf35244780ca6fbae953eafaec301a8555c Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Mon, 29 Aug 2022 17:28:59 +0300 Subject: [PATCH] Change theme to Solarized dark everywhere --- configs/alacritty.yml | 54 +++++++++++------------------- configs/sway/config | 8 +++-- configs/sway/themes/breeze-sway | 41 ----------------------- configs/sway/themes/solarized-dark | 14 ++++++++ configs/waybar/config | 2 +- configs/waybar/style.css | 44 +++++++----------------- 6 files changed, 52 insertions(+), 111 deletions(-) delete mode 100644 configs/sway/themes/breeze-sway create mode 100644 configs/sway/themes/solarized-dark diff --git a/configs/alacritty.yml b/configs/alacritty.yml index cbaa390..dd14461 100644 --- a/configs/alacritty.yml +++ b/configs/alacritty.yml @@ -25,50 +25,34 @@ font: size: 10.0 -# KDE Breeze (Ported from Konsole) +# Colors (Solarized Dark) colors: # Default colors primary: - background: '0x232627' - foreground: '0xfcfcfc' - - dim_foreground: '0xeff0f1' - bright_foreground: '0xffffff' - dim_background: '0x31363b' - bright_background: '0x000000' + background: '0x002b36' + foreground: '0x839496' # Normal colors normal: - black: '0x232627' - red: '0xed1515' - green: '0x11d116' - yellow: '0xf67400' - blue: '0x1d99f3' - magenta: '0x9b59b6' - cyan: '0x1abc9c' - white: '0xfcfcfc' + black: '0x073642' + red: '0xdc322f' + green: '0x859900' + yellow: '0xb58900' + blue: '0x268bd2' + magenta: '0xd33682' + cyan: '0x2aa198' + white: '0xeee8d5' # Bright colors bright: - black: '0x7f8c8d' - red: '0xc0392b' - green: '0x1cdc9a' - yellow: '0xfdbc4b' - blue: '0x3daee9' - magenta: '0x8e44ad' - cyan: '0x16a085' - white: '0xffffff' - - # Dim colors - dim: - black: '0x31363b' - red: '0x783228' - green: '0x17a262' - yellow: '0xb65619' - blue: '0x1b668f' - magenta: '0x614a73' - cyan: '0x186c60' - white: '0x63686d' + black: '0x002b36' + red: '0xcb4b16' + green: '0x586e75' + yellow: '0x657b83' + blue: '0x839496' + magenta: '0x6c71c4' + cyan: '0x93a1a1' + white: '0xfdf6e3' cursor: shape: Block diff --git a/configs/sway/config b/configs/sway/config index 7b23593..8e82c6a 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -4,11 +4,11 @@ set $down j set $up k set $right l set $term alacritty -for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt, border pixel 10 +for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt set $menu exec $term --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop" set $filemgr pcmanfm-qt -output * bg #232629 solid_color +output * bg #002a35 solid_color input * { xkb_layout us,ru @@ -29,7 +29,7 @@ exec swayidle -w \ output * scale 2 -include ~/.config/sway/themes/breeze-sway +include ~/.config/sway/themes/solarized-dark bindsym $mod+Return exec $term bindsym $mod+Shift+f exec $filemgr @@ -54,6 +54,8 @@ bindsym $mod+Shift+Left move left bindsym $mod+Shift+Down move down bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right +bindsym $mod+Next workspace next +bindsym $mod+Prior workspace prev bindsym $mod+1 workspace number 1 bindsym $mod+2 workspace number 2 bindsym $mod+3 workspace number 3 diff --git a/configs/sway/themes/breeze-sway b/configs/sway/themes/breeze-sway deleted file mode 100644 index a5dd970..0000000 --- a/configs/sway/themes/breeze-sway +++ /dev/null @@ -1,41 +0,0 @@ -seat seat0 xcursor_theme "breeze_cursors" - -set $gnome-schema org.gnome.desktop.interface -exec_always { - gsettings set $gnome-schema gtk-theme 'Breeze-Dark' - gsettings set $gnome-schema icon-theme 'breeze-dark' - gsettings set $gnome-schema cursor-theme 'breeze_cursors' - gsettings set $gnome-schema font-name 'Noto Sans 10' -} - -# Colors based on Breeze Dark theme and Base16 Seti UI - -set $color0 #232629 -set $color1 #31363b -set $color2 #3B758C -set $color3 #41535B -set $color4 #43a5d5 -set $color5 #bdc3c7 -set $color6 #eeeeee -set $color7 #eff0f1 -set $color8 #da4453 -set $color9 #db7b55 -set $color10 #e6cd69 -set $color11 #9fca56 -set $color12 #3daee9 -set $color13 #2980b9 -set $color14 #a074c4 -set $color15 #8a553f - -# Colors with alpha -set $background-color #ff232629 -set $accent-color #ff3daee9 - -# Basic color configuration using the Base16 variables for windows and borders. -# Property Name Border BG Text Indicator Child Border -client.focused $color5 $color12 $color0 $color12 $color12 -client.focused_inactive $color1 $color1 $color5 $color3 $color1 -client.unfocused $color1 $color0 $color5 $color1 $color1 -client.urgent $color8 $color8 $color0 $color8 $color8 -client.placeholder $color0 $color0 $color5 $color0 $color0 -client.background $color7 diff --git a/configs/sway/themes/solarized-dark b/configs/sway/themes/solarized-dark new file mode 100644 index 0000000..4ef4028 --- /dev/null +++ b/configs/sway/themes/solarized-dark @@ -0,0 +1,14 @@ +seat seat0 xcursor_theme "breeze_cursors" + +set $gnome-schema org.gnome.desktop.interface +exec_always { + gsettings set $gnome-schema gtk-theme 'Breeze-Dark' + gsettings set $gnome-schema icon-theme 'breeze-dark' + gsettings set $gnome-schema cursor-theme 'breeze_cursors' + gsettings set $gnome-schema font-name 'JetBrains Mono 10' +} + +# Property Name Border BG Text +client.focused #839496 #839496 #839496 +client.focused_inactive #839496 #073642 #839496 +client.unfocused #002b36 #073642 #839496 diff --git a/configs/waybar/config b/configs/waybar/config index fb2e744..9632730 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -1,5 +1,5 @@ { - "height": 30, // Waybar height (to be removed for auto height) + //"height": , // Waybar height (to be removed for auto height) "position": "bottom", "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": ["sway/window"], diff --git a/configs/waybar/style.css b/configs/waybar/style.css index f91d241..3c4bfc3 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,52 +1,37 @@ * { - font-family: JetBrains Mono, Roboto, Helvetica, monospace, sans-serif; - font-size: 13px; + font-family: JetBrains Mono; + font-size: 11px; + border: none; } window#waybar { - background-color: rgba(43, 48, 59, 0.5); - border-top: 3px solid rgba(100, 114, 125, 0.5); - color: #ffffff; - transition-property: background-color; - transition-duration: .5s; -} - -window#waybar.hidden { - opacity: 0.5; -} - -window#waybar.termite { - background-color: #3F3F3F; + background-color: #002a35; + color: #839496; } #workspaces button { padding: 0 5px; background-color: transparent; - color: #ffffff; - box-shadow: inset 0 3px transparent; border: none; border-radius: 0; + color: #839496; } #workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - box-shadow: inset 0 3px #ffffff; + color: #cb4b16; } #workspaces button.focused { - background-color: #64727D; - box-shadow: inset 0 3px #ffffff; + color: #b58900; } #workspaces button.urgent { background-color: #eb4d4b; } - #mode { - background-color: #64727D; - border-top: 3px solid #ffffff; + background-color: #888888; } - +#language, #clock, #battery, #cpu, @@ -62,13 +47,10 @@ window#waybar.termite { #idle_inhibitor, #mpd { padding: 0 10px; - color: #ffffff; + color: #839496; + background-color: #002a35; } -#window, -#workspaces { - margin: 0 4px; -} /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces { @@ -82,7 +64,7 @@ window#waybar.termite { @keyframes blink { to { - background-color: #ffffff; + background-color: #888888; color: #000000; } }