diff --git a/configs/.profile b/configs/.profile index bfa8c02..603b94b 100644 --- a/configs/.profile +++ b/configs/.profile @@ -1,4 +1,3 @@ -. "$HOME/.cargo/env" export QT_QPA_PLATFORMTHEME=qt5ct export GPG_TTY=$(tty) diff --git a/configs/sway/config b/configs/sway/config index 8e82c6a..8ab067b 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 pcmanfm-qt -output * bg #002a35 solid_color +output * bg #002b36 solid_color input * { xkb_layout us,ru @@ -18,6 +18,7 @@ input * { bar swaybar_command waybar xwayland enable +smart_borders on default_border pixel 2 gaps inner 5 font "JetBrains Mono" 9 diff --git a/configs/sway/themes/solarized-dark b/configs/sway/themes/solarized-dark index 4ef4028..fca2277 100644 --- a/configs/sway/themes/solarized-dark +++ b/configs/sway/themes/solarized-dark @@ -10,5 +10,5 @@ exec_always { # Property Name Border BG Text client.focused #839496 #839496 #839496 -client.focused_inactive #839496 #073642 #839496 -client.unfocused #002b36 #073642 #839496 +client.focused_inactive #839496 #002b36 #839496 +client.unfocused #002b36 #003b36 #839496 diff --git a/configs/waybar/config b/configs/waybar/config index 9632730..df0dc9e 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -3,7 +3,7 @@ "position": "bottom", "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": ["sway/window"], - "modules-right": ["idle_inhibitor", "network", "cpu", "memory", "temperature", "sway/language", "clock", "tray"], + "modules-right": ["idle_inhibitor", "network", "cpu", "memory", "temperature", "battery", "sway/language", "clock", "tray"], "sway/mode": { "format": "{}" }, @@ -19,7 +19,8 @@ "spacing": 10 }, "clock": { - "format": "{:%d.%m.%Y %H:%M:%S}", + "format": "{:%H:%M:%S}", + "format-alt": "{:%d.%m.%Y}", "interval": 1 }, "cpu": { @@ -37,9 +38,9 @@ "format-plugged": "Bat: {capacity}% (plugged)", }, "network": { - "format": "Connected via {ifname}", + "format": "Network via {ifname}", "tooltip-format": "{ipaddr}/{cidr}", - "format-linked": "Connected (No IP) via {ifname}", - "format-disconnected": "Disconnected", + "format-linked": "Network (No IP) via {ifname}", + "format-disconnected": "No network", }, } diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 3c4bfc3..006688c 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -5,7 +5,7 @@ } window#waybar { - background-color: #002a35; + background-color: #002b36; color: #839496; } @@ -46,11 +46,15 @@ window#waybar { #mode, #idle_inhibitor, #mpd { - padding: 0 10px; - color: #839496; - background-color: #002a35; + padding: 0 5px; + color: #b58900; + background-color: #002b36; } +#window { + color: #859900; + font-weight: 900; +} /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces {