From baaf7a13b74e7873aaf3598adb5da85c55f585a7 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Sun, 20 Sep 2020 01:42:33 +0300 Subject: Minor changes to colorscheme/appearance --- dotfiles/.config/alacritty/alacritty.yml | 12 ++--- dotfiles/.config/fontconfig/fonts.conf | 12 ++--- dotfiles/.config/mako/config | 2 +- dotfiles/.config/sway/config | 17 +++---- dotfiles/.config/waybar/config | 51 ++++++++------------- dotfiles/.config/waybar/style.css | 74 ++++++++++++++++++------------- system/fonts/forkawesome_mono.ttf | Bin 0 -> 209736 bytes 7 files changed, 81 insertions(+), 87 deletions(-) create mode 100644 system/fonts/forkawesome_mono.ttf diff --git a/dotfiles/.config/alacritty/alacritty.yml b/dotfiles/.config/alacritty/alacritty.yml index 113fa7d..7acf889 100644 --- a/dotfiles/.config/alacritty/alacritty.yml +++ b/dotfiles/.config/alacritty/alacritty.yml @@ -12,7 +12,7 @@ # available, otherwise `xterm-256color` is used. #TERM: alacritty -#window: +window: # Window dimensions (changes require restart) # # Specified in number of columns/lines, not pixels. @@ -33,12 +33,12 @@ # # Blank space added around the window in pixels. This padding is scaled # by DPI and the specified value is always added at both opposing sides. - #padding: - # x: 0 - # y: 0 + padding: + x: 2 + y: 2 # Spread additional padding evenly around the terminal content. - #dynamic_padding: false + dynamic_padding: true # Window decorations # @@ -162,7 +162,7 @@ font: # If `true`, bold text is drawn using the bright color variants. #draw_bold_text_with_bright_colors: false -# Colors (Tomorrow Night) +# Colors colors: # Ultramar primary: diff --git a/dotfiles/.config/fontconfig/fonts.conf b/dotfiles/.config/fontconfig/fonts.conf index bef185c..c71b014 100644 --- a/dotfiles/.config/fontconfig/fonts.conf +++ b/dotfiles/.config/fontconfig/fonts.conf @@ -5,8 +5,7 @@ serif IBM Plex Serif - TerminessTTF Nerd Font Mono - Joy Pixels + forkawesome mono Noto Color Emoji @@ -14,8 +13,7 @@ sans-serif IBM Plex Sans - TerminessTTF Nerd Font Mono - Joy Pixels + forkawesome mono Noto Color Emoji @@ -23,8 +21,7 @@ sans IBM Plex Sans - TerminessTTF Nerd Font Mono - Joy Pixels + forkawesome mono Noto Color Emoji @@ -32,8 +29,7 @@ monospace Input - TerminessTTF Nerd Font Mono - Joy Pixels + forkawesome mono Noto Color Emoji diff --git a/dotfiles/.config/mako/config b/dotfiles/.config/mako/config index 8d7c6f8..9760218 100644 --- a/dotfiles/.config/mako/config +++ b/dotfiles/.config/mako/config @@ -1,7 +1,7 @@ font=monospace 10 text-color=#e5e9f0 background-color=#2d333f -border-color=#434c5e +border-color=#000000 default-timeout=5000 height=700 max-visible=5 diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config index ce35f75..3be0700 100644 --- a/dotfiles/.config/sway/config +++ b/dotfiles/.config/sway/config @@ -24,15 +24,16 @@ font pango:monospace 9 # Theme colors # class border backgr. text indic. child_border - client.focused #7FAC96 #7FAC96 #1B1E25 #D8DEE9 #7FAC96 - client.focused_inactive #3B4252 #3B4252 #7FAC96 #1d2021 #3B4252 - client.unfocused #2B2C2B #3B4252 #D8DEE9 #1d2021 #3B4252 - client.urgent #CB4B16 #FDF6E3 #1ABC9C #268BD2 #CB4B16 - client.placeholder #FFFFFF #0C0C0C #FFFFFF #FFFFFF #3F6E90 + client.focused #5b8277 #7fac96 #1d2021 #9eba86 #5b8277 + client.focused_inactive #000000 #252832 #5b8277 #000000 #000000 + client.unfocused #000000 #252832 #d8dee9 #000000 #000000 + client.urgent #cb4b16 #fdf6e3 #1abc9c #268bd2 #cb4b16 + client.placeholder #ffffff #0c0c0c #ffffff #ffffff #3f6e90 - client.background #2B2C2B + client.background #2b2c2b -titlebar_padding 5 2 +titlebar_padding 6 2 +titlebar_border_thickness 2 # Use Mouse+$mod to drag floating windows floating_modifier $mod @@ -100,7 +101,7 @@ for_window [app_id="telegramdesktop"] floating enable, sticky enable # Quake-like Terminal dropdown for_window [title="^ddterminal$"] floating enable, sticky enable -for_window [title="^ddterminal$"] border none +#for_window [title="^ddterminal$"] border none # Laptop lid bindswitch --reload --locked lid:on exec "swaysession suspend" diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config index c243528..59daa82 100644 --- a/dotfiles/.config/waybar/config +++ b/dotfiles/.config/waybar/config @@ -5,7 +5,6 @@ "modules-left": [ "sway/workspaces", "sway/mode", - "custom/left-decorator-black", "mpd", "pulseaudio" ], @@ -25,7 +24,6 @@ "backlight", "battery#bat0", "battery#bat1", - "custom/right-decorator-black", "tray" ], "sway/mode": { @@ -48,7 +46,7 @@ "on": " " }, "single-icons": { - "on": "1 " + "on": "[s]" }, "state-icons": { "paused": "", @@ -98,11 +96,11 @@ "format-charging": " {capacity}%", "format-plugged": " {capacity}%", "format-icons": [ - "", - "", - "", - "", - "" + "", + "", + "", + "", + "" ] }, "battery#bat1": { @@ -111,19 +109,19 @@ "format-charging": " {capacity}%", "format-plugged": " {capacity}%", "format-icons": [ - "", - "", - "", - "", - "" + "", + "", + "", + "", + "" ] }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": " {essid}", - "format-ethernet": " {ifname}", - "format-linked": " {ifname}", - "format-disconnected": " Disconnected", + "format-wifi": " {essid}", + "format-ethernet": " {ifname}", + "format-linked": " {ifname}", + "format-disconnected": " Disconnected", "format-alt": "{ifname}: {ipaddr}/{cidr}", "tooltip-format": "{ifname}: {ipaddr}/{cidr}" }, @@ -152,7 +150,7 @@ "scroll-step": 5, // %, can be a float "format": "{icon} {volume}%", "format-bluetooth": "{icon} {volume}% {format_source}", - "format-muted": "", + "format-muted": "", "format-source": "{volume}% ", "format-source-muted": "", "format-icons": { @@ -167,7 +165,7 @@ "on-click": "termite -e ncpamixer" }, "custom/rec-status": { - "format": "{}", + "format": "{}", "signal": 5, "interval": "once", "exec": "barrecstatus" @@ -184,14 +182,14 @@ "tooltip": false }, "custom/pac-status": { - "format": " {}", + "format": " {}", "signal": 7, "interval": "once", "exec": "barpacstatus", "tooltip": false }, "custom/news-status": { - "format": " {}", + "format": " {}", "signal": 8, "interval": "once", "exec": "barnewsstatus", @@ -212,15 +210,4 @@ "exec": "swaykbd", "tooltip": false }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - } } diff --git a/dotfiles/.config/waybar/style.css b/dotfiles/.config/waybar/style.css index 600bab1..077b1f9 100644 --- a/dotfiles/.config/waybar/style.css +++ b/dotfiles/.config/waybar/style.css @@ -1,60 +1,70 @@ * { - font-size: 11px; - font-family: "monospace"; - min-height: 0; + font-size: 11px; + font-family: monospace; } window#waybar { - background: rgba(27, 30, 37, 1); - color: #e5e9f0; - min-height: 0; + background: #000000; + color: #e5e9f0; + min-height: 0; } #custom-right-arrow-cyan, #custom-left-arrow-cyan { - color: #89b699; - font-size: 20px; + color: #89b699; + font-size: 20px; } #custom-right-arrow-black, #custom-left-arrow-black { - color: #000000; - font-size: 20px; + color: #000000; + font-size: 20px; } #custom-left-arrow-gray { - color: #191919; - background: #89b699; - font-size: 20px; + color: #191919; + background: #89b699; + font-size: 20px; } #custom-right-arrow-black { - background: #89b699; + background: #89b699; } #custom-left-arrow-black { - background: #191919; + background: #191919; } #custom-left-decorator-black, #custom-right-decorator-black { - font-size: 20px; - background: rgba(27, 30, 37, 0.95); - color: #000000; + font-size: 27px; + background: rgba(27, 30, 37, 0.95); + color: #000000; } #tray, +#battery, +#network, +#backlight, +#custom-vpn-status, +#workspaces { + background: #1d2021; + border-top: 2px solid #000000; + border-bottom: 2px solid #000000; +} #workspaces { - padding: 0 8px; - background: #000000; + padding: 0; } #workspaces button { - padding: 0 4px; - color: #fdf6e3; + padding: 0 6px; + color: #fdf6e3; + border-radius: 0; + border: 1px solid rgba(0, 0, 0, 0); } -#workspaces button.focused { - color: #5b8277; +#workspaces button.visible { + color: #5b8277; + border-color: #5b8277; } -#workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; +#workspaces button.focused { + color: #000000; + border-color: #5b8277; + background: #5b8277; } #workspaces button:hover { - border-color: #0C3D27; - border-radius: 0; - background: #0C3D27; + border: 1px solid #5b8277; } #mpd, +#tray, #clock, #battery, #network, @@ -69,8 +79,8 @@ window#waybar { #custom-pac-status, #custom-news-status, #custom-swaykbd { - padding: 0 6px; + padding: 0 6px; } #custom-weather { - color: #5b8277; + color: #5b8277; } diff --git a/system/fonts/forkawesome_mono.ttf b/system/fonts/forkawesome_mono.ttf new file mode 100644 index 0000000..77f6c9d Binary files /dev/null and b/system/fonts/forkawesome_mono.ttf differ -- cgit v1.2.3