diff --git a/awesome/icons/info/batcharge.png b/awesome/icons/info/batcharge.png index ece4511..7fa5ef5 100644 Binary files a/awesome/icons/info/batcharge.png and b/awesome/icons/info/batcharge.png differ diff --git a/awesome/icons/info/batempty.png b/awesome/icons/info/batempty.png index 0af7a1c..a87f4c1 100644 Binary files a/awesome/icons/info/batempty.png and b/awesome/icons/info/batempty.png differ diff --git a/awesome/icons/info/batfull.png b/awesome/icons/info/batfull.png index c493bcd..098d0bb 100644 Binary files a/awesome/icons/info/batfull.png and b/awesome/icons/info/batfull.png differ diff --git a/awesome/icons/info/bathigh.png b/awesome/icons/info/bathigh.png index 3e58940..b5d9b34 100644 Binary files a/awesome/icons/info/bathigh.png and b/awesome/icons/info/bathigh.png differ diff --git a/awesome/icons/info/batlow.png b/awesome/icons/info/batlow.png index ef936fb..dbe6459 100644 Binary files a/awesome/icons/info/batlow.png and b/awesome/icons/info/batlow.png differ diff --git a/awesome/icons/info/batmid.png b/awesome/icons/info/batmid.png index 9a97f3d..345ec9c 100644 Binary files a/awesome/icons/info/batmid.png and b/awesome/icons/info/batmid.png differ diff --git a/awesome/icons/info/cpu.png b/awesome/icons/info/cpu.png index 1a55bc0..313b9dd 100644 Binary files a/awesome/icons/info/cpu.png and b/awesome/icons/info/cpu.png differ diff --git a/awesome/icons/info/download.png b/awesome/icons/info/download.png index d998083..e680fa0 100644 Binary files a/awesome/icons/info/download.png and b/awesome/icons/info/download.png differ diff --git a/awesome/icons/info/mem.png b/awesome/icons/info/mem.png index d0af32f..1c955e7 100644 Binary files a/awesome/icons/info/mem.png and b/awesome/icons/info/mem.png differ diff --git a/awesome/icons/info/upload.png b/awesome/icons/info/upload.png index c7ffe52..5d81d4e 100644 Binary files a/awesome/icons/info/upload.png and b/awesome/icons/info/upload.png differ diff --git a/awesome/icons/info/volhigh.png b/awesome/icons/info/volhigh.png index 16a6196..fbc9a49 100644 Binary files a/awesome/icons/info/volhigh.png and b/awesome/icons/info/volhigh.png differ diff --git a/awesome/icons/info/vollow.png b/awesome/icons/info/vollow.png index 379e3f3..1a29f5c 100644 Binary files a/awesome/icons/info/vollow.png and b/awesome/icons/info/vollow.png differ diff --git a/awesome/icons/info/volmute.png b/awesome/icons/info/volmute.png index 24e6cde..e7480ec 100644 Binary files a/awesome/icons/info/volmute.png and b/awesome/icons/info/volmute.png differ diff --git a/awesome/icons/square_a.png b/awesome/icons/square_a.png deleted file mode 100755 index 1774d95..0000000 Binary files a/awesome/icons/square_a.png and /dev/null differ diff --git a/awesome/icons/square_b.png b/awesome/icons/square_b.png deleted file mode 100755 index b47e9f3..0000000 Binary files a/awesome/icons/square_b.png and /dev/null differ diff --git a/awesome/icons/svgs/svg_to_png.py b/awesome/icons/svgs/svg_to_png.py index 7ce9bc5..a9d9fdf 100755 --- a/awesome/icons/svgs/svg_to_png.py +++ b/awesome/icons/svgs/svg_to_png.py @@ -4,12 +4,16 @@ import pathlib from cairosvg import svg2png from PIL import Image, ImageOps +SIZE = 100 + +part_size = SIZE//5 + for svg in pathlib.Path('.').glob('*.svg'): print(f'Converting {svg.name}...', end='') png = svg.with_suffix('.png') - svg2png(url=str(svg), write_to=str(png), output_width=12, output_height=12) + svg2png(url=str(svg), write_to=str(png), output_width=part_size*3, output_height=part_size*3) with Image.open(png) as img: img.load() - border_img = ImageOps.expand(img, 4, (0, 0, 0, 0)) + border_img = ImageOps.expand(img, part_size, (0, 0, 0, 0)) border_img.save(png) print(' Done') diff --git a/awesome/icons/usedtag.png b/awesome/icons/usedtag.png new file mode 100644 index 0000000..50df334 Binary files /dev/null and b/awesome/icons/usedtag.png differ diff --git a/awesome/theme.lua b/awesome/theme.lua index 8fe6ddf..a5f27d1 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -67,8 +67,10 @@ theme.widget_bat_full = theme.confdir .. '/icons/info/batfull.png' theme.widget_vol_mute = theme.confdir .. '/icons/info/volmute.png' theme.widget_vol_low = theme.confdir .. '/icons/info/vollow.png' theme.widget_vol_high = theme.confdir .. '/icons/info/volhigh.png' -theme.taglist_squares_sel = theme.confdir .. '/icons/square_a.png' -theme.taglist_squares_unsel = theme.confdir .. '/icons/square_b.png' +theme.taglist_fg_focus = '#111111' +theme.taglist_bg_focus = '#b3b3b3' +theme.taglist_squares_unsel = theme.confdir .. '/icons/usedtag.png' +theme.taglist_squares_resize = true theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true theme.useless_gap = 0 @@ -142,11 +144,11 @@ local netupinfo = lain.widget.net({ table.insert(info_widgets, { widget = wibox.layout.fixed.horizontal(wibox.widget.imagebox(theme.widget_netdown), netdowninfo), - bg = '#87af5f' + bg = '#87af5f', }) table.insert(info_widgets, { widget = wibox.layout.fixed.horizontal(wibox.widget.imagebox(theme.widget_netup), netupinfo.widget), - bg = '#e54c62' + bg = '#e54c62', }) -- < Net @@ -181,7 +183,7 @@ if settings['show_battery'] == true then }) table.insert(info_widgets, { widget = wibox.layout.fixed.horizontal(baticon, bat.widget), - bg = '#e54c62' + bg = '#e54c62', }) end -- < Battery @@ -207,10 +209,10 @@ local volume = lain.widget.alsa({ }) local volumebuttons = awful.util.table.join( - awful.button({}, 1, function() -- left click + awful.button({}, 1, function() -- left click os.execute(string.format('%s set %s toggle', volume.cmd, volume.togglechannel or volume.channel)) volume.update() - end), + end), awful.button({}, 4, function() os.execute(string.format('%s set %s 1%%+', volume.cmd, volume.channel)) volume.update() @@ -226,7 +228,7 @@ volumeicon:buttons(volumebuttons) table.insert(info_widgets, { widget = wibox.layout.fixed.horizontal(volumeicon, volume.widget), - bg = '#7493d2' + bg = '#7493d2', }) -- < ALSA volume @@ -239,7 +241,7 @@ local memory = lain.widget.mem({ }) table.insert(info_widgets, { widget = wibox.layout.fixed.horizontal(wibox.widget.imagebox(theme.widget_mem), memory.widget), - bg = '#e0da37' + bg = '#e0da37', }) -- < MEM @@ -252,7 +254,7 @@ local cpu = lain.widget.cpu({ }) table.insert(info_widgets, { widget = wibox.layout.fixed.horizontal(wibox.widget.imagebox(theme.widget_cpu), cpu.widget), - bg = '#e33a6e' + bg = '#e33a6e', }) -- < CPU @@ -276,7 +278,7 @@ fs.widget:buttons(gears.table.join(awful.button({}, 1, function() end))) table.insert(info_widgets, { widget = fs.widget, - bg = '#80d9d8' + bg = '#80d9d8', }) -- < fs @@ -296,7 +298,7 @@ lain.widget.cal({ }) table.insert(info_widgets, { widget = mytextclock, - bg = '#7788af' + bg = '#7788af', }) -- < Textclock @@ -419,13 +421,10 @@ function theme.at_screen_connect(s) }, s.mytasklist, -- Middle widget --nil, - gears.table.join( - { -- Right widgets - layout = wibox.layout.fixed.horizontal, - wibox.container.margin(wibox.widget.systray(), 0, 5) - }, - final_info_widgets - ), + gears.table.join({ -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.container.margin(wibox.widget.systray(), 0, 5), + }, final_info_widgets), }) end