From 42ed8d8eaf9b1653d1a50730e966136b99321c0b Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Fri, 27 Jan 2017 17:35:50 +0100 Subject: [PATCH 1/4] blackburn: clear layout icons background --- lain | 2 +- themes/blackburn/icons/dwindle.png | Bin 180 -> 201 bytes themes/blackburn/icons/fairh.png | Bin 175 -> 196 bytes themes/blackburn/icons/fairv.png | Bin 178 -> 198 bytes themes/blackburn/icons/floating.png | Bin 175 -> 198 bytes themes/blackburn/icons/magnifier.png | Bin 176 -> 195 bytes themes/blackburn/icons/max.png | Bin 205 -> 228 bytes themes/blackburn/icons/spiral.png | Bin 174 -> 195 bytes themes/blackburn/icons/tile.png | Bin 170 -> 190 bytes themes/blackburn/icons/tilebottom.png | Bin 170 -> 191 bytes themes/blackburn/icons/tileleft.png | Bin 165 -> 185 bytes themes/blackburn/icons/tiletop.png | Bin 170 -> 190 bytes 12 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lain b/lain index ae4b9b2..83b96b3 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit ae4b9b272802c0690b711644508d63a538a3e1cd +Subproject commit 83b96b3c3ada021e47d6ef1ad48c03710f0dc24a diff --git a/themes/blackburn/icons/dwindle.png b/themes/blackburn/icons/dwindle.png index b911f943014bccf55abbf302c50eca6bd7deb3aa..602266a75485f847873794a97cde1089c26e2a1a 100644 GIT binary patch delta 146 zcmV;D0B!%Y0m%W7Bo78+OGiWi{{a60|De66laV1Fc;NvX5F0o)rc2!b0034=L_t(I z%VU(1l476+U}B&W7<>k?AakBReR_#ljndN6dN>Wjrr_z*r-B!3BTNLh0L01FcU01FcV0GgZ_00007bV*G`2i*i17cUa}m4Gn- z002`-L_t(I%VU(1lKRg;1;E5WB{295VnOEY-Mg1)jn2-_xDCRlVDH|&SjC1|7~ulM zgdGzp0qgASj1gV~<27QuNRo@_;x$I(+)qi$W*ol72msm97!hnN8P(4K0000k?AakBReR_#ljndN6dN>V2R`B%c(@V&Tk@?sx9L9k?_zYr1 v<94er(Z>&qCUyY+SYx<7LL-TZ{kzXvQQK3x6WR00000NkvXXu0mjf*bO>S delta 147 zcmX@YxSnx>N&kwYMM7Mk?SX%Y4^YU@)5S5w z;&k$qNt1q^cVInm#6i{I2TzjYvp08lPtWK*ckbK{UZ=1Pv%>J^rBU#vnFDw%%vgEJYrm(F~rhelF{r5}E)o2sHQr diff --git a/themes/blackburn/icons/fairv.png b/themes/blackburn/icons/fairv.png index 274ed3887d6c84121b3e82c1133e35b129ea6440..c262697c57ac5d266c6b9ca1ff44f5f6043a046a 100644 GIT binary patch delta 120 zcmdnQc#Ls^3O`$tx4R3&e-K=-clqRrigJbz8KnhenD)PBS;4@-5bWvV7-DfcdCH_o zNekE#k`@R_)Ua(-D4u6mTh$rSd+E}pDvOEv(wZu|x@+4{A8pp}VN?6{@uVT&{UjC! YHx>1u34dhmfaWlGy85}Sb4q9e0H}*B%m4rY delta 150 zcmX@cxQTIsN&kwYMM7LpHQHFD9w-#(>Eak- zaXNX*q)ETdJFp%&;-G5qgD1)H*_*q&r)Tt@J9lme@1bQ3H-%=%m~m%5HVxYAzU{h) z5r_PNbP3PICvV>LTt3>Y-@~T%>*Gm7zWYfm4ElHFihlDuJ6{2s&fw|l=d#Wzp$P!o C!Z+0b diff --git a/themes/blackburn/icons/floating.png b/themes/blackburn/icons/floating.png index 21326f4d6a0d5448c838be47f9b7c6ae7ef7bc35..7bfcd5caaf344678fb67e9a51786199f595f584f 100644 GIT binary patch delta 152 zcmZ3_c#Ls^q!b$i14G!kzHlJLmgMd3!tfsi7wla=d7`31v9y2;OIXLkxj@-qPZ!4! zi_^(dCQV9Oz?P7-KuDs7ZDWFP&95&nRh^`kE?xSSL#oABQL($NFyXS=wF%6E$Bv1= zs7U6GR5m=>knm-4mIU`o&i;&MkB@vt2{QYRaxmOjEq(rIWIYoD1H;WVl0cGyv%n*=n1O*?7=#%aX3dcR3bL1Y`ns||WMt>nFw=Iq z{SGMP=jq}YqH#WX%A`q23bF=<6IfrY?q%)WU;aKW#%u1}xrJHIlaHm|nZO~`Ey>#hPmBqw-T@lGW5`HYxzTE<9VeoYIb6Mw<&;$S` CnIz5t delta 106 zcmX@ixPftkiZ^G0M`SSr1Gg{;GcwGYBf-GHz+U3%>&kwYMMB(wKjh@2GN6#Zr;B5V z#p&cJlP3K-@4$NCh=Z!Z51u5)XK(KAo}STr?%cT@6Pt8JdKpBRe2U&%0d+8Vy85}S Ib4q9e0IRkm^8f$< diff --git a/themes/blackburn/icons/max.png b/themes/blackburn/icons/max.png index 27905b6a1200176cd78d7fa9cd3d73684edba245..6c51e36ca6e32c64e214a8046380663b43d0d369 100644 GIT binary patch delta 174 zcmV;f08#(V0ptOYBo78+OGiWi{{a60|De66laV1Ff8hZe5F808Io%)t0041GL_t(I z%iYw$2>>As1V9Z|k@Rr=*I^Ia$GrqOOg4fKx%>p3s4G@gEhkFKp}G%h^8i54E;O^p zg}h0bX0k%O$pE_7M7$k+u?Pt-d&U?-QyUmVC^V2vn!*qkKnSgl!!X&2IKtY_ql>Ek c_ZxWu6sY`2Mwp5$Z~y=R07*qoM6N<$f?qmC@c;k- delta 177 zcmV;i08anp0nGuBB!3BTNLh0L01FcU01FcV0GgZ_00007bV*G`2i*i17ce!F#XH0R z003-BL_t(I%iYvL3P2$U1kjRB;dMOsoUOkKBGNHv@yT6K&uXHos=Zt&DVOShP@4w; z(hJSZhrCIdX0k)P$pG9Y;_Ya~A|$-*8Dj`dZD0(c&_FV23MxZb03ozH4#VUm;s|Re fk1neE?lk?AakBReR_#ljndN6dN>Wjrr_z*r&kwYMMB(Aby}v>L!gkar;B5V z#p&cJlP3K-@4$NCh=Z!Z51u5)XK(KAo}STr?%cT@yoZ)0yuY_M;%Hlh#6zYdEwaKJ y8M(RDzkHB#i(6c|#!%^bomY_A;}5!S48Lt9aza-Bie}&j8tv)o=d#Wzp$PzU+&1z6 diff --git a/themes/blackburn/icons/tile.png b/themes/blackburn/icons/tile.png index 045eafad9724aaf93d5b82ef03eb82d2d080d8ba..3fe63b6c8f03873d3dd845093fd814cca4092f41 100644 GIT binary patch delta 135 zcmV;20C@kZ0loo{Bo78+OGiWi{{a60|De66laV1FZQ%hM5F8+Ci$zQT002u#L_t(I z%VU(1l476+U}B&W7<>k?AakBReR_#ljndN6dN>Wjrr_z*rAtyX& p>b21@BExIgY$L{NjKjAW0RS2HBGKxQS-k)N002ovPDHLkV1hZbH>m&s delta 142 zcmdnTxQcOtN&kwYMMB(&Ip6cleV~x1r;B5V z#p&cJlP3K-@4$NCh=Z!Z51u5)XK(KAo}STr?%cT@yoZ)0yuY_M;^>RVrZEi?`kN;R u%b9$=l_4?lp=r)G!N;b@9!B>tFbJQQS|0eKM+ImogD1PIpUXO@geCy(6gI^G diff --git a/themes/blackburn/icons/tilebottom.png b/themes/blackburn/icons/tilebottom.png index 556b465a9ab590e1e8261b6db04595974e5aca69..3f017e376df668178e74ec11b0870b439ca957d5 100644 GIT binary patch delta 136 zcmV;30C)eY0lxu|Bo78+OGiWi{{a60|De66laV1FZs7qN5F8`(f)w@u002x$L_t(I z%VU(1l476+U}B&W7<>k?AakBReR_#ljndN6dN>WjrT`njX5mN)Y*GW9sK9>u^yww! qfJf$!u)trkF delta 142 zcmdnbxQcOtN&kwYMMB(2EtPsCjC0^zK9|k?AakBReR_#ljndN6dN>Wjrr_z*r&kwYMMB(2O~qGY22jYw)5S5w z;&k$qNt1q^cVInm#6i{I2TzjYvp08lPtWK*ckbK{-b2e0-rw6BarDJw)1bZXo36Jx pe&JtlpmZwx$d0bUA7aW3Ptv89w{vvP1DeO+>FVdQ&WS0Z2>_NDG_?Q# diff --git a/themes/blackburn/icons/tiletop.png b/themes/blackburn/icons/tiletop.png index 11cab1a78a8e476dd9ee246c8e43633340877fb7..c343fff2de233dd40db6956409b4641f71660f88 100644 GIT binary patch delta 135 zcmV;20C@kZ0loo{Bo78+OGiWi{{a60|De66laV1FZQ%hM5FHoGEztr1002u#L_t(I z%VU(1l476+U}B&W7<>k?AakBReR_#ljndN6dN>V2R`B%c(@V&Tk@?sx9L9moh@2p4 p64>~_2n%c$V*F2XtPQU)0svtv9F=G|yN&<=002ovPDHLkV1g@QHS7QY delta 142 zcmdnTxQcOtN&kwYMMB)j+TFXv5h>Eak- zaXNX*q)ETdJFp%&;-G5qgD1)H*_*q&r)Tt@J9lmeuT$8D^7nBfM^Dt`i19r>kmlky t!GtrXCZUDZjN9;^y5+UDa0y0+&{7Ex?^)b$fQB-7vb*}ZtaD0e0szy)FyH_H From d0c62c156a846fa45b717e7a915c325fe90d22ec Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Fri, 27 Jan 2017 18:30:35 +0100 Subject: [PATCH 2/4] multicolor: volume -> volume.widget in wibar --- rc.lua.multicolor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 94dee4d..5e02be4 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -414,7 +414,7 @@ awful.screen.connect_for_each_screen(function(s) netupicon, netupinfo.widget, volicon, - volume, + volume.widget, memicon, memory.widget, cpuicon, From 1b0259fd1c57f5458e4eb3bfbc80b7219f928df5 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Fri, 27 Jan 2017 22:03:00 +0100 Subject: [PATCH 3/4] lain: new commit --- lain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lain b/lain index 83b96b3..555b872 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 83b96b3c3ada021e47d6ef1ad48c03710f0dc24a +Subproject commit 555b872d16393774089df3b3453000571a73a3dd From c4ec0f07118a3aa88b1da95848d0db486f7544b7 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sat, 28 Jan 2017 20:57:22 +0100 Subject: [PATCH 4/4] lain: new commit --- lain | 2 +- rc.lua.blackburn | 3 ++- rc.lua.copland | 26 +++++++++++++++++++++++++- rc.lua.dremora | 3 ++- rc.lua.holo | 5 ++++- rc.lua.multicolor | 3 ++- rc.lua.powerarrow-darker | 3 ++- rc.lua.rainbow | 3 ++- rc.lua.steamburn | 3 ++- 9 files changed, 42 insertions(+), 9 deletions(-) diff --git a/lain b/lain index 555b872..1b42851 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 555b872d16393774089df3b3453000571a73a3dd +Subproject commit 1b428513fdede06ef54679edbfd267534f49659e diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 9f53ffc..5ae5759 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -142,7 +142,8 @@ gray = "#9E9C9A" local mytextclock = wibox.widget.textclock(" %H:%M ") -- Calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { mytextclock }, notification_preset = { font = "Tamsyn 10.5", fg = beautiful.fg_normal, diff --git a/rc.lua.copland b/rc.lua.copland index 5234811..c019f39 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -146,7 +146,8 @@ local green = "#8FEB8F" local mytextclock = wibox.widget.textclock(" %H:%M ") -- Calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { mytextclock }, notification_preset = { font = "Tamsyn 10.5", fg = beautiful.fg_normal, @@ -281,6 +282,7 @@ local volicon = wibox.widget.imagebox(beautiful.vol) local volume = lain.widgets.alsabar({ width = 59, border_width = 0, ticks = true, ticks_size = 6, notification_preset = { font = beautiful.font }, + --togglechannel = "IEC958,3", settings = function() if volume_now.status == "off" then volicon:set_image(beautiful.vol_mute) @@ -301,6 +303,28 @@ local volume = lain.widgets.alsabar({ local volumebg = wibox.container.background(volume.bar, "#474747", shape.rectangle) local volumewidget = wibox.container.margin(volumebg, 2, 7, 4, 4) +volume.bar:buttons(awful.util.table.join ( + awful.button({}, 1, function() + awful.spawn.with_shell(string.format("%s -e alsamixer", terminal)) + end), + awful.button({}, 2, function() + awful.spawn(string.format("%s set %s 100%%", volume.cmd, volume.channel)) + volume.update() + end), + awful.button({}, 3, function() + awful.spawn(string.format("%s set %s toggle", volume.cmd, volume.togglechannel or volume.channel)) + volume.update() + end), + awful.button({}, 4, function() + awful.spawn(string.format("%s set %s 1%%+", volume.cmd, volume.channel)) + volume.update() + end), + awful.button({}, 5, function() + awful.spawn(string.format("%s set %s 1%%-", volume.cmd, volume.channel)) + volume.update() + end) +)) + -- Weather local myweather = lain.widgets.weather({ city_id = 2643743, -- placeholder (London) diff --git a/rc.lua.dremora b/rc.lua.dremora index 920c55d..e806269 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -144,7 +144,8 @@ local mytextclock = wibox.widget.textclock(markup(gray, " %a") .. markup(white, " %d ") .. markup(gray, "%b ") .. markup(white, "%H:%M ")) -- Calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { mytextclock }, notification_preset = { font = "Tamsyn 10.5", fg = white, diff --git a/rc.lua.holo b/rc.lua.holo index d922b7f..6285495 100644 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -153,7 +153,10 @@ local mytextcalendar = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%d %b local calendar_icon = wibox.widget.imagebox(beautiful.calendar) local calbg = wibox.container.background(mytextcalendar, beautiful.bg_focus, shape.rectangle) local calendarwidget = wibox.container.margin(calbg, 0, 0, 5, 5) -lain.widgets.calendar.attach(calendarwidget, { notification_preset = { fg = "#FFFFFF", bg = beautiful.bg_normal, position = "bottom_right", font = "Monospace 10" } }) +lain.widgets.calendar({ + attach_to = { calendarwidget, clockwidget }, + notification_preset = { fg = "#FFFFFF", bg = beautiful.bg_normal, position = "bottom_right", font = "Monospace 10" } +}) --[[ Mail IMAP check -- commented because it needs to be set before use diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 5e02be4..51f5580 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -156,7 +156,8 @@ local mytextclock = lain.widgets.base({ ]] -- Calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { mytextclock }, notification_preset = { font = "Terminus 10", fg = beautiful.fg_normal, diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index c7cc927..3587630 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -148,7 +148,8 @@ local clock = lain.widgets.abase({ }) -- calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { clock.widget }, notification_preset = { font = "Terminus 10", fg = beautiful.fg_normal, diff --git a/rc.lua.rainbow b/rc.lua.rainbow index 97f87a9..ab318a6 100644 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -143,7 +143,8 @@ local gray = beautiful.fg_normal local mytextclock = wibox.widget.textclock(markup(white, " %H:%M ")) -- Calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { mytextclock }, notification_preset = { font = "Tamsyn 10.5", fg = white, diff --git a/rc.lua.steamburn b/rc.lua.steamburn index fa0e0ce..6c92a92 100644 --- a/rc.lua.steamburn +++ b/rc.lua.steamburn @@ -141,7 +141,8 @@ local gray = "#94928F" local mytextclock = wibox.widget.textclock(" %H:%M ") -- Calendar -lain.widgets.calendar.attach(mytextclock, { +lain.widgets.calendar({ + attach_to = { mytextclock }, notification_preset = { font = "Tamsyn 10.5", fg = gray,