first commit

Author: luke bonham

README.md

@@ -448,6 +448,9 @@ windows are opened! Thus, I suggest you use
 	    -- ...
 	)
 
+--> If you do this, you might want to change Standard program section (modkey
+-> altkey) 
+
 Useless gaps
 ------------
 

vain/init.lua init.lua

@@ -1,15 +1,16 @@
 -- Grab environment.
-local ipairs = ipairs
-local tonumber = tonumber
-local beautiful = beautiful
-local awful = awful
-local math = math
+local awful     = require("awful")
+local beautiful = require("beautiful")
+local ipairs    = ipairs
+local tonumber  = tonumber
+local math      = math
 
 module("vain.layout.browse")
 
 extra_padding = 0
 
 name = "browse"
+
 function arrange(p)
 
     -- Layout with one fixed column meant for the browser window. Its
@@ -26,7 +27,7 @@ function arrange(p)
     --   +-----+---+      +-----+---+      +-----+---+      +-----+---+
 
     -- A useless gap (like the dwm patch) can be defined with
-    -- beautiful.useless_gap_width .
+    -- beautiful.useless_gap_width.
     local useless_gap = tonumber(beautiful.useless_gap_width)
     if useless_gap == nil
     then

vain/layout/browse.lua layout/browse.lua

@@ -1,12 +1,13 @@
 -- Grab environment.
-local awful = awful
+local awful = require("awful")
 
 module("vain.layout.cascade")
 
 cascade_offset_x = 32
 cascade_offset_y = 8
 
 name = "cascade"
+
 function arrange(p)
 
     -- Cascade windows, just like the cascade layout for gimp.

vain/layout/cascade.lua layout/cascade.lua

@@ -1,9 +1,9 @@
 -- Grab environment.
-local ipairs = ipairs
-local tonumber = tonumber
-local beautiful = beautiful
-local awful = awful
-local print = print
+local awful     = require("awful")
+local beautiful = require("beautiful")
+local ipairs    = ipairs
+local tonumber  = tonumber
+local print     = print
 
 module("vain.layout.cascadebrowse")
 
@@ -12,6 +12,7 @@ cascade_offset_y = 32
 extra_padding = 0
 
 name = "cascadebrowse"
+
 function arrange(p)
 
     -- Layout with one fixed column meant for the browser window. Its
@@ -32,7 +33,7 @@ function arrange(p)
     --   +-----+---+      +-----+---+      +-----+---+      +-----+---+
 
     -- A useless gap (like the dwm patch) can be defined with
-    -- beautiful.useless_gap_width .
+    -- beautiful.useless_gap_width.
     local useless_gap = tonumber(beautiful.useless_gap_width)
     if useless_gap == nil
     then

vain/layout/cascadebrowse.lua layout/cascadebrowse.lua

@@ -1,8 +1,8 @@
 -- Grab environment.
-local tonumber = tonumber
-local beautiful = beautiful
-local awful = awful
-local math = math
+local awful     = require("awful")
+local beautiful = require("beautiful")
+local tonumber  = tonumber
+local math      = math
 
 module("vain.layout.centerwork")
 

vain/layout/centerwork.lua layout/centerwork.lua

@@ -4,11 +4,11 @@
 
 
 -- Grab environment.
-local ipairs = ipairs
-local table = table
-local tonumber = tonumber
-local beautiful = beautiful
-local awful = awful
+local awful     = require("awful")
+local beautiful = require("beautiful")
+local ipairs    = ipairs
+local table     = table
+local tonumber  = tonumber
 
 module("vain.layout.gimp")
 

vain/layout/gimp.lua layout/gimp.lua

@@ -1,12 +1,13 @@
 -- Grab environment.
-local math = math
-local tonumber = tonumber
-local beautiful = beautiful
-local awful = awful
+local tag       = require("awful.tag")
+local beautiful = require("beautiful")
+local math      = math
+local tonumber  = tonumber
 
 module("vain.layout.termfair")
 
 name = "termfair"
+
 function arrange(p)
 
     -- Layout with fixed number of vertical columns (read from nmaster).
@@ -28,7 +29,7 @@ function arrange(p)
     --   +---+---+---+      +---+---+---+      +---+---+---+
 
     -- A useless gap (like the dwm patch) can be defined with
-    -- beautiful.useless_gap_width .
+    -- beautiful.useless_gap_width.
     local useless_gap = tonumber(beautiful.useless_gap_width)
     if useless_gap == nil
     then
@@ -40,14 +41,14 @@ function arrange(p)
     local cls = p.clients
 
     -- How many vertical columns? Read from nmaster on the tag.
-    local t = awful.tag.selected(p.screen)
-    local num_x = awful.tag.getnmaster(t)
+    local t = tag.selected(p.screen)
+    local num_x = tag.getnmaster(t)
 
     -- Do at least "desired_y" rows. Read this from ncol. (Yes, I use a
     -- *column* setting to set the number of *rows*. That's because
     -- num_x is the *master* setting -- it's the setting that's most
     -- important to me.)
-    local desired_y = awful.tag.getncol(t)
+    local desired_y = tag.getncol(t)
 
     if #cls > 0
     then

vain/layout/init.lua layout/init.lua

@@ -6,12 +6,11 @@
 ---------------------------------------------------------------------------
 
 -- Grab environment we need
-local ipairs = ipairs
-local math = math
-local beautiful = beautiful
-local tonumber = tonumber
+local beautiful = require("beautiful")
+local ipairs    = ipairs
+local math      = math
+local tonumber  = tonumber
 
---- Fair layouts module for awful / vain
 module("vain.layout.uselessfair")
 
 local function fair(p, orientation)