From: copycat-killer Date: Mon, 23 Jan 2017 14:14:16 +0000 (+0100) Subject: alsabar: revert #275; remove buttons and beautiful deps X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f53ae25b0c4e9c6d78d30ead1f1f13e34dce187e?ds=sidebyside;hp=--cc alsabar: revert #275; remove buttons and beautiful deps --- f53ae25b0c4e9c6d78d30ead1f1f13e34dce187e diff --cc widgets/alsabar.lua index 20a678e,3ade35c..430063b --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@@ -22,8 -21,12 +20,15 @@@ local terminal = "urxvtc" or "xterm -- ALSA volume bar -- lain.widgets.alsabar local alsabar = { ++<<<<<<< HEAD ++======= + channel = "Master", + step = "1%", + mixer = "amixer", + ++>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8 colors = { - background = beautiful.bg_normal, + background = "#000000", mute = "#EB8F8F", unmute = "#A4CE8A" }, @@@ -42,16 -52,16 +47,29 @@@ local function worker(args local ticks_size = args.ticks_size or 7 local vertical = args.vertical or false ++<<<<<<< HEAD + alsabar.cmd = args.cmd or "amixer" + alsabar.channel = args.channel or "Master" + alsabar.colors = args.colors or alsabar.colors + alsabar.followtag = args.followtag or false + alsabar._notify = args.notify or "on" + alsabar.notification_preset = args.notification_preset + + if not alsabar.notification_preset then + alsabar.notification_preset = naughty.config.defaults + alsabar.notification_preset.font = "Monospace 11" ++======= + alsabar.mixer = args.mixer or alsabar.mixer + alsabar.channel = args.channel or alsabar.channel + alsabar.togglechannel = args.togglechannel or alsabar.togglechannel + alsabar.cmd = args.cmd or {"bash", "-c", string.format("%s get %s", alsabar.mixer, alsabar.channel)} + alsabar.step = args.step or alsabar.step + alsabar.colors = args.colors or alsabar.colors + alsabar.notifications = args.notifications or alsabar.notifications + alsabar.followtag = args.followtag or false + if alsabar.togglechannel then + alsabar.cmd = args.cmd or { "bash", "-c", string.format("%s get %s; %s get %s", alsabar.mixer, alsabar.channel, alsabar.mixer, alsabar.togglechannel)} ++>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8 end alsabar.bar = wibox.widget {