From 4707b6aa9e4d2b174633d09748d3c7f2d758038d Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sun, 17 May 2020 19:54:41 +0200 Subject: [PATCH] Rework theme --- awesome/themes/kadet/icons/widget/cpu.png | Bin 327 -> 492 bytes awesome/themes/kadet/icons/widget/hdd.png | Bin 240 -> 396 bytes awesome/themes/kadet/icons/widget/memory.png | Bin 228 -> 486 bytes awesome/themes/kadet/icons/widget/temp.png | Bin 328 -> 332 bytes awesome/themes/kadet/theme.lua | 126 +++++++++++++------ 5 files changed, 87 insertions(+), 39 deletions(-) diff --git a/awesome/themes/kadet/icons/widget/cpu.png b/awesome/themes/kadet/icons/widget/cpu.png index 468a3591563a66977fe64cb4e6e1e2d6bcab1e46..d03d3dc0c3f174481f009ce8ac6cf306360d67b4 100644 GIT binary patch literal 492 zcmVppBplYE-JQm=_F{0RMg3K>FlJa>EIW1wL>L?e?Yf(l1iPrbg02e zEC?-*;vfnc3!>muH7NB1M0h&n3O3FACbYlha?g3r?;I}o1QMk710%o-;1SRYoB&6_ zH()h{u#;3@ZT3X{s$Qxq>WunK?TP2CT2!ypb+x;m;e>jjepDaSVIQi?ksnKf^0E7P z9kZM|Ts6qwb?VcYsNL~Tc13+(6&sJwmAfC@R6jIe*sNZwgEewX>i4_LbM=?n)`01> z`XeFN9({%~z$ma5LO8Bx3cLh9*GhyCegf;j2aE(9!c3{V8K4t5OaYtJ zMPLg!1rAbr9|D~jpanQj0p9`xKp_^rOJUD|mMl=FvVut(0G2}tMYS1tmBO|GYTPbsE-KnZnT-Aba=tomC0qRy$=6n0yE6Vwi1AIQh4|5d$IzT4xw i4h8kb|I>|H0Qe0%3~5jVHHT#Y000057U-o~wI{Al99mV5gkNCI~3m^J8$=6hQ+au9S{Os->+c_pV?B(YA9%me5Ft znoU#hkEhm@Ho+^AKz*w<7ga-WoP@KRXLeMjU@}C4bE8cn=^J>8NZ+(m=m_u-m3Oj~#)F9|j*epReH$gp!T%{BbvF>jR ZfG-Q*KfTC!-~<2w002ovPDHLkV1gzhgv|f| diff --git a/awesome/themes/kadet/icons/widget/hdd.png b/awesome/themes/kadet/icons/widget/hdd.png index 79602fdbd2958ff5afe1a4e93bb58e664dc5a389..d9345170c3acb63283cd9a768bf539d447f18edb 100644 GIT binary patch delta 382 zcmV-^0fGMT0gMBX7k>~41^@s63?#pm00009a7bBm0001;0001;0grO$ZU6uP8FWQh zbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10U1d|K~y-6t&_1z13?r;&m@bj z=_~}nLP4>z*2*8Su(1$qLVm!`A2Ij^X@Xrk;}6&gcEL_9Qh!*QY&aH9U>y=kcK0?j z@a{Wz;LU?X>Y+MzeT~)qlot|s6Zix+fi5sf8KRnZNFAPhW>|E};xU<5~l%@~1I-UKx@CDBHr&w?f|UeZ86xJ!>xIwC?#^iA3S zR^S650-zrw%GoXWl2s(Sj->fCxi^q!_>zFDK%U|D1T5BQBw8&{!y1jnDt^gMIv`c< zQ0AR(85RCQ&z}v?6*MiuI_$m@r5uBie3E^Xb)Ap6W13p;Aloq(a5|00000NkvXXu0mjfMOIwR diff --git a/awesome/themes/kadet/icons/widget/memory.png b/awesome/themes/kadet/icons/widget/memory.png index 6efb2d56cf76fe19b732972ef47bff7275a709c4..efe0a1e038dc8f2fd8d2c168c0d33216796b77d1 100644 GIT binary patch literal 486 zcmV@P)=NCQhVgcAG0Y0ICslNzyS;ifC2${ld&zKnl?7+;^Zq z1KG>G0`3Cs8aVawsn0W<@%KRLo|B=SuQqCtRsI_!)g&p~Sy|FY2m6%)vj40*=;kpd z5n)KuPF|CgN*d2`6Oz&#m$-i@pB=liF<=d7NqP%v*MUh%jewg2W+goYT)+F@B{j2r c=<=QY0D3R1IBEtxVE_OC07*qoM6N<$g5U?s8UO$Q literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px`u5 z7sn8f&g4J;|JyU`G79_p%5QCm;1-gQkob3*L%ktL(08&Rx7QP)9TVCrdhum))jsb?7GP4`e=cL1xM=PPtHuUSVcPf!)6}7%f!aU#_+s! VN|l%Oe30uIJYD@<);T3K0RZw8O@aUb diff --git a/awesome/themes/kadet/icons/widget/temp.png b/awesome/themes/kadet/icons/widget/temp.png index 9805844c31f164e3133fde096c62b8ea2ef5ac52..00ed63a82cb0a70e803846f8516dc8c55cffee21 100644 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy_!3HG7B;uuk6lZ})WHFE~17SwLYBdfZL$bs* zq9iy!t)x7$D3zhSyj(9cFS|H7u^?41zbJk7I~ysWqMM#Bjv*GkPbb;?F%=55?pM66 ztt~3P!Kma*$eo5G!V-_SU28jXE;-|A~+1D_Yqd;5}mE4#o;Ub6$- zA13&0caWE0=1$;bF<@~!AQSQaCA)(d?=?F{wUu*SkEG9CUMsUBapI1}6)W~VRJeNl b!%cnnjN{9~)SR9HJ;~td>gTe~DWM4fk57Tb literal 328 zcmV-O0k{5%P)KR@)7OFbup_9e@pB13E%RfDKro8!$pg=qT+586hLE zfvZRt$%5tq6!oVkStMu220OAji3pCwxzKk9zyT17BbSH&f{Y9j$B;W;5@4cxDm=3$*o1$8uLr0o#kj0=9&V30BES_utJX#Mc@6FbK9V-6 z0G&$7ZC2ch9B32otcgA{ve!87t?ECPoa27n(u+bN9dAvmbS*iTN>46Dmd_^Q$WgaD zK+PQY0A7@yTs^a0A~O$k-XHA!hU %a %d %b %H:%M ") +local clock = awful.widget.textclock(" %H:%M ") local clock_widget = wibox.container.background(wibox.container.margin(wibox.widget { clock, layout = wibox.layout.align.horizontal }, 0, 1), colors.transparent) +local date = awful.widget.textclock(" %a %d %b ") +local date_widget = wibox.container.background(wibox.container.margin(wibox.widget { date, layout = wibox.layout.align.horizontal }, 0, 1), colors.transparent) + -- Calendar local calendar = lain.widget.calendar({ cal = "cal --color=always", - attach_to = { clock_widget }, + attach_to = { date_widget }, followtag = true, notification_preset = { font = fonts.mono_regular, @@ -262,10 +271,10 @@ function theme.connect(s) screen = s, filter = awful.widget.taglist.filter.all, style = { - shape = gears.shape.powerline + shape = function(cr, width, height) return gears.shape.parallelogram(cr, width, height, width - 8) end }, layout = { - spacing = 0, + spacing = 2, layout = wibox.layout.fixed.horizontal }, widget_template = { @@ -277,8 +286,8 @@ function theme.connect(s) }, layout = wibox.layout.fixed.horizontal, }, - left = 12, - right = 12, + left = 16, + right = 16, widget = wibox.container.margin }, id = 'background_role', @@ -291,56 +300,95 @@ function theme.connect(s) --s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons) -- Create the wibox - s.mywibox = awful.wibar({ position = "top", screen = s, height = 16, bg = theme.bg_wibar, fg = theme.fg_wibar, }) + s.mywibox = awful.wibar({ position = "top", screen = s, height = 18, bg = theme.bg_wibar, fg = theme.fg_wibar, type = dock }) s.tray = wibox.widget.systray() + -- s.tray:setup { + -- layout = wibox.layout.margin, + -- widget = wibox.container.background, + -- bg = "#ff0000" + -- } + -- Add widgets to the wibox s.mywibox:setup { layout = wibox.layout.align.horizontal, expand = 'none', { -- Left widgets - layout = wibox.layout.fixed.horizontal, - s.mytaglist, - s.mypromptbox, + layout = wibox.layout.margin, + left = 8, + { + layout = wibox.layout.fixed.horizontal, + s.mytaglist, + s.mypromptbox, + } }, -- s.mytasklist, -- Middle widget { layout = wibox.layout.fixed.horizontal, - clock_widget, + date_widget, }, { -- Right widgets layout = wibox.layout.fixed.horizontal, + { + layout = wibox.layout.margin, + right = -8, + { + widget = wibox.container.background, + shape = function (cr, w, h) gears.shape.parallelogram(cr, w, h, w - 8) end, + color = "#000000", + bg = "#000000", + { + layout = wibox.layout.margin, + left = 20, right = 20, + { + layout = wibox.layout.fixed.horizontal, + spacing = 8, + -- Fs widget + fs_widget, + -- Temp + temp_widget, + -- CPU widget + cpu_widget, + -- Mem widget + mem_widget, + } + } + }, + }, + -- tray { widget = wibox.container.background, - shape = function (cr, w, h) gears.shape.powerline(cr, w, h, -h/2) end, - color = "#000000", - bg = "#000000", + shape = function (cr, w, h) gears.shape.parallelogram(cr, w, h, w - 8) end, + bg = "#FF9800", { layout = wibox.layout.margin, - left = 15, right = 5, + left = 8, right = 8, { layout = wibox.layout.fixed.horizontal, - -- Fs widget - fs_widget, - -- Temp - temp_widget, - -- CPU widget - cpu_widget, - -- Mem widget - mem_widget, - -- tray - { - s.tray, - widget = wibox.container.background, - layout = wibox.layout.margin, - left = 5, right = 5, - }, + s.tray, + clock_widget, } } }, -- Layout box - s.mylayoutbox, + { + layout = wibox.layout.margin, + left = -8, right = -8, + { + widget = wibox.container.background, + bg = "#000000", + shape = function (cr, w, h) gears.shape.parallelogram(cr, w, h, w - 8) end, + { + layout = wibox.layout.margin, + s.mylayoutbox, + left = 16, + right = 16, + top = 1, + bottom = 1, + } + } + }, }, } end