diff --git a/linux/.config/awesome/icons/bar/9x/cpu.png b/linux/.config/awesome/icons/bar/9x/cpu.png new file mode 100755 index 0000000..7c02af8 Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/cpu.png differ diff --git a/linux/.config/awesome/icons/bar/9x/cpu_temp.png b/linux/.config/awesome/icons/bar/9x/cpu_temp.png new file mode 100755 index 0000000..778ae19 Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/cpu_temp.png differ diff --git a/linux/.config/awesome/icons/bar/9x/gpu.png b/linux/.config/awesome/icons/bar/9x/gpu.png new file mode 100755 index 0000000..7f51014 Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/gpu.png differ diff --git a/linux/.config/awesome/icons/bar/9x/gpu_temp.png b/linux/.config/awesome/icons/bar/9x/gpu_temp.png new file mode 100644 index 0000000..10251a3 Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/gpu_temp.png differ diff --git a/linux/.config/awesome/icons/bar/9x/memory.png b/linux/.config/awesome/icons/bar/9x/memory.png new file mode 100755 index 0000000..f6da30e Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/memory.png differ diff --git a/linux/.config/awesome/icons/bar/9x/music.png b/linux/.config/awesome/icons/bar/9x/music.png new file mode 100755 index 0000000..ef504a4 Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/music.png differ diff --git a/linux/.config/awesome/icons/bar/9x/packages.png b/linux/.config/awesome/icons/bar/9x/packages.png new file mode 100755 index 0000000..b6e26f3 Binary files /dev/null and b/linux/.config/awesome/icons/bar/9x/packages.png differ diff --git a/linux/.config/awesome/modules/bar.lua b/linux/.config/awesome/modules/bar.lua index f127d8e..fd5d849 100644 --- a/linux/.config/awesome/modules/bar.lua +++ b/linux/.config/awesome/modules/bar.lua @@ -81,7 +81,7 @@ local layout_buttons = gears.table.join( end) ) -local function make_bar_icon(icon) +--[[local function make_bar_icon(icon) local img = wibox.widget.imagebox(beautiful["bar_" .. icon], false) img.forced_height = 18 img.forced_width = 18 @@ -90,6 +90,18 @@ local function make_bar_icon(icon) top = 1, layout = wibox.container.margin, } +end--]] +local function make_bar_icon(icon) + local img = wibox.widget.imagebox(vars.env.ICON_DIR .. "/bar/9x/" .. icon .. ".png", false) + img.forced_height = 16 + img.forced_width = 16 + return { + img, + top = 1, + left = 2, + right = 2, + layout = wibox.container.margin, + } end local function make_inset(child) @@ -236,6 +248,7 @@ local packages = wibox.widget.textbox() local packages_wrapper = wibox.widget(status_box({ packages_icon, packages, + spacing = 2, layout = wibox.layout.fixed.horizontal, })) @@ -272,6 +285,7 @@ local music = wibox.widget.textbox() local music_wrapper = wibox.widget(status_box({ music_icon, music, + spacing = 2, layout = wibox.layout.fixed.horizontal, })) @@ -441,30 +455,18 @@ awful.screen.connect_for_each_screen(function(s) { music_wrapper, status_box({ - { - cpu_icon, - cpu.widget, - layout = wibox.layout.fixed.horizontal, - }, - { - cpu_temp_icon, - cpu_temp, - layout = wibox.layout.fixed.horizontal, - }, + cpu_icon, + cpu.widget, + cpu_temp_icon, + cpu_temp, spacing = 2, layout = wibox.layout.fixed.horizontal, }), status_box({ - { - gpu_icon, - gpu, - layout = wibox.layout.fixed.horizontal, - }, - { - gpu_temp_icon, - gpu_temp, - layout = wibox.layout.fixed.horizontal, - }, + gpu_icon, + gpu, + gpu_temp_icon, + gpu_temp, spacing = 2, layout = wibox.layout.fixed.horizontal, }),