From: copycat-killer Date: Sun, 8 Jan 2017 12:25:09 +0000 (+0100) Subject: wiki updated #254; other fixes X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/2f1f0c572a85f3d393315b6b63aff12a063649b3?ds=inline;hp=-c wiki updated #254; other fixes --- 2f1f0c572a85f3d393315b6b63aff12a063649b3 diff --git a/README.rst b/README.rst index 6c7bb01..a0cd369 100644 --- a/README.rst +++ b/README.rst @@ -10,11 +10,14 @@ Layouts, widgets and utilities for Awesome WM 4.x :License: GNU-GPL2_ :Source: https://github.com/copycat-killer/lain +Warning +------- + +The update to 4.x is still in progress: if you experience issues, please report them in order to speed up the process. + Description ----------- -**Note:** the update to 4.x is still in progress: if you experience issues, please report them in order to speed up the process. - Successor of awesome-vain_, this module provides new layouts, a set of widgets and utility functions, with the aim of improving Awesome_ usability and configurability. Read the wiki_ for all the info. diff --git a/helpers.lua b/helpers.lua index 6a47738..50254c1 100644 --- a/helpers.lua +++ b/helpers.lua @@ -9,7 +9,7 @@ local debug = require("debug") local assert = assert -local capi = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) } +local capi = { timer = require ("gears.timer") } local io = { open = io.open, lines = io.lines, popen = io.popen } diff --git a/init.lua b/init.lua index 155d6cc..5640861 100644 --- a/init.lua +++ b/init.lua @@ -9,11 +9,8 @@ --]] -local lain = -{ +return { layout = require("lain.layout"), util = require("lain.util"), widgets = require("lain.widgets") } - -return lain diff --git a/widgets/contrib/redshift.lua b/widgets/contrib/redshift.lua index 69247ee..3c4f749 100644 --- a/widgets/contrib/redshift.lua +++ b/widgets/contrib/redshift.lua @@ -8,7 +8,6 @@ local awful = require("awful") local os = os -local spawn = awful.util.spawn_with_shell local setmetatable = setmetatable @@ -26,9 +25,9 @@ local function init() -- toggled off (i.e Awesome on-the-fly restart), kill redshift to make sure os.execute("pkill redshift") -- Remove existing color adjustment - spawn("redshift -x") + awful.spawn_with_shell("redshift -x") -- (Re)start redshift - spawn("redshift") + awful.spawn_with_shell("redshift") running = true active = true end diff --git a/widgets/fs.lua b/widgets/fs.lua index 4d05df5..49cb8f0 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -11,12 +11,12 @@ local helpers = require("lain.helpers") local beautiful = require("beautiful") +local focused = require("awful.screen").focused local wibox = require("wibox") local naughty = require("naughty") local io = { popen = io.popen } local pairs = pairs -local mouse = mouse local string = { match = string.match, format = string.format } local tonumber = tonumber @@ -41,8 +41,8 @@ function fs.show(seconds, options, scr) local cmd = (options and string.format("dfs %s", options)) or "dfs" local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "") - if fs.followmouse then - fs.notification_preset.screen = mouse.screen + if fs.followtag then + fs.notification_preset.screen = focused() elseif scr then fs.notification_preset.screen = scr end @@ -65,7 +65,7 @@ local function worker(args) local notify = args.notify or "on" local settings = args.settings or function() end - fs.followmouse = args.followmouse or false + fs.followta g = args.followtag or false fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal } fs.widget = wibox.widget.textbox('') @@ -94,11 +94,11 @@ local function worker(args) f:close() - fs_now.used = tonumber(fs_info[partition .. " used_p"]) or 0 fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0 fs_now.size_mb = tonumber(fs_info[partition .. " size_mb"]) or 0 fs_now.size_gb = tonumber(fs_info[partition .. " size_gb"]) or 0 - fs_now.used_mb = tonumber(fs_info[partition .. " used_mb"]) or 0 + fs_now.used = tonumber(fs_info[partition .. " used_p"]) or 0 + fs_now.used_mb = tonumber(fs_info[partition .. " used_mb"]) or 0 fs_now.used_gb = tonumber(fs_info[partition .. " used_gb"]) or 0 notification_preset = fs.notification_preset diff --git a/widgets/mpd.lua b/widgets/mpd.lua index 5a4e534..3e2eaf5 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -11,6 +11,7 @@ local helpers = require("lain.helpers") local async = require("lain.asyncshell") local escape_f = require("awful.util").escape +local focused = require("awful.screen").focused local naughty = require("naughty") local wibox = require("wibox") @@ -118,7 +119,7 @@ local function worker(args) end if followtag then - mpd_notification_preset.screen = awful.screen.focused() + mpd_notification_preset.screen = focused() end mpd.id = naughty.notify({ diff --git a/wiki b/wiki index ad794d1..42ecadb 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit ad794d1fea2d2d8082d62e75997329e66276ebfb +Subproject commit 42ecadbcd535153aa7229b8afed660a3bd349b78