From: martin f. krafft Date: Mon, 5 Jan 2009 18:26:10 +0000 (+0100) Subject: follow config changes for 3.1 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/64db5d7e1f1f7c68d94a605cf78b29970c11817f follow config changes for 3.1 --- diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 743b318..bdbf42d 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -2,19 +2,22 @@ require("awful") require("beautiful") +-- Load Debian menu entries +require("debian.menu") + -- {{{ Variable definitions -- Themes define colours, icons, and wallpapers -- The default is a dark theme -theme_path = "/home/madduck/code/awesome/share/awesome/themes/default/theme" +theme_path = "/usr/share/awesome/themes/default/theme" -- Uncommment this for a lighter theme --- theme_path = "/home/madduck/code/awesome/share/awesome/themes/sky/theme" +-- theme_path = "/usr/share/awesome/themes/sky/theme" -- Actually load theme beautiful.init(theme_path) -- This is used later as the default terminal and editor to run. terminal = "x-terminal-emulator" -editor = "sensible-editor" +editor = os.getenv("EDITOR") or "editor" editor_cmd = terminal .. " -e " .. editor -- Default modkey. @@ -122,7 +125,8 @@ myawesomemenu = { } mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } + { "open terminal", terminal }, + { "Debian", debian.menu.Debian_menu.Debian } } }) @@ -271,20 +275,20 @@ keybinding({ modkey, "Shift" }, "q", awesome.quit):add() -- Client manipulation keybinding({ modkey }, "m", awful.client.maximize):add() -keybinding({ modkey }, "f", function () client.focus.fullscreen = not client.focus.fullscreen end):add() -keybinding({ modkey, "Shift" }, "c", function () client.focus:kill() end):add() -keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); client.focus:raise() end):add() -keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); client.focus:raise() end):add() +keybinding({ modkey }, "f", function () if client.focus then client.focus.fullscreen = not client.focus.fullscreen end end):add() +keybinding({ modkey, "Shift" }, "c", function () if client.focus then client.focus:kill() end end):add() +keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end):add() keybinding({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(1) end):add() -keybinding({ modkey, "Shift" }, "k", function () awful.client.swap(-1) end):add() +keybinding({ modkey, "Shift" }, "k", function () awful.client.swap.byidx(-1) end):add() keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add() keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add() keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add() -keybinding({ modkey, "Control" }, "Return", function () client.focus:swap(awful.client.getmaster()) end):add() +keybinding({ modkey, "Control" }, "Return", function () if client.focus then client.focus:swap(awful.client.getmaster()) end end):add() keybinding({ modkey }, "o", awful.client.movetoscreen):add() keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add() keybinding({ modkey }, "u", awful.client.urgent.jumpto):add() -keybinding({ modkey, "Shift" }, "r", function () client.focus:redraw() end):add() +keybinding({ modkey, "Shift" }, "r", function () if client.focus then client.focus:redraw() end end):add() -- Layout manipulation keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add() @@ -310,7 +314,7 @@ keybinding({ modkey, "Ctrl" }, "i", function () local s = mouse.screen if mypromptbox[s].text then mypromptbox[s].text = nil - else + elseif client.focus then mypromptbox[s].text = nil if client.focus.class then mypromptbox[s].text = "Class: " .. client.focus.class .. " "