Merge cc2d713c20 into 23b7e4a8a9

freedesktop/init.lua

@@ -1,5 +0,0 @@
-require("freedesktop.utils")
-require("freedesktop.menu")
-require("freedesktop.desktop")
-
-module("freedesktop")

plugins/freedesktop/freedesktop.lua

@@ -7,7 +7,7 @@
 local awful     = require("awful")
 local beautiful = require("beautiful")
 
-require('freedesktop')
+require('plugins.freedesktop')
 -- require("debian.menu")
 
 freedesktop.utils.terminal   = terminal -- defined in rc.lua, otherwise define it here (default: "xterm")

plugins/freedesktop/init.lua

@@ -0,0 +1,5 @@
+require("plugins.freedesktop.utils")
+require("plugins.freedesktop.menu")
+require("plugins.freedesktop.desktop")
+
+module("freedesktop")

rc.lua.blackburn

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -101,7 +101,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.copland

@@ -13,9 +13,9 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
-local eminent   = require("eminent")
+local eminent   = require("plugins.eminent")
 -- }}}
 
 -- {{{ Error handling
@@ -112,7 +112,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.dremora

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -101,7 +101,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.holo

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -102,7 +102,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.multicolor

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -107,7 +107,7 @@ end
 -- }}}
 
 -- {{{ Freedesktop Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.powerarrow-darker

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -104,7 +104,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.rainbow

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -108,7 +108,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox

rc.lua.steamburn

@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -106,7 +106,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox