diff --git a/lain b/lain index 2728440..8ba5f4a 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 272844030a05df1807406245b84930ea4740e61b +Subproject commit 8ba5f4a7ef8c86c58a90433fa781dda2f444f47c diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 76f2a06..7c9725c 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -232,7 +232,7 @@ local volume = lain.widgets.alsa({ }) local myweather = lain.widgets.weather({ - city_id = 123456, -- placeholder + city_id = 2643743, -- placeholder (London) settings = function() units = math.floor(weather_now["main"]["temp"]) widget:set_markup(" " .. units .. " ") diff --git a/rc.lua.copland b/rc.lua.copland index fcf5ec3..2775e80 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -279,7 +279,7 @@ local fswidget = wibox.container.margin(fsbg, 2, 7, 4, 4) -- ALSA volume bar local volicon = wibox.widget.imagebox(beautiful.vol) local volume = lain.widgets.alsabar({ - width = 59, border_width = 0, ticks = true, ticks_size = 6, step = "2%", + width = 59, border_width = 0, ticks = true, ticks_size = 6 notification_preset = { font = beautiful.font }, settings = function() if volume_now.status == "off" then @@ -303,7 +303,7 @@ local volumewidget = wibox.container.margin(volumebg, 2, 7, 4, 4) -- Weather local myweather = lain.widgets.weather({ - city_id = 123456 -- placeholder + city_id = 2643743, -- placeholder (London) }) -- Separators diff --git a/rc.lua.dremora b/rc.lua.dremora index 01f6e7a..36326bd 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -238,7 +238,7 @@ local volume = lain.widgets.alsa({ -- Weather local myweather = lain.widgets.weather({ - city_id = 123456, -- placeholder + city_id = 2643743, -- placeholder (London) notification_preset = { fg = white } }) diff --git a/rc.lua.holo b/rc.lua.holo index b7a3520..1e84b21 100644 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -292,8 +292,8 @@ local networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5) -- Weather local myweather = lain.widgets.weather({ + city_id = 2643743, -- placeholder (London) notification_preset = { font = "Monospace 9" }, - city_id = 123456 -- placeholder }) -- Separators diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 6401faf..d2e11a8 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -166,7 +166,7 @@ lain.widgets.calendar.attach(mytextclock, { -- Weather local weathericon = wibox.widget.imagebox(beautiful.widget_weather) local myweather = lain.widgets.weather({ - city_id = 123456, -- placeholder + city_id = 2643743, -- placeholder (London) weather_na_markup = markup("#eca4c4", "N/A "), settings = function() descr = weather_now["weather"][1]["description"]:lower() diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index ceb9112..587f664 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -579,7 +579,6 @@ globalkeys = awful.util.table.join( -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), awful.key({ altkey, }, "h", function () fsroot.show(7) end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.rainbow b/rc.lua.rainbow index fcf808d..acb65b3 100644 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -221,7 +221,7 @@ local volumewidget = wibox.container.margin(volumebg, 7, 7, 5, 5) -- Weather local myweather = lain.widgets.weather({ - city_id = 123456, -- placeholder + city_id = 2643743, -- placeholder (London) settings = function() w_notification_preset.fg = white end diff --git a/rc.lua.steamburn b/rc.lua.steamburn index 5c60d6a..935d1d9 100644 --- a/rc.lua.steamburn +++ b/rc.lua.steamburn @@ -241,7 +241,7 @@ local volume = lain.widgets.alsa({ -- Weather local myweather = lain.widgets.weather({ - city_id = 123456 -- placeholder + city_id = 2643743, -- placeholder (London) }) -- Separators diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index 562779b..01f7304 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -1,7 +1,7 @@ --[[ - Blackburn Awesome WM config 2.0 + Blackburn Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/themes/copland/icons/stop.png b/themes/copland/icons/stop.png new file mode 100644 index 0000000..b01b75e Binary files /dev/null and b/themes/copland/icons/stop.png differ diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index 6f0689b..32c0cb6 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -1,9 +1,9 @@ --[[ - - Copland Awesome WM config - github.com/copycat-killer - + + Copland Awesome WM config 2.0 + github.com/copycat-killer + --]] local theme = {} @@ -46,6 +46,7 @@ theme.bat_low = theme.dir .. "/icons/bat_low.p theme.bat_no = theme.dir .. "/icons/bat_no.png" theme.play = theme.dir .. "/icons/play.png" theme.pause = theme.dir .. "/icons/pause.png" +theme.stop = theme.dir .. "/icons/stop.png" theme.layout_tile = theme.dir .. "/icons/tile.png" theme.layout_tileleft = theme.dir .. "/icons/tileleft.png"