Changed config loading

master
Mark 2023-08-21 16:07:59 -07:00
parent 37735ae085
commit eccf6c17b4
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
2 changed files with 10 additions and 9 deletions

View File

@ -1,5 +1,3 @@
local config = {}
-- Copy this file to `config.lua` before starting awesome. -- Copy this file to `config.lua` before starting awesome.
-- To enable a module, add a line like the ones below. -- To enable a module, add a line like the ones below.
@ -179,8 +177,3 @@ config.ibus = {
} }
} }
} }
return config

10
rc.lua
View File

@ -23,7 +23,15 @@ debug_message = function(msg)
end end
-- Order matters. -- Order matters.
config = require("config") conf_env = os.getenv("AWESOMEWM_CONFIG")
config = {}
if (conf_env == nil) then
-- Default location: in this directory
dofile(conf_dir .. "/config.lua")
else
dofile(conf_env)
end
beautiful.init(require("theme")) beautiful.init(require("theme"))