From 34e4fd15903c67d46dd09d5072d3caf0713bac4d Mon Sep 17 00:00:00 2001 From: Alexandre Viau Date: Sun, 11 May 2014 20:34:01 -0400 Subject: [PATCH] Moved variables to ./settings/variables.lua --- rc.lua.blackburn | 14 ++------------ rc.lua.copland | 14 ++------------ rc.lua.dremora | 14 ++------------ rc.lua.holo | 13 ++----------- rc.lua.multicolor | 13 ++----------- rc.lua.powerarrow-darker | 13 ++----------- rc.lua.rainbow | 14 ++------------ rc.lua.steamburn | 14 ++------------ settings/variables.lua | 12 ++++++++++++ 9 files changed, 28 insertions(+), 93 deletions(-) create mode 100644 settings/variables.lua diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 0cf7ac8..4815a65 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -29,18 +29,8 @@ os.setlocale(os.getenv("LANG")) -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/blackburn/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor - --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" +-- variables +require("settings.variables") layouts = { awful.layout.suit.floating, diff --git a/rc.lua.copland b/rc.lua.copland index 4896f60..6eb4e15 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -30,18 +30,8 @@ os.setlocale(os.getenv("LANG")) -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/copland/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor - --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" +-- variables +require("settings.variables") -- lain lain.layout.termfair.nmaster = 3 diff --git a/rc.lua.dremora b/rc.lua.dremora index d4d5845..494c8bc 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -29,18 +29,8 @@ require("settings.startup") -- beautiful init beautiful.init(awful.util.getdir("config") .. "/themes/dremora/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor - --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" +-- variables +require("settings.variables") layouts = { awful.layout.suit.floating, diff --git a/rc.lua.holo b/rc.lua.holo index efc13a4..fe8efc6 100644 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -29,18 +29,9 @@ require("settings.startup") -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/holo/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor +-- variables +require("settings.variables") --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" musiplr = terminal .. " -e ncmpcpp " layouts = { diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 698b1cb..1e946a8 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -29,18 +29,9 @@ os.setlocale(os.getenv("LANG")) -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/multicolor/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor +-- variables +require("settings.variables") --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" mail = terminal .. " -e mutt " layouts = { diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index cd231cb..e0c40af 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -29,18 +29,9 @@ os.setlocale(os.getenv("LANG")) -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-darker/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor +-- variables +require("settings.variables") --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" mail = terminal .. " -e mutt " iptraf = terminal .. " -g 180x54-20+34 -e sudo iptraf-ng -i all " musicplr = terminal .. " -g 130x34-320+16 -e ncmpcpp " diff --git a/rc.lua.rainbow b/rc.lua.rainbow index 01acbf4..b383cfb 100644 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -29,18 +29,8 @@ os.setlocale(os.getenv("LANG")) -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/rainbow/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor - --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" +-- variables +require("settings.variables") -- lain lain.layout.termfair.nmaster = 3 diff --git a/rc.lua.steamburn b/rc.lua.steamburn index 221859c..e587420 100644 --- a/rc.lua.steamburn +++ b/rc.lua.steamburn @@ -29,18 +29,8 @@ os.setlocale(os.getenv("LANG")) -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/steamburn/theme.lua") --- common -modkey = "Mod4" -altkey = "Mod1" -terminal = "urxvtc" or "xterm" -editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor - --- user defined -browser = "dwb" -browser2 = "iron" -gui_editor = "gvim" -graphics = "gimp" +-- variables +require("settings.variables") -- lain lain.layout.termfair.nmaster = 3 diff --git a/settings/variables.lua b/settings/variables.lua new file mode 100644 index 0000000..a5e1357 --- /dev/null +++ b/settings/variables.lua @@ -0,0 +1,12 @@ +-- common +modkey = "Mod4" +altkey = "Mod1" +terminal = "urxvtc" or "xterm" +editor = os.getenv("EDITOR") or "nano" or "vi" +editor_cmd = terminal .. " -e " .. editor + +-- user defined +browser = "dwb" +browser2 = "iron" +gui_editor = "gvim" +graphics = "gimp"