From dd777517f537d28839db47c074ec9bed6ffed012 Mon Sep 17 00:00:00 2001 From: Alex Huddleston Date: Thu, 7 May 2020 20:09:22 -0500 Subject: [PATCH] Major modifications to colors, launcher, font size and type. --- colors | 41 +++++++++++++++++++++-------------------- config | 18 +++++++++++------- modules/battery | 32 ++++++++++++++++---------------- modules/cpu | 8 ++++---- modules/date | 8 ++++---- modules/lan | 16 ++++++++-------- modules/launcher | 4 ++-- modules/lockscreen | 2 +- modules/memory | 8 ++++---- modules/pulseaudio | 13 +++++++------ modules/session | 2 +- modules/temperature | 12 ++++++------ modules/title | 2 +- modules/wlan | 16 ++++++++-------- modules/xbacklight | 8 ++++---- 15 files changed, 98 insertions(+), 92 deletions(-) diff --git a/colors b/colors index 5b08925..bef3708 100644 --- a/colors +++ b/colors @@ -1,27 +1,28 @@ [colors] -black = #000 -white = #FFF +font-default = #242424 + +dynamic-display-icon-background = #e60772bf +dynamic-display-background = #cc3585bf + +default-bar-background = #bf2b2b2b + +pink-transparent = #ccbf6bb4 +cyan-transparent = #cc3585bf success = #00c853 -warning = #ffea00 -danger = #ff1744 +warning = #fff04d +danger = #dc1e37 -trans = #00000000 -semi-trans = #75000000 +bg = #fff +fg = #000 -bg = #000 -fg = #FFF - -prefix = #142D4C -label = #385170 - -code = #CAE8D5 -filemanager = #ABD6BB -firefox = #FFEC4A +code = #b3d1ff +filemanager = #0060e6 +firefox = #ff643d i3 = #29B488 -google-chrome = #4C8BF5 -launcher = #142D4C -session = #DD5144 -steam = #00ADEE +google-chrome = #11d041 +launcher = #e6bf6bb4 +session = #242424 +steam = #8f8f8f terminal = #63FC01 -window = #EAD673 \ No newline at end of file +window = #71c4ea \ No newline at end of file diff --git a/config b/config index 486edac..c532e68 100644 --- a/config +++ b/config @@ -28,26 +28,30 @@ include-file = /home/shadow8t4/.config/polybar/modules/terminal [bar/main] width = 100% -height = 27 +height = 32 bottom = true fixed-center = true -background = ${colors.semi-trans} +background = ${colors.default-bar-background} +;background-0 = ${colors.cyan-transparent} +;background-1 = ${colors.pink-transparent} foreground = ${colors.fg} -font-0 = "DejaVu Sans Mono for Powerline:style=Book:size=9;2" +font-0 = "DejaVu Sans Mono for Powerline:style=Book:size=10;2" font-1 = "FontAwesome:style=Regular:size=10;2" font-2 = "FontAwesome:style=Solid:size=12;3" +font-3 = "agave Nerd Font:style=r:size=12;2" -modules-left = launcher window filemanager google-chrome firefox steam code +modules-left = launcher window filemanager firefox code modules-right = memory cpu pulseaudio temperature date session tray-position = right -tray-maxsize = 16 -tray-background = ${colors.label} +tray-maxsize = 24 +tray-background = ${colors.dynamic-display-background} cursor-click = pointer cursor-scroll = ns-resize [settings] -screenchange-reload = true +pseudo-transparency = true +screenchange-reload = true \ No newline at end of file diff --git a/modules/battery b/modules/battery index f56fe45..af12a09 100644 --- a/modules/battery +++ b/modules/battery @@ -5,24 +5,24 @@ adapter = ACAD full-at = 98 format-charging = -format-charging-background = ${colors.label} -format-charging-foreground = ${colors.white} +format-charging-background = ${colors.dynamic-display-background} +format-charging-foreground = ${colors.font-default} label-charging = " %percentage%% " -label-charging-background = ${colors.label} -label-charging-foreground = ${colors.white} +label-charging-background = ${colors.dynamic-display-background} +label-charging-foreground = ${colors.font-default} format-discharging = -format-discharging-background = ${colors.label} -format-discharging-foreground = ${colors.white} +format-discharging-background = ${colors.dynamic-display-background} +format-discharging-foreground = ${colors.font-default} label-discharging = " %percentage%% " -label-discharging-background = ${colors.label} -label-discharging-foreground = ${colors.white} +label-discharging-background = ${colors.dynamic-display-background} +label-discharging-foreground = ${colors.font-default} -format-full-background = ${colors.label} -format-full-foreground = ${colors.white} +format-full-background = ${colors.dynamic-display-background} +format-full-foreground = ${colors.font-default} format-full-prefix = %{T2}%{T-} -format-full-prefix-background = ${colors.prefix} -format-full-prefix-foreground = ${colors.white} +format-full-prefix-background = ${colors.dynamic-display-icon-background} +format-full-prefix-foreground = ${colors.font-default} format-full-prefix-padding = 1 label-full = " %percentage%% " @@ -31,8 +31,8 @@ ramp-capacity-1 = %{T2}%{T-} ramp-capacity-2 = %{T2}%{T-} ramp-capacity-3 = %{T2}%{T-} ramp-capacity-4 = %{T2}%{T-} -ramp-capacity-background = ${colors.prefix} -ramp-capacity-foreground = ${colors.white} +ramp-capacity-background = ${colors.dynamic-display-icon-background} +ramp-capacity-foreground = ${colors.font-default} ramp-capacity-padding = 1 animation-charging-0 = %{T2}%{T-} @@ -41,7 +41,7 @@ animation-charging-2 = %{T2}%{T-} animation-charging-3 = %{T2}%{T-} animation-charging-4 = %{T2}%{T-} animation-charging-5 = %{T2}%{T-} -animation-charging-background = ${colors.prefix} -animation-charging-foreground = ${colors.white} +animation-charging-background = ${colors.dynamic-display-icon-background} +animation-charging-foreground = ${colors.font-default} animation-charging-framerate = 900 animation-charging-padding = 1 \ No newline at end of file diff --git a/modules/cpu b/modules/cpu index b381d8b..531d814 100644 --- a/modules/cpu +++ b/modules/cpu @@ -2,10 +2,10 @@ type = internal/cpu interval = 1 -format-background = ${colors.label} -format-foreground = ${colors.white} +format-background = ${colors.dynamic-display-background} +format-foreground = ${colors.font-default} format-prefix = %{T2}%{T-} -format-prefix-background = ${colors.prefix} -format-prefix-foreground = ${colors.white} +format-prefix-background = ${colors.dynamic-display-icon-background} +format-prefix-foreground = ${colors.font-default} format-prefix-padding = 1 label = " %percentage:2%% " \ No newline at end of file diff --git a/modules/date b/modules/date index 92f8410..5ff613c 100644 --- a/modules/date +++ b/modules/date @@ -5,11 +5,11 @@ interval = 1 time = " %H:%M " time-alt = " %H:%M %a %d/%m " -format-background = ${colors.label} -format-foreground = ${colors.white} +format-background = ${colors.dynamic-display-background} +format-foreground = ${colors.font-default} format-prefix = %{T2}%{T-} -format-prefix-background = ${colors.prefix} -format-prefix-foreground = ${colors.white} +format-prefix-background = ${colors.dynamic-display-icon-background} +format-prefix-foreground = ${colors.font-default} format-prefix-padding = 1 label = %time% \ No newline at end of file diff --git a/modules/lan b/modules/lan index 037ba5c..1862c30 100644 --- a/modules/lan +++ b/modules/lan @@ -4,19 +4,19 @@ interface = enp4s0 interval = 1.0 format-connected = -format-connected-background = ${colors.label} -format-connected-foreground = ${colors.white} +format-connected-background = ${colors.dynamic-display-background} +format-connected-foreground = ${colors.font-default} format-connected-prefix = %{T2}%{T-} -format-connected-prefix-background = ${colors.prefix} -format-connected-prefix-foreground = ${colors.white} +format-connected-prefix-background = ${colors.dynamic-display-icon-background} +format-connected-prefix-foreground = ${colors.font-default} format-connected-prefix-padding = 1 label-connected = "  %downspeed%  %upspeed% " format-disconnected = -format-disconnected-background = ${colors.label} -format-disconnected-foreground = ${colors.white} +format-disconnected-background = ${colors.dynamic-display-background} +format-disconnected-foreground = ${colors.font-default} format-disconnected-prefix = %{T2}%{T-} -format-disconnected-prefix-background = ${colors.prefix} -format-disconnected-prefix-foreground = ${colors.white} +format-disconnected-prefix-background = ${colors.dynamic-display-icon-background} +format-disconnected-prefix-foreground = ${colors.font-default} format-disconnected-prefix-padding = 1 label-disconnected = " disconnected " diff --git a/modules/launcher b/modules/launcher index 6f6f64d..ef9b78e 100644 --- a/modules/launcher +++ b/modules/launcher @@ -3,7 +3,7 @@ type = custom/script click-left = rofi -show drun click-right = rofi -show run -exec = echo %{T3}%{T-} +exec = echo "%{T3} | %{T4}  $(whoami | awk '{print toupper($0)}')" format-background = ${colors.launcher} -format-foreground = ${colors.white} +format-foreground = ${colors.font-default} format-padding = 1 \ No newline at end of file diff --git a/modules/lockscreen b/modules/lockscreen index a4e8b8c..a9fcfdb 100644 --- a/modules/lockscreen +++ b/modules/lockscreen @@ -3,5 +3,5 @@ type = custom/script click-left = i3lock -n -c 03101C -e -f exec = echo %{T3}%{T-} -format-foreground = ${colors.white} +format-foreground = ${colors.font-default} format-padding = 1 \ No newline at end of file diff --git a/modules/memory b/modules/memory index 6853372..74480ef 100644 --- a/modules/memory +++ b/modules/memory @@ -2,10 +2,10 @@ type = internal/memory interval = 1 -format-background = ${colors.label} -format-foreground = ${colors.white} +format-background = ${colors.dynamic-display-background} +format-foreground = ${colors.font-default} format-prefix = %{T2}%{T-} -format-prefix-background = ${colors.prefix} -format-prefix-foreground = ${colors.white} +format-prefix-background = ${colors.dynamic-display-icon-background} +format-prefix-foreground = ${colors.font-default} format-prefix-padding = 1 label = " %percentage_used%% " \ No newline at end of file diff --git a/modules/pulseaudio b/modules/pulseaudio index d671afb..e382272 100644 --- a/modules/pulseaudio +++ b/modules/pulseaudio @@ -1,19 +1,20 @@ [module/pulseaudio] type = internal/pulseaudio +sink = alsa_output.pci-0000_0a_00.4.analog-stereo use-ui-max = false format-volume = label-volume = " %percentage%% " -label-volume-background = ${colors.label} -label-volume-foreground = ${colors.white} +label-volume-background = ${colors.dynamic-display-background} +label-volume-foreground = ${colors.font-default} label-muted = %{T2}%{T-} 0% -label-muted-background = ${colors.prefix} -label-muted-foreground = ${colors.white} +label-muted-background = ${colors.dynamic-display-icon-background} +label-muted-foreground = ${colors.font-default} label-muted-padding = 1 ramp-volume-0 = %{T2}%{T-} ramp-volume-1 = %{T2}%{T-} ramp-volume-2 = %{T2}%{T-} -ramp-volume-background = ${colors.prefix} -ramp-volume-foreground = ${colors.white} +ramp-volume-background = ${colors.dynamic-display-icon-background} +ramp-volume-foreground = ${colors.font-default} ramp-volume-padding = 1 \ No newline at end of file diff --git a/modules/session b/modules/session index 46634d7..1cbd279 100644 --- a/modules/session +++ b/modules/session @@ -3,6 +3,6 @@ type = custom/script click-left = gnome-session-quit exec = echo %{T2}%{T-} -format-background = ${colors.prefix} +format-background = ${colors.dynamic-display-icon-background} format-foreground = ${colors.session} format-padding = 1 diff --git a/modules/temperature b/modules/temperature index e7ecc4c..9d247d3 100644 --- a/modules/temperature +++ b/modules/temperature @@ -6,15 +6,15 @@ warn-temperature = 60 format =