diff options
| -rw-r--r-- | brightness-widget/brightness.lua | 31 | ||||
| -rw-r--r-- | calendar-widget/calendar.lua | 5 | ||||
| -rw-r--r-- | weather-widget/weather.lua | 4 |
3 files changed, 26 insertions, 14 deletions
diff --git a/brightness-widget/brightness.lua b/brightness-widget/brightness.lua index 3a77a44..b1cb107 100644 --- a/brightness-widget/brightness.lua +++ b/brightness-widget/brightness.lua @@ -12,10 +12,11 @@ local awful = require("awful") local wibox = require("wibox") local watch = require("awful.widget.watch") local spawn = require("awful.spawn") +local gfs = require("gears.filesystem") local naughty = require("naughty") local beautiful = require("beautiful") -local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/brightness-widget/' +local ICON_DIR = gfs.get_configuration_dir() .. "awesome-wm-widgets/brightness-widget/" local get_brightness_cmd local set_brightness_cmd local inc_brightness_cmd @@ -24,15 +25,15 @@ local dec_brightness_cmd local brightness_widget = {} local function show_warning(message) - naughty.notify{ - preset = naughty.config.presets.critical, - title = 'Brightness Widget', - text = message} + naughty.notify({ + preset = naughty.config.presets.critical, + title = "Brightness Widget", + text = message, + }) end local function worker(user_args) - - local args = user_args or {} + local args = user_args or {} local type = args.type or 'arc' -- arc or icon_and_text local path_to_icon = args.path_to_icon or ICON_DIR .. 'brightness.svg' @@ -56,10 +57,10 @@ local function worker(user_args) inc_brightness_cmd = 'xbacklight -inc ' .. step dec_brightness_cmd = 'xbacklight -dec ' .. step elseif program == 'brightnessctl' then - get_brightness_cmd = 'bash -c "brightnessctl -m | cut -d, -f4 | tr -d %"' - set_brightness_cmd = 'brightnessctl set %d%%' -- <level> - inc_brightness_cmd = 'brightnessctl set +' .. step .. '%' - dec_brightness_cmd = 'brightnessctl set ' .. step .. '-%' + get_brightness_cmd = "brightnessctl get" + set_brightness_cmd = "brightnessctl set %d%%" -- <level> + inc_brightness_cmd = "brightnessctl set +" .. step .. "%" + dec_brightness_cmd = "brightnessctl set " .. step .. "-%" else show_warning(program .. " command is not supported by the widget") return @@ -187,6 +188,8 @@ local function worker(user_args) return brightness_widget.widget end -return setmetatable(brightness_widget, { __call = function(_, ...) - return worker(...) -end }) +return setmetatable(brightness_widget, { + __call = function(_, ...) + return worker(...) + end, +}) diff --git a/calendar-widget/calendar.lua b/calendar-widget/calendar.lua index 4bb637f..bc4a877 100644 --- a/calendar-widget/calendar.lua +++ b/calendar-widget/calendar.lua @@ -232,9 +232,14 @@ local function worker(user_args) awful.placement.top(popup, { margins = { top = 30 }, parent = awful.screen.focused() }) elseif placement == 'top_right' then awful.placement.top_right(popup, { margins = { top = 30, right = 10}, parent = awful.screen.focused() }) + elseif placement == 'top_left' then + awful.placement.top_left(popup, { margins = { top = 30, left = 10}, parent = awful.screen.focused() }) elseif placement == 'bottom_right' then awful.placement.bottom_right(popup, { margins = { bottom = 30, right = 10}, parent = awful.screen.focused() }) + elseif placement == 'bottom_left' then + awful.placement.bottom_left(popup, { margins = { bottom = 30, left = 10}, + parent = awful.screen.focused() }) else awful.placement.top(popup, { margins = { top = 30 }, parent = awful.screen.focused() }) end diff --git a/weather-widget/weather.lua b/weather-widget/weather.lua index 4e8e659..3ec1c3f 100644 --- a/weather-widget/weather.lua +++ b/weather-widget/weather.lua @@ -18,6 +18,10 @@ local WIDGET_DIR = HOME_DIR .. '/.config/awesome/awesome-wm-widgets/weather-widg local GET_FORECAST_CMD = [[bash -c "curl -s --show-error -X GET '%s'"]] local SYS_LANG = os.getenv("LANG"):sub(1, 2) +if SYS_LANG == "C" or SYS_LANG == "C." then + -- C-locale is a common fallback for simple English + SYS_LANG = "en" +end -- default language is ENglish local LANG = gears.filesystem.file_readable(WIDGET_DIR .. "/" .. "locale/" .. SYS_LANG .. ".lua") and SYS_LANG or "en" |