diff --git a/.bin b/.bin index db8ece92..ebe072a3 160000 --- a/.bin +++ b/.bin @@ -1 +1 @@ -Subproject commit db8ece927fee0a2e5e3984d9f6f17cf7edca9c46 +Subproject commit ebe072a32cfcbe8b0c41c96773600462ad4f2300 diff --git a/.config/conky/i3lock.conf b/.config/conky/i3lock.conf index b5f6b2da..b8f61bef 100644 --- a/.config/conky/i3lock.conf +++ b/.config/conky/i3lock.conf @@ -6,7 +6,7 @@ conky.config = { own_window_class = 'Conky_i3lock', own_window_type = 'override', own_window_hints = 'undecorated,above,sticky,skip_taskbar,skip_pager', - own_window_colour = '282828', + own_window_colour = '383c4a', double_buffer = true, cpu_avg_samples = 2, @@ -14,16 +14,16 @@ conky.config = { update_interval = 1, use_xft = true, - font = 'Inconsolata:style=Medium:size=10', + font = 'Noto Sans:style=Light:size=10', default_color = '#ebdbb2', - color1 = '282828', -- Background - color2 = 'ebdbb2', -- Foreground - color3 = '3c3836', -- Background-alt - color4 = 'b8bb26', -- Green (Battery) - color6 = '8ec07c', -- Cyan (Network) - color7 = 'fabd2f', -- Yellow (Disk) - color8 = '83a598', -- Blue (CPU) - color9 = 'd3869b', -- Magenta (Memory) + color1 = '383c4a', -- Background + color2 = 'fffcf6', -- Foreground + color3 = '4b5162', -- Background-alt + color4 = '859900', -- Green (Battery) + color6 = '2aa198', -- Cyan (Network) + color7 = 'b58900', -- Yellow (Disk) + color8 = '268bd2', -- Blue (CPU) + color9 = 'd33682', -- Magenta (Memory) alignment = 'middle_middle', xinerama_head = 2, @@ -42,12 +42,12 @@ conky.config = { } conky.text = [[ -${font Inconsolata:style=Medium:size=64}$alignr${time %I:%M %p}$font -${font Inconsolata:style=Medium:size=24}$alignr${time %A, %B %d}$font +${font Noto Sans:style=Light:size=52}$alignr${time %I:%M %p}$font +${font Noto Sans:style=Light:size=24}$alignr${time %A, %B %d}$font ${if_existing /sys/class/power_supply/BAT0} -${alignr}BAT: $color4${battery_bar}$color$endif +${alignr}Battery: $color4${battery_bar}$color$endif ${alignr}CPU: $color8${cpubar}$color -${alignr}MEM: $color9${membar}$color -${alignr}SWP: $color9${swapbar}$color +${alignr}Memory: $color9${membar}$color +${alignr}Swap: $color9${swapbar}$color ]] diff --git a/.config/dconf/user b/.config/dconf/user index eb98e1ac..79079717 100644 Binary files a/.config/dconf/user and b/.config/dconf/user differ diff --git a/.local/share/dsk b/.local/share/dsk index 44430eb3..f12d61a8 160000 --- a/.local/share/dsk +++ b/.local/share/dsk @@ -1 +1 @@ -Subproject commit 44430eb3e807d69a2b608d30daab3bb282d37ac9 +Subproject commit f12d61a878864c982415df3d35b75b61c593b790