overhaul awesome

1 files changed, 23 insertions, 13 deletions

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 1bcbaa8..50d85d7 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -1,20 +1,30 @@
--- Global variable definitions
+-- global variable definitions
 terminal = os.getenv("TERMINAL") or "xterm"
-editor = os.getenv("EDITOR") or "vi"
+editor   = os.getenv("EDITOR") or "vi"
 
--- Import modules
-require("errors")
+-- get results from uname
+local uname = io.popen("uname -sn")
+local uname_i = uname:read("*a"):gmatch("%g+")
+uname:close()
+
+osname = uname_i()
+hostname = uname_i()
+
+-- import modules
+require("lib.errors")
+require("lib.manage")
+require("lib.screen")
 require("layouts")
-require("theme")  -- Load before bar
+require("theme") -- load before bar
+require("mouse") -- load before bar & rules
 require("bar")
-require("screen")
-require("mouse")
 require("keybindings")
 require("rules")
-require("manage")
-require("noborders")
-require("warpcursor")
-require("sloppyfocus")
---require("tagnames")
-
+require("func.noborders")
+require("func.sloppyfocus")
+require("func.warpcursor")
+--require("func.tagnames")
 --require("widgets.audio")
+
+-- call override module if exists
+pcall(function() require("hosts." .. hostname) end)