From 4cb16aa0278f9a7496c2290398bbce27b3339286 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 20 Nov 2022 10:25:51 +0300 Subject: [PATCH] Update dotfiles --- configs/alacritty.yml | 42 +++++++++++-------------- configs/sway/config | 18 +++++++++-- configs/sway/themes/solarized-dark | 2 +- configs/waybar/config | 4 +-- configs/waybar/style.css | 50 ++++++++++++------------------ configs/zshrc | 1 + 6 files changed, 57 insertions(+), 60 deletions(-) diff --git a/configs/alacritty.yml b/configs/alacritty.yml index d9ca47a..3a28a2c 100644 --- a/configs/alacritty.yml +++ b/configs/alacritty.yml @@ -21,39 +21,33 @@ font: italic: family: JetBrains Mono style: SemiBold Italic - size: 9.0 + size: 8.0 cursor: shape: Block blinking: on -# Colors (Gruvbox dark) + +# Colors (Solarized Dark) colors: # Default colors primary: - # hard contrast: background = '0x1d2021' - background: '0x282828' - # soft contrast: background = '0x32302f' - foreground: '0xebdbb2' + background: '#002b36' # base03 + foreground: '#839496' # base0 + + # Cursor colors + cursor: + text: '#002b36' # base03 + cursor: '#839496' # base0 # Normal colors normal: - black: '0x282828' - red: '0xcc241d' - green: '0x98971a' - yellow: '0xd79921' - blue: '0x458588' - magenta: '0xb16286' - cyan: '0x689d6a' - white: '0xa89984' + black: '#073642' # base02 + red: '#dc322f' # red + green: '#859900' # green + yellow: '#b58900' # yellow + blue: '#268bd2' # blue + magenta: '#d33682' # magenta + cyan: '#2aa198' # cyan + white: '#eee8d5' # base2 - # Bright colors - bright: - black: '0x928374' - red: '0xfb4934' - green: '0xb8bb26' - yellow: '0xfabd2f' - blue: '0x83a598' - magenta: '0xd3869b' - cyan: '0x8ec07c' - white: '0xebdbb2' diff --git a/configs/sway/config b/configs/sway/config index 965ee9b..432fe9b 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -8,7 +8,7 @@ for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 p set $menu exec $term --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop" set $filemgr nemo -output * bg #1d2021 solid_color +output * bg #073642 solid_color input * { xkb_layout us,ru @@ -27,7 +27,7 @@ font "JetBrains Mono" 9 output * scale 2 -include ~/.config/sway/themes/gruvbox +include ~/.config/sway/themes/solarized-dark # Start components @@ -119,6 +119,18 @@ mode "resize" { } bindsym $mod+r mode "resize" +# Multimedia buttons +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle +bindsym XF86MonBrightnessDown exec brightnessctl set 5%- +bindsym XF86MonBrightnessUp exec brightnessctl set 5%+ +bindsym XF86AudioPlay exec playerctl play-pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous +bindsym XF86Search exec $menu + # Floating for_window [app_id="pavucontrol"] floating enable for_window [app_id="pavucontrol"] resize set 600 300 @@ -128,3 +140,5 @@ for_window [app_id="pavucontrol"] resize set 600 300 exec alacritty --class bottom -e btm for_window [app_id="bottom"] move container to workspace number 10 for_window [app_id="bottom"] fullscreen + + diff --git a/configs/sway/themes/solarized-dark b/configs/sway/themes/solarized-dark index ab577bf..3a54617 100644 --- a/configs/sway/themes/solarized-dark +++ b/configs/sway/themes/solarized-dark @@ -3,7 +3,7 @@ seat seat0 xcursor_theme "Breeze_Snow" set $gnome-schema org.gnome.desktop.interface exec_always { gsettings set $gnome-schema gtk-theme 'NumixSolarizedDarkCyan' - gsettings set $gnome-schema icon-theme 'breeze-dark' + gsettings set $gnome-schema icon-theme 'Mint-Y-Aqua' gsettings set $gnome-schema cursor-theme 'Breeze_Snow' gsettings set $gnome-schema font-name 'JetBrains Mono 9' } diff --git a/configs/waybar/config b/configs/waybar/config index 8d3084f..9e50ae4 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -1,9 +1,8 @@ { - //"height": , // Waybar height (to be removed for auto height) "position": "top", "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": ["sway/window"], - "modules-right": ["idle_inhibitor", "network", "cpu", "memory", "temperature", "battery", "sway/language", "clock", "tray"], + "modules-right": ["idle_inhibitor", "network", "cpu", "memory", "pulseaudio", "battery", "sway/language", "clock", "tray"], "sway/mode": { "format": "{}" }, @@ -15,7 +14,6 @@ } }, "tray": { - // "icon-size": 21, "spacing": 10 }, "clock": { diff --git a/configs/waybar/style.css b/configs/waybar/style.css index f51a293..3d74c95 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,61 +1,50 @@ * { font-family: JetBrains Mono; - font-size: 8pt; + font-size: 6pt; border: none; font-weight: 400; padding: 1 1px; } window#waybar { - background-color: #1d2021; - color: #ebdbb2; - padding-right: 5px; + background-color: #002b36; + color: #839496; } #workspaces button { background-color: transparent; border-radius: 2px; - color: #a89984; - margin: 4px 2px; + color: #839496; + margin: 4px 1px; } #workspaces button:hover { - color: #ebdbb2; - background-color: #928374; + color: #cb4b16; + background-color: #073642; } #workspaces button.focused { - color: #ebdbb2; - background-color: #282828; + color: #b58900; + background-color: #073642; } #workspaces button.urgent { - background-color: #cc241d; + background-color: #eb4d4b; } -#language, -#clock, -#battery, -#cpu, -#memory, -#disk, -#temperature, -#backlight, -#network, -#pulseaudio, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#mpd { +#mode { + background-color: #888888; +} +#language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd { padding: 0 4px; - color: #d79921; - background-color: #282828; + color: #839496; + background-color: #073642; border-radius: 2px; - margin: 4px 2px; + margin: 4px 1px; } #window { - color: #b8bb26; + color: #b58900; + font-weight: 800; } /* If workspaces is the leftmost module, omit left margin */ @@ -91,3 +80,4 @@ label:focus { min-width: 16px; } + diff --git a/configs/zshrc b/configs/zshrc index 36edb06..4fc7e9d 100644 --- a/configs/zshrc +++ b/configs/zshrc @@ -30,3 +30,4 @@ alias vi="nvim" alias vim="nvim" alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh" alias timestamp='date -u +%FT%TZ' +export REPORTTIME=3