From a24051ca1b717a22eecd11db8987790161fef58a Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sun, 24 Nov 2013 07:48:54 +0000 Subject: [PATCH] Use awful's getdir() to handle XDG_CONFIG_HOME --- rc.lua.blackburn | 4 ++-- themes/blackburn/theme.lua | 2 +- themes/copland/theme.lua | 2 +- themes/dremora/theme.lua | 2 +- themes/holo/theme.lua | 4 ++-- themes/multicolor/theme.lua | 2 +- themes/powerarrow-darker/theme.lua | 2 +- themes/rainbow/theme.lua | 2 +- themes/steamburn/theme.lua | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rc.lua.blackburn b/rc.lua.blackburn index a3711cf..0a16f74 100755 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -58,10 +58,10 @@ run_once("compton") os.setlocale(os.getenv("LANG")) -- home path -homedir = os.getenv("HOME") .. "/.config/awesome/" +homedir = awful.util.getdir("config") -- beautiful init -beautiful.init(awful.util.getdir("config") .. "/themes/blackburn/theme.lua") +beautiful.init(homedir .. "/themes/blackburn/theme.lua") -- common modkey = "Mod4" diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index c92de3a..1bf6f7a 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -7,7 +7,7 @@ theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/blackburn" +theme.dir = awful.util.getdir("config") .. "/themes/blackburn" theme.wallpaper = theme.dir .. "/wall.png" theme.topbar_path = "png:" .. theme.dir .. "/icons/topbar/" diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index b136710..1724de1 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -7,7 +7,7 @@ theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/copland" +theme.dir = awful.util.getdir("config") .. "/themes/copland" theme.wallpaper = theme.dir .. "/wall.png" theme.font = "Tamsyn 10.5" diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua index fa2c83b..a3279eb 100644 --- a/themes/dremora/theme.lua +++ b/themes/dremora/theme.lua @@ -7,7 +7,7 @@ theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/dremora" +theme.dir = awful.util.getdir("config") .. "/themes/dremora" theme.wallpaper = theme.dir .. "/wall.png" theme.font = "Tamsyn 10.5" diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index def2885..4d339a8 100644 --- a/themes/holo/theme.lua +++ b/themes/holo/theme.lua @@ -7,9 +7,9 @@ theme = {} -theme.icon_dir = os.getenv("HOME") .. "/.config/awesome/themes/holo/icons" +theme.icon_dir = awful.util.getdir("config") .. "/themes/holo/icons" -theme.wallpaper = os.getenv("HOME") .. "/.config/awesome/themes/holo/wall.png" +theme.wallpaper = theme.dir .. "/wall.png" theme.topbar_path = "png:" .. theme.icon_dir .. "/topbar/" diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index fa774a9..303db5e 100644 --- a/themes/multicolor/theme.lua +++ b/themes/multicolor/theme.lua @@ -8,7 +8,7 @@ theme = {} -theme.confdir = os.getenv("HOME") .. "/.config/awesome/themes/multicolor" +theme.confdir = awful.util.getdir("config") .. "/themes/multicolor" theme.wallpaper = theme.confdir .. "/wall.png" theme.font = "Terminus 8" diff --git a/themes/powerarrow-darker/theme.lua b/themes/powerarrow-darker/theme.lua index 7a65c61..e576f85 100644 --- a/themes/powerarrow-darker/theme.lua +++ b/themes/powerarrow-darker/theme.lua @@ -7,7 +7,7 @@ theme = {} -themes_dir = os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-darker" +themes_dir = awful.util.getdir("config") .. "/themes/powerarrow-darker" theme.wallpaper = themes_dir .. "/wall.png" theme.font = "Terminus 9" diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index fa2955d..38cc612 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -7,7 +7,7 @@ theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/rainbow" +theme.dir = awful.util.getdir("config") .. "/themes/rainbow" theme.wallpaper = theme.dir .. "/wall.png" theme.font = "Tamsyn 10.5" diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 4f4db01..808f1f6 100644 --- a/themes/steamburn/theme.lua +++ b/themes/steamburn/theme.lua @@ -7,7 +7,7 @@ theme = {} -themes_dir = os.getenv("HOME") .. "/.config/awesome/themes/steamburn" +themes_dir = awful.util.getdir("config") .. "/themes/steamburn" theme.wallpaper = themes_dir .. "/wall.png" theme.font = "Tamsyn 10.5"