Move terminal setting to our config file

This commit is contained in:
Alice Gaudon 2019-07-23 15:36:39 +02:00
parent cabc1bf081
commit d65438528c
2 changed files with 7 additions and 6 deletions

View File

@ -5,6 +5,8 @@ local awful = require("awful")
local config = {} local config = {}
-- Terminal
config.terminal = "terminator"
-- Theme -- Theme
-- Change to gears.filesystem.get_themes_dir() .. "default/theme.lua" to use default awesome theme -- Change to gears.filesystem.get_themes_dir() .. "default/theme.lua" to use default awesome theme

11
rc.lua
View File

@ -57,9 +57,8 @@ end
beautiful.init(config.theme) beautiful.init(config.theme)
-- This is used later as the default terminal and editor to run. -- This is used later as the default terminal and editor to run.
terminal = "terminator"
editor = os.getenv("EDITOR") or "nano" editor = os.getenv("EDITOR") or "nano"
editor_cmd = terminal .. " -e " .. editor editor_cmd = config.terminal .. " -e " .. editor
-- Default modkey. -- Default modkey.
-- Usually, Mod4 is the key with a logo between Control and Alt. -- Usually, Mod4 is the key with a logo between Control and Alt.
@ -93,14 +92,14 @@ awful.layout.layouts = {
-- Create a launcher widget and a main menu -- Create a launcher widget and a main menu
myawesomemenu = { myawesomemenu = {
{ "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end }, { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
{ "manual", terminal .. " -e man awesome" }, { "manual", config.terminal .. " -e man awesome" },
{ "edit config", editor_cmd .. " " .. awesome.conffile }, { "edit config", editor_cmd .. " " .. awesome.conffile },
{ "restart", awesome.restart }, { "restart", awesome.restart },
{ "quit", function() awesome.quit() end }, { "quit", function() awesome.quit() end },
} }
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
{ "open terminal", terminal } { "open terminal", config.terminal }
} }
}) })
@ -108,7 +107,7 @@ mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
menu = mymainmenu }) menu = mymainmenu })
-- Menubar configuration -- Menubar configuration
menubar.utils.terminal = terminal -- Set the terminal for applications that require it menubar.utils.terminal = config.terminal -- Set the terminal for applications that require it
-- }}} -- }}}
-- Keyboard map indicator and switcher -- Keyboard map indicator and switcher
@ -297,7 +296,7 @@ globalkeys = gears.table.join(
{description = "go back", group = "client"}), {description = "go back", group = "client"}),
-- Standard program -- Standard program
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, awful.key({ modkey, }, "Return", function () awful.spawn(config.terminal) end,
{description = "open a terminal", group = "launcher"}), {description = "open a terminal", group = "launcher"}),
awful.key({ modkey, "Control" }, "r", awesome.restart, awful.key({ modkey, "Control" }, "r", awesome.restart,
{description = "reload awesome", group = "awesome"}), {description = "reload awesome", group = "awesome"}),