Changed config loading
parent
37735ae085
commit
eccf6c17b4
|
@ -1,5 +1,3 @@
|
|||
local config = {}
|
||||
|
||||
-- Copy this file to `config.lua` before starting awesome.
|
||||
|
||||
-- To enable a module, add a line like the ones below.
|
||||
|
@ -178,9 +176,4 @@ config.ibus = {
|
|||
ibus_engine = "xkb:ru::rus"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return config
|
||||
}
|
10
rc.lua
10
rc.lua
|
@ -23,7 +23,15 @@ debug_message = function(msg)
|
|||
end
|
||||
|
||||
-- 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"))
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue