awesome: use TERMINAL env as much as possible

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index dd3edff7e0958e4c25efd7cc83524c2e933f6e39..8d960099baa5797174b1e71f48919f83018c1582 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -1,4 +1,5 @@
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 local hotkeys_popup = require("awful.hotkeys_popup").widget

+local utils = require("utils")

 
 -- Default modkey.
 modkey = "Mod4"
 
 -- Default modkey.
 modkey = "Mod4"


@@ -124,7 +125,7 @@ globalkeys = gears.table.join(globalkeys,
     awful.key({        }, "F13",   function () awful.spawn("ksnapshot") end),
     awful.key({        }, "Print", function () awful.spawn("ksnapshot") end),
     -- ranger
     awful.key({        }, "F13",   function () awful.spawn("ksnapshot") end),
     awful.key({        }, "Print", function () awful.spawn("ksnapshot") end),
     -- ranger

-    awful.key({ modkey }, "r", function () awful.spawn(terminal .. " -e ranger") end),
+    awful.key({ modkey }, "r", function () utils.spawn_terminal("ranger") end),

     -- Volume
     awful.key({        }, "XF86AudioMute",        function () awful.spawn("pulsemixer --toggle-mute")     end,
               {description = "toggle mute", group = "volume"}),
     -- Volume
     awful.key({        }, "XF86AudioMute",        function () awful.spawn("pulsemixer --toggle-mute")     end,
               {description = "toggle mute", group = "volume"}),


@@ -142,7 +143,7 @@ globalkeys = gears.table.join(globalkeys,
     awful.key({ modkey, "Control" }, "Escape", function () awful.spawn("i3lock -c 000000") end),
     -- VimWiki
     awful.key({ modkey }, "i", function ()
     awful.key({ modkey, "Control" }, "Escape", function () awful.spawn("i3lock -c 000000") end),
     -- VimWiki
     awful.key({ modkey }, "i", function ()

-        awful.spawn(terminal.." -name vimwiki -e vim -c 'call vimwiki#base#goto_index(v:count1)'")
+        utils.spawn_terminal("vim -c 'call vimwiki#base#goto_index(v:count1)'", { instance = "vimwiki"})

     end)
 )
 
     end)
 )