awesome: load theme from env variable

[dotfiles.git] / awesome / rc.lua

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 6ce193595f7cb280d0c77da1f83ff7dc1099dce3..6e139d30f38c165b1f69245d56333fa48caa0f9c 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -34,7 +34,14 @@ end
 
 -- Variable definitions {{{1
 -- Themes define colours, icons, font and wallpapers.
 
 -- Variable definitions {{{1
 -- Themes define colours, icons, font and wallpapers.

-beautiful.init(gears.filesystem.get_dir("config").."/themes/mlp/theme.lua")
+local gfs = require("gears.filesystem")
+local theme = os.getenv("THEME")
+local theme_path = gfs.get_dir("config").."/themes/"..theme.."/theme.lua"
+
+if not beautiful.init(theme_path) then
+    -- we failed to load the theme, load default instead
+    beautiful.init(gfs.get_themes_dir() .. "default/theme.lua")
+end

 
 -- This is used later as the default terminal to run.
 terminal = os.getenv("TERMINAL") or "xterm"
 
 -- This is used later as the default terminal to run.
 terminal = os.getenv("TERMINAL") or "xterm"