Change more modules from global to local

config/awesome/apps.lua

@@ -5,11 +5,12 @@ local naughty = require("naughty")
 local beautiful = require("beautiful")
 local helpers = require("helpers")
 local icons = require("icons")
+local notifications = require("notifications")
 
-apps = {}
+local apps = {}
 
 apps.browser = function ()
-    awful.spawn(user.browser, {switchtotag = true})
+    awful.spawn(user.browser, { switchtotag = true })
 end
 apps.file_manager = function ()
     awful.spawn(user.file_manager, { floating = true })
@@ -124,3 +125,5 @@ end
 apps.scratchpad = function()
     helpers.scratchpad({instance = "scratchpad"}, "scratchpad", nil)
 end
+
+return apps

config/awesome/decorations/init.lua

@@ -7,7 +7,7 @@ local wibox = require("wibox")
 -- Disable popup tooltip on titlebar button hover
 awful.titlebar.enable_tooltip = false
 
-decorations = {}
+local decorations = {}
 
 -- >> Default decoration management functions
 -- Can be overrided by the selected decoration theme when the titlebar
@@ -27,19 +27,10 @@ function decorations.cycle(c)
     awful.titlebar.toggle(c, beautiful.titlebar_position)
 end
 
--- TODO (work in progress)
--- Custom decorations for specific clients
-require("decorations.mpd")
-
--- Load theme
-function decorations.init(theme_name)
-    require("decorations.themes." .. theme_name)
-end
-
 -- Helper function to be used by decoration themes to enable client rounding
 function decorations.enable_rounding()
     -- Apply rounded corners to clients if needed
-    if beautiful.border_radius > 0 then
+    if beautiful.border_radius and beautiful.border_radius > 0 then
         client.connect_signal("manage", function (c, startup)
             if not c.fullscreen and not c.maximized then
                 c.shape = helpers.rrect(beautiful.border_radius)
@@ -141,8 +132,6 @@ decorations.button = function (c, shape, color, unfocused_color, hover_color, si
     return button_widget
 end
 
-
-
 -- Generates a button from a text symbol
 decorations.text_button = function (c, symbol, font, color, unfocused_color, hover_color, size, margin, cmd)
     local button = wibox.widget {
@@ -193,3 +182,13 @@ decorations.text_button = function (c, symbol, font, color, unfocused_color, hov
     return button
 end
 
+-- Load theme and custom decorations
+function decorations.init(theme_name)
+    require("decorations.themes." .. theme_name)
+
+    -- TODO (work in progress)
+    -- Custom decorations for specific clients
+    require("decorations.mpd")
+end
+
+return decorations

config/awesome/decorations/mpd.lua

@@ -2,6 +2,7 @@ local gears = require("gears")
 local awful = require("awful")
 local wibox = require("wibox")
 local helpers = require("helpers")
+local notifications = require("notifications")
 
 local create_little_circle = function(color)
     return wibox.widget {

config/awesome/decorations/themes/amarena.lua

@@ -4,6 +4,7 @@ local wibox = require("wibox")
 local beautiful = require("beautiful")
 local helpers = require("helpers")
 local keys = require("keys")
+local decorations = require("decorations")
 
 -- This decoration theme will round clients according to your theme's
 -- border_radius value

config/awesome/decorations/themes/ephemeral.lua

@@ -4,6 +4,7 @@ local beautiful = require("beautiful")
 local wibox = require("wibox")
 local keys = require("keys")
 local helpers = require("helpers")
+local decorations = require("decorations")
 
 -- >> Anti-aliasing <<
 -- ------------------

config/awesome/decorations/themes/lovelace.lua

@@ -4,6 +4,7 @@ local wibox = require("wibox")
 local beautiful = require("beautiful")
 local helpers = require("helpers")
 local keys = require("keys")
+local decorations = require("decorations")
 
 -- This decoration theme will round clients according to your theme's
 -- border_radius value

config/awesome/decorations/themes/skyfall.lua

@@ -4,6 +4,7 @@ local wibox = require("wibox")
 local beautiful = require("beautiful")
 local helpers = require("helpers")
 local keys = require("keys")
+local decorations = require("decorations")
 
 -- This decoration theme will round clients according to your theme's
 -- border_radius value

config/awesome/elemental/app_drawer.lua

@@ -2,6 +2,7 @@ local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
 local beautiful = require("beautiful")
+local apps = require("apps")
 -- local naughty = require("naughty")
 
 local helpers = require("helpers")

config/awesome/elemental/bar/ephemeral.lua

@@ -2,6 +2,7 @@ local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
 local beautiful = require("beautiful")
+local apps = require("apps")
 
 local keys = require("keys")
 local helpers = require("helpers")

config/awesome/elemental/bar/lovelace.lua

@@ -2,6 +2,7 @@ local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
 local beautiful = require("beautiful")
+local apps = require("apps")
 local icons = require("icons")
 
 local helpers = require("helpers")

config/awesome/elemental/dashboard/skyfall.lua

@@ -4,6 +4,7 @@ local wibox = require("wibox")
 local beautiful = require("beautiful")
 local naughty = require("naughty")
 local helpers = require("helpers")
+local apps = require("apps")
 local icons = require("icons")
 
 local keygrabber = require("awful.keygrabber")

config/awesome/elemental/sidebar/amarena.lua

@@ -2,6 +2,7 @@ local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
 local beautiful = require("beautiful")
+local apps = require("apps")
 
 local helpers = require("helpers")
 

config/awesome/elemental/sidebar/lovelace.lua

@@ -3,6 +3,7 @@ local gears = require("gears")
 local wibox = require("wibox")
 local beautiful = require("beautiful")
 local icons = require("icons")
+local apps = require("apps")
 
 local helpers = require("helpers")
 

config/awesome/keys.lua

@@ -2,6 +2,8 @@ local awful = require("awful")
 local naughty = require("naughty")
 local gears = require("gears")
 local beautiful = require("beautiful")
+local apps = require("apps")
+local decorations = require("decorations")
 
 local helpers = require("helpers")
 

config/awesome/noodle/desktop_mode_widget.lua

@@ -2,6 +2,7 @@ local awful = require("awful")
 local gears = require("gears")
 local beautiful = require("beautiful")
 local wibox = require("wibox")
+local decorations = require("decorations")
 
 -- Get theme variables
 local floating_color = beautiful.desktop_mode_color_floating or "#1D8CD2"

config/awesome/notifications/battery.lua

@@ -1,6 +1,7 @@
 local naughty = require("naughty")
 local helpers = require("helpers")
 local icons = require("icons")
+local notifications = require("notifications")
 
 -- Helper variables
 local charger_first_time = true

config/awesome/notifications/brightness.lua

@@ -1,5 +1,6 @@
 local naughty = require("naughty")
 local icons = require("icons")
+local notifications = require("notifications")
 
 local notif
 local first_time = true

config/awesome/notifications/init.lua

@@ -3,7 +3,8 @@ local naughty = require("naughty")
 local helpers = require("helpers")
 local menubar = require("menubar")
 
-notifications = {}
+-- notifications = {}
+local notifications = {}
 
 -- Notification settings
 -- Icon size
@@ -76,6 +77,12 @@ function notifications.notify_dwim(args, notif)
 end
 
 function notifications.init(theme_name)
+    -- Initialize various notification daemons
+    require("notifications.volume")
+    require("notifications.brightness")
+    require("notifications.battery")
+    require("notifications.mpd")
+    require("notifications.league_of_legends")
     -- Load theme
     require("notifications.themes." .. theme_name)
 end
@@ -99,9 +106,4 @@ naughty.connect_signal("request::action_icon", function(a, context, hints)
     a.icon = menubar.utils.lookup_icon(hints.id)
 end)
 
--- Initialize various notification daemons
-require("notifications.volume")
-require("notifications.brightness")
-require("notifications.battery")
-require("notifications.mpd")
-require("notifications.league_of_legends")
+return notifications

config/awesome/notifications/league_of_legends.lua

@@ -2,6 +2,7 @@ local awful = require("awful")
 local naughty = require("naughty")
 local helpers = require("helpers")
 local icons = require("icons")
+local notifications = require("notifications")
 
 local jump_to_client = naughty.action { name = "Jump to client" }
 

config/awesome/notifications/mpd.lua

@@ -1,5 +1,6 @@
 local naughty = require("naughty")
 local icons = require("icons")
+local notifications = require("notifications")
 
 notifications.mpd = {}
 

config/awesome/notifications/volume.lua

@@ -1,5 +1,6 @@
 local naughty = require("naughty")
 local icons = require("icons")
+local notifications = require("notifications")
 
 local notif
 local timeout = 1.5

config/awesome/rc.lua

@@ -168,19 +168,17 @@ x = {
     color15    = xrdb.color15    or "#BEBEC1",
 }
 
--- Themes define colours, icons, fonts, window decorations and wallpapers
-local theme_dir = os.getenv("HOME") .. "/.config/awesome/themes/" .. theme .. "/"
-beautiful.init(theme_dir .. "theme.lua")
--- require(theme_dir .. "decorations.lua")
---beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
-
+-- Load AwesomeWM libraries
 local gears = require("gears")
 local awful = require("awful")
 require("awful.autofocus")
-
 -- Default notification library
 local naughty = require("naughty")
 
+-- Load theme
+local theme_dir = os.getenv("HOME") .. "/.config/awesome/themes/" .. theme .. "/"
+beautiful.init(theme_dir .. "theme.lua")
+
 -- Error handling
 -- ===================================================================
 naughty.connect_signal("request::display_error", function(message, startup)
@@ -196,18 +194,16 @@ end)
 -- Initialize global icons variable and load icon theme
 local icons = require("icons")
 icons.init(icon_theme)
--- Load helper functions
-local helpers = require("helpers")
--- Initialize global app launching/focusing functions
-require("apps")
 -- Keybinds and mousebinds
 local keys = require("keys")
--- Notifications
-require("notifications")
+-- Load notification daemons and notification theme
+local notifications = require("notifications")
 notifications.init(notification_theme)
--- Window decorations
-require("decorations")
+-- Load window decoration theme and custom decorations
+local decorations = require("decorations")
 decorations.init(decoration_theme)
+-- Load helper functions
+local helpers = require("helpers")
 
 -- >> Elements - Desktop components
 -- Statusbar(s)