lain.widgets -> lain.widget

diff --git a/README.rst b/README.rst
index d9e78b24d774321e55ce811edfafd038b9355650..e3cc5d497e76ef59c9bca017a7a4956b7d2a13cd 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,7 @@ Just make sure that:
 
 - You eventually update ``wiki`` submodule with a thorough section.
 
 
 - You eventually update ``wiki`` submodule with a thorough section.
 

-Contributed widgets have to be put in ``lain/widgets/contrib``.
+Contributed widgets have to be put in ``widget/contrib``.

 
 Screenshots
 -----------
 
 Screenshots
 -----------

diff --git a/init.lua b/init.lua
index 5640861cde7050353acaf418e2918d5bc15be1fa..46ab825e370fd50a52dcf70a0481a56c35b0689f 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -10,7 +10,7 @@
 --]]
 
 return {
 --]]
 
 return {

-    layout  = require("lain.layout"),
-    util    = require("lain.util"),
-    widgets = require("lain.widgets")
+    layout = require("lain.layout"),
+    util   = require("lain.util"),
+    widget = require("lain.widget")

 }
 }

diff --git a/widgets/alsa.lua b/widget/alsa.lua
similarity index 98%
rename from widgets/alsa.lua
rename to widget/alsa.lua
index f73194b2a6c9b23dfc35394ed48864fd856e3dad..9406e0d64fb3e716401a2ccb66be1798a2831d87 100644 (file)
--- a/widgets/alsa.lua
+++ b/widget/alsa.lua
@@ -15,7 +15,7 @@ local string       = { match  = string.match,
 local setmetatable = setmetatable
 
 -- ALSA volume
 local setmetatable = setmetatable
 
 -- ALSA volume

--- lain.widgets.alsa
+-- lain.widget.alsa

 
 local function worker(args)
     local alsa     = { widget = wibox.widget.textbox() }
 
 local function worker(args)
     local alsa     = { widget = wibox.widget.textbox() }

diff --git a/widgets/alsabar.lua b/widget/alsabar.lua
similarity index 99%
rename from widgets/alsabar.lua
rename to widget/alsabar.lua
index 628e8386fd527ccec7729cd9d08943116a7ddac4..4386d20b3ece454e52dd3742ccc29f620a51e3a3 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widget/alsabar.lua
@@ -20,7 +20,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- ALSA volume bar
 local setmetatable = setmetatable
 
 -- ALSA volume bar

--- lain.widgets.alsabar
+-- lain.widget.alsabar

 local alsabar = {
     colors = {
         background = "#000000",
 local alsabar = {
     colors = {
         background = "#000000",

diff --git a/widgets/bat.lua b/widget/bat.lua
similarity index 99%
rename from widgets/bat.lua
rename to widget/bat.lua
index e479fd9b3413a1a38f6fe5d629cfbd2622a58c88..85d574efebf2cdd9c29f3cf5c87ca3c185832fd0 100644 (file)
--- a/widgets/bat.lua
+++ b/widget/bat.lua
@@ -22,7 +22,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Battery infos
 local setmetatable = setmetatable
 
 -- Battery infos

--- lain.widgets.bat
+-- lain.widget.bat

 
 local function worker(args)
     local bat       = { widget = wibox.widget.textbox() }
 
 local function worker(args)
     local bat       = { widget = wibox.widget.textbox() }

diff --git a/widgets/calendar.lua b/widget/calendar.lua
similarity index 99%
rename from widgets/calendar.lua
rename to widget/calendar.lua
index a02b13d62be442c63780037f18d39d046f8f959c..4a3d207ab14a6680d251ddc91740a09f56da4b8a 100644 (file)
--- a/widgets/calendar.lua
+++ b/widget/calendar.lua
@@ -18,7 +18,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Calendar notification
 local setmetatable = setmetatable
 
 -- Calendar notification

--- lain.widgets.calendar
+-- lain.widget.calendar

 local calendar = { offset = 0 }
 
 function calendar.hide()
 local calendar = { offset = 0 }
 
 function calendar.hide()

diff --git a/widgets/contrib/gpmdp.lua b/widget/contrib/gpmdp.lua
similarity index 100%
rename from widgets/contrib/gpmdp.lua
rename to widget/contrib/gpmdp.lua

diff --git a/widgets/contrib/init.lua b/widget/contrib/init.lua
similarity index 92%
rename from widgets/contrib/init.lua
rename to widget/contrib/init.lua
index eb5d610e79840ecc308b5f7be5f0a8e3ebeb0a2d..9d1e70306545151875d21c2ed5a81dc9810cd809 100644 (file)
--- a/widgets/contrib/init.lua
+++ b/widget/contrib/init.lua
@@ -14,6 +14,6 @@
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 

-local widgets = { _NAME = "lain.widgets.contrib" }
+local widgets = { _NAME = "lain.widget.contrib" }

 
 return setmetatable(widgets, { __index = wrequire })
 
 return setmetatable(widgets, { __index = wrequire })

diff --git a/widgets/contrib/kbdlayout.lua b/widget/contrib/kbdlayout.lua
similarity index 98%
rename from widgets/contrib/kbdlayout.lua
rename to widget/contrib/kbdlayout.lua
index 08e7bd06a3002f013712a42af88c5e99efa74b2d..176f73a577473d4ae5bf4c35e9bc26b6797a0fa6 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widget/contrib/kbdlayout.lua
@@ -15,7 +15,7 @@ local execute      = os.execute
 local setmetatable = setmetatable
 
 -- Keyboard layout switcher
 local setmetatable = setmetatable
 
 -- Keyboard layout switcher

--- lain.widgets.contrib.kblayout
+-- lain.widget.contrib.kblayout

 local kbdlayout = {}
 
 local function worker(args)
 local kbdlayout = {}
 
 local function worker(args)

diff --git a/widgets/contrib/moc.lua b/widget/contrib/moc.lua
similarity index 99%
rename from widgets/contrib/moc.lua
rename to widget/contrib/moc.lua
index 6fe96a15d994ec3368c909cb0a76171885af2385..fda50fc3f79b7db635b3b47d5be533ac55c1c007 100644 (file)
--- a/widgets/contrib/moc.lua
+++ b/widget/contrib/moc.lua
@@ -18,7 +18,7 @@ local string       = { format = string.format,
 local setmetatable = setmetatable
 
 -- MOC audio player
 local setmetatable = setmetatable
 
 -- MOC audio player

--- lain.widgets.contrib.moc
+-- lain.widget.contrib.moc

 local moc = {}
 
 local function worker(args)
 local moc = {}
 
 local function worker(args)

diff --git a/widgets/contrib/redshift.lua b/widget/contrib/redshift.lua
similarity index 98%
rename from widgets/contrib/redshift.lua
rename to widget/contrib/redshift.lua
index 73cc100773197f17089116c2bdd5aac78c7fcefb..0babb3abe5227a1267292c88ab65ae5b5efd4864 100644 (file)
--- a/widgets/contrib/redshift.lua
+++ b/widget/contrib/redshift.lua
@@ -12,7 +12,7 @@ local execute = os.execute
 local type    = type
 
 -- Redshift
 local type    = type
 
 -- Redshift

--- lain.widgets.contrib.redshift
+-- lain.widget.contrib.redshift

 local redshift = { active = false, pid = nil }
 
 function redshift:start()
 local redshift = { active = false, pid = nil }
 
 function redshift:start()

diff --git a/widgets/contrib/task.lua b/widget/contrib/task.lua
similarity index 98%
rename from widgets/contrib/task.lua
rename to widget/contrib/task.lua
index 4a9b5b6fc6f023e9a71e43eaf3072ab0056a7a76..ba795538647f1b711e32056e5e0fd88cc5e6383a 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widget/contrib/task.lua
@@ -13,7 +13,7 @@ local naughty = require("naughty")
 local string  = { format = string.format, gsub = string.gsub }
 
 -- Taskwarrior notification
 local string  = { format = string.format, gsub = string.gsub }
 
 -- Taskwarrior notification

--- lain.widgets.contrib.task
+-- lain.widget.contrib.task

 local task = {}
 
 function task.hide()
 local task = {}
 
 function task.hide()

diff --git a/widgets/contrib/tpbat/init.lua b/widget/contrib/tpbat/init.lua
similarity index 98%
rename from widgets/contrib/tpbat/init.lua
rename to widget/contrib/tpbat/init.lua
index 20a10f4140e6dbf61e250449e050a13c353d9411..49cc01acaa86b439e2c7fb695d2b2977255e245f 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widget/contrib/tpbat/init.lua
@@ -3,7 +3,7 @@
                                                                
      tpbat.lua                                                 
      Battery status widget for ThinkPad laptops that use SMAPI 
                                                                
      tpbat.lua                                                 
      Battery status widget for ThinkPad laptops that use SMAPI 

-     lain.widgets.contrib.tpbat                                
+     lain.widget.contrib.tpbat                                

                                                                
      More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi  
                                                                
                                                                
      More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi  
                                                                


@@ -27,7 +27,7 @@ package.path       = debug.getinfo(1,"S").source:match[[^@?(.*[\/])[^\/]-$]] ..
 local smapi        = require("smapi")
 
 -- ThinkPad SMAPI-enabled battery info widget
 local smapi        = require("smapi")
 
 -- ThinkPad SMAPI-enabled battery info widget

--- lain.widgets.contrib.tpbat
+-- lain.widget.contrib.tpbat

 local tpbat = {}
 
 function tpbat.hide()
 local tpbat = {}
 
 function tpbat.hide()

diff --git a/widgets/contrib/tpbat/smapi.lua b/widget/contrib/tpbat/smapi.lua
similarity index 100%
rename from widgets/contrib/tpbat/smapi.lua
rename to widget/contrib/tpbat/smapi.lua

diff --git a/widgets/cpu.lua b/widget/cpu.lua
similarity index 99%
rename from widgets/cpu.lua
rename to widget/cpu.lua
index 076b692c80279aac98b6035e8f5b74537d7f708d..3e3b3a3c973802d9bd16443a9e7706ee770bbe0d 100644 (file)
--- a/widgets/cpu.lua
+++ b/widget/cpu.lua
@@ -16,7 +16,7 @@ local tostring     = tostring
 local setmetatable = setmetatable
 
 -- CPU usage
 local setmetatable = setmetatable
 
 -- CPU usage

--- lain.widgets.cpu
+-- lain.widget.cpu

 local cpu = { core = {} }
 
 local function worker(args)
 local cpu = { core = {} }
 
 local function worker(args)

diff --git a/widgets/fs.lua b/widget/fs.lua
similarity index 99%
rename from widgets/fs.lua
rename to widget/fs.lua
index ec87191766fbf79315944d92154a11d2ac2f277e..652fa8ab38579411664170237094bb8a741ee495 100644 (file)
--- a/widgets/fs.lua
+++ b/widget/fs.lua
@@ -19,7 +19,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- File system disk space usage
 local setmetatable = setmetatable
 
 -- File system disk space usage

--- lain.widgets.fs
+-- lain.widget.fs

 local fs = { unit  = { ["mb"] = 1024, ["gb"] = 1024^2 } }
 
 function fs.hide()
 local fs = { unit  = { ["mb"] = 1024, ["gb"] = 1024^2 } }
 
 function fs.hide()

diff --git a/widgets/imap.lua b/widget/imap.lua
similarity index 99%
rename from widgets/imap.lua
rename to widget/imap.lua
index 95d35fd0401617348b2ceb2b0a18e7e5516bcaa9..1049d03e2112c212d9a854d48a1754e80c62a50c 100644 (file)
--- a/widgets/imap.lua
+++ b/widget/imap.lua
@@ -16,7 +16,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 local setmetatable = setmetatable
 
 -- Mail IMAP check

--- lain.widgets.imap
+-- lain.widget.imap

 
 local function worker(args)
     local imap      = { widget = wibox.widget.textbox() }
 
 local function worker(args)
     local imap      = { widget = wibox.widget.textbox() }

diff --git a/widgets/init.lua b/widget/init.lua
similarity index 94%
rename from widgets/init.lua
rename to widget/init.lua
index 0e863bacdbddb8e22ecbaddf64ab6bef5d0ba64d..9619d795d539911cae24921fd4777938b1d4d481 100644 (file)
--- a/widgets/init.lua
+++ b/widget/init.lua
@@ -15,6 +15,6 @@
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 

-local widgets = { _NAME = "lain.widgets" }
+local widgets = { _NAME = "lain.widget" }

 
 return setmetatable(widgets, { __index = wrequire })
 
 return setmetatable(widgets, { __index = wrequire })

diff --git a/widgets/mem.lua b/widget/mem.lua
similarity index 98%
rename from widgets/mem.lua
rename to widget/mem.lua
index 7b717ef7aca05e7e016b9fd5c3170017f10db9e2..74ebad01a5132f3a5c18640b7f91848675477da7 100644 (file)
--- a/widgets/mem.lua
+++ b/widget/mem.lua
@@ -15,7 +15,7 @@ local floor        = math.floor
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)

--- lain.widgets.mem
+-- lain.widget.mem

 local mem = {}
 
 local function worker(args)
 local mem = {}
 
 local function worker(args)

diff --git a/widgets/mpd.lua b/widget/mpd.lua
similarity index 99%
rename from widgets/mpd.lua
rename to widget/mpd.lua
index ddedf243a9f3176f47d0620668528c9e3c01e17d..b5281b0f2f6fc6b2d48ed6bb81a03ac7c8d88261 100644 (file)
--- a/widgets/mpd.lua
+++ b/widget/mpd.lua
@@ -20,7 +20,7 @@ local string       = { format = string.format,
 local setmetatable = setmetatable
 
 -- MPD infos
 local setmetatable = setmetatable
 
 -- MPD infos

--- lain.widgets.mpd
+-- lain.widget.mpd

 local mpd = {}
 
 local function worker(args)
 local mpd = {}
 
 local function worker(args)

diff --git a/widgets/net.lua b/widget/net.lua
similarity index 99%
rename from widgets/net.lua
rename to widget/net.lua
index 223f3aff15f409e8518727c54a7d4475ce5d9a65..c6ebaca9d5a9616b9da71e5fb4d489a04bddb206 100644 (file)
--- a/widgets/net.lua
+++ b/widget/net.lua
@@ -15,7 +15,7 @@ local string       = { format = string.format,
 local setmetatable = setmetatable
 
 -- Network infos
 local setmetatable = setmetatable
 
 -- Network infos

--- lain.widgets.net
+-- lain.widget.net

 
 local function worker(args)
     local net = { widget = wibox.widget.textbox() }
 
 local function worker(args)
     local net = { widget = wibox.widget.textbox() }

diff --git a/widgets/pulseaudio.lua b/widget/pulseaudio.lua
similarity index 98%
rename from widgets/pulseaudio.lua
rename to widget/pulseaudio.lua
index 05ef337deb8dbe350d6d625f559a6b9d15d3e940..44694d1773449dcd546fdd416c313a4315947c09 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widget/pulseaudio.lua
@@ -15,7 +15,7 @@ local string       = { gmatch = string.gmatch,
 local setmetatable = setmetatable
 
 -- PulseAudio volume
 local setmetatable = setmetatable
 
 -- PulseAudio volume

--- lain.widgets.pulseaudio
+-- lain.widget.pulseaudio

 
 local function worker(args)
     local pulseaudio = { widget = wibox.widget.textbox() }
 
 local function worker(args)
     local pulseaudio = { widget = wibox.widget.textbox() }

diff --git a/widgets/pulsebar.lua b/widget/pulsebar.lua
similarity index 99%
rename from widgets/pulsebar.lua
rename to widget/pulsebar.lua
index c75ad4a4901a9e99c447e6836938d6662a07f357..fede5ba67bc5cf8a9020c625447612b10c94f615 100644 (file)
--- a/widgets/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -21,7 +21,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Pulseaudio volume bar
 local setmetatable = setmetatable
 
 -- Pulseaudio volume bar

--- lain.widgets.pulsebar
+-- lain.widget.pulsebar

 local pulsebar = {
     colors = {
         background = "#000000",
 local pulsebar = {
     colors = {
         background = "#000000",

diff --git a/widgets/sysload.lua b/widget/sysload.lua
similarity index 97%
rename from widgets/sysload.lua
rename to widget/sysload.lua
index df9dbea06bfeb265febeab5ba015cce3c15833c9..ada349c82bf5899ba969621283ae559a1a423129 100644 (file)
--- a/widgets/sysload.lua
+++ b/widget/sysload.lua
@@ -14,7 +14,7 @@ local string       = { match  = string.match }
 local setmetatable = setmetatable
 
 -- System load
 local setmetatable = setmetatable
 
 -- System load

--- lain.widgets.sysload
+-- lain.widget.sysload

 local sysload = {}
 
 local function worker(args)
 local sysload = {}
 
 local function worker(args)

diff --git a/widgets/temp.lua b/widget/temp.lua
similarity index 98%
rename from widgets/temp.lua
rename to widget/temp.lua
index 1c7e86c92de8e3074eece379457d427ebb1093e0..b66234603b82ce0576eebb58dff44c9606aa89a7 100644 (file)
--- a/widgets/temp.lua
+++ b/widget/temp.lua
@@ -13,7 +13,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- coretemp
 local setmetatable = setmetatable
 
 -- coretemp

--- lain.widgets.temp
+-- lain.widget.temp

 local temp = {}
 
 local function worker(args)
 local temp = {}
 
 local function worker(args)

diff --git a/widgets/watch.lua b/widget/watch.lua
similarity index 98%
rename from widgets/watch.lua
rename to widget/watch.lua
index abca92b62ad4ed07b29323052e3133b9087159e9..55226b92cb20e43f762a5378d9891246ba52459a 100644 (file)
--- a/widgets/watch.lua
+++ b/widget/watch.lua
@@ -11,7 +11,7 @@ local textbox      = require("wibox.widget.textbox")
 local setmetatable = setmetatable
 
 -- Template for asynchronous watcher widgets
 local setmetatable = setmetatable
 
 -- Template for asynchronous watcher widgets

--- lain.widgets.watch
+-- lain.widget.watch

 
 local function worker(args)
     local watch     = {}
 
 local function worker(args)
     local watch     = {}

diff --git a/widgets/weather.lua b/widget/weather.lua
similarity index 99%
rename from widgets/weather.lua
rename to widget/weather.lua
index 9e1b80ef1e27fd7cb6bb68cfbe67025c711b1202..1b2e80f9f6051aa4e3a524666627de3359d68bfd 100644 (file)
--- a/widgets/weather.lua
+++ b/widget/weather.lua
@@ -22,7 +22,7 @@ local setmetatable = setmetatable
 
 -- OpenWeatherMap
 -- current weather and X-days forecast
 
 -- OpenWeatherMap
 -- current weather and X-days forecast

--- lain.widgets.weather
+-- lain.widget.weather

 
 local function worker(args)
     local weather               = { widget = wibox.widget.textbox() }
 
 local function worker(args)
     local weather               = { widget = wibox.widget.textbox() }

diff --git a/wiki b/wiki
index 32904a7e2cc20b9aec497aa9a031324fc535b0f9..d3b29e25c4d47a5988948d2f9432d9353c826c2a 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 32904a7e2cc20b9aec497aa9a031324fc535b0f9
+Subproject commit d3b29e25c4d47a5988948d2f9432d9353c826c2a