fix load order in rc.lua for overrides and fix override w/ theme changes

2 files changed, 15 insertions, 17 deletions

diff --git a/hosts/libreX60.lua b/hosts/libreX60.lua
index dc146e8..af69c6a 100644
--- a/hosts/libreX60.lua
+++ b/hosts/libreX60.lua
@@ -1,11 +1,11 @@
-local wibox = require("wibox")
-local bar_widgets = require("bar")
 local beautiful = require("beautiful")
 
-bar_widgets.textclock.format = "%a, %b %-e, %-H:%M"
-bar_widgets.temp.file = "/sys/class/thermal/thermal_zone0/temp"
-
 beautiful.font_mono = "Tamzen 8"
 beautiful.font_mono_bold = "Tamzen, bold 8"
 beautiful.font = beautiful.font_mono
 beautiful.font_sans = beautiful.font_mono
+
+local bar_widgets = require("bar")
+
+bar_widgets.textclock.format = "%a, %b %-e, %-H:%M"
+bar_widgets.temp.file = "/sys/class/thermal/thermal_zone0/temp"
diff --git a/rc.lua b/rc.lua
index c447419..eba40d6 100644
--- a/rc.lua
+++ b/rc.lua
@@ -11,20 +11,18 @@ osname = uname_i()
 hostname = uname_i()
 
 -- import modules
-require("awful.autofocus") -- focus when moving between tags etc.
+require("theme") -- load first
+require("layouts") -- load before bar
+pcall(require, "hosts." .. hostname) -- call override module if one exists
+require("keybindings")
+require("buttons")
+require("bar")
+require("rules")
 require("lib.errors")
 require("lib.manage")
 require("lib.screen")
-require("layouts")
-require("theme") -- load before bar
-require("buttons") -- load before bar & rules
-require("bar")
-require("keybindings")
-require("rules")
-require("func.noborders")
+require("awful.autofocus") -- focus when moving between tags etc.
+require("func.noborders") -- no border on
 require("func.sloppyfocus")
---require("func.warpcursor")
 require("func.tagnames")
-
--- call override module if exists
-pcall(function() require("hosts." .. hostname) end)
+--require("func.warpcursor")