rc: comparison awesome/rc.lua

equal deleted inserted replaced

-:03125e413ae3
+:0eae48be1d62
 -- Uncommment this for a lighter theme
 theme_path = "/usr/share/awesome/themes/sky/theme.lua"
 -- This is used later as the default terminal and editor to run.
 terminal = "x-terminal-emulator"
+-- terminal = "terminology"
 editor = os.getenv("EDITOR") or "editor"
 editor_cmd = terminal .. " -e " .. editor
 browser = "iceweasel"
 mail = "icedove"
 musicplayer = "ario"
 monitor = "gnome-system-monitor"
 filemanager = "pcmanfm"
 lookup = "pcmanfm -f"
 calculator = "galculator"
+-- Logout method
+-- logout = awesome.quit
+logout = my.mkspawn("obsession-logout")
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.
 -- If you do not like this or do not have such a key, I suggest you to remap
 -- Mod4 to another key using xmodmap or other tools.  However, you can use
 }
 -- Define if we want to use titlebar on all applications.
 use_titlebar = true
+-- Remove the focus follow mouse install by shifty.
+shifty.config.sloppy = false
 -- Shifty configured tags.
 shifty.config.tags = {
 w1 = {
 layout    = awful.layout.suit.tile,
 mwfact    = 0.60,
 web = {
 layout      = awful.layout.suit.tile.bottom,
 mwfact      = 0.65,
 exclusive   = true,
 max_clients = 1,
-position    = 4,
+position    = 2,
 spawn       = browser,
 },
 mail = {
 layout    = awful.layout.suit.tile,
 mwfact    = 0.55,
 exclusive = false,
-position  = 5,
+position  = 3,
 spawn     = mail,
 slave     = true
+},
+steam = {
+layout      = awful.layout.suit.float,
+mwfact      = 0.65,
+exclusive   = true,
+spawn       = "steam",
+position    = 4,
 },
 media = {
 layout    = awful.layout.suit.float,
 exclusive = false,
-position  = 8,
+position  = 5,
 spawn     = musicplayer
 },
 office = {
 layout   = awful.layout.suit.tile,
-position = 9,
+position = 6,
-},
-steam = {
-layout      = awful.layout.suit.max,
-mwfact      = 0.65,
-exclusive   = true,
-spawn       = "steam",
-position    = 6,
 },
 }
 -- SHIFTY: application matching rules
 -- order here matters, early rules will be applied first
 {
 match = { "Steam" },
 tag = "steam",
 },
 {
+match = { "kupfer.py" },
+slave = true,
+},
+{
 match = {""},
 buttons = awful.util.table.join(
 awful.button({}, 1, function (c) client.focus = c; c:raise() end),
 awful.button({modkey}, 1, function(c)
 client.focus = c
 c:raise()
 awful.mouse.client.move(c)
+-- awful.mouse.client.dragtotag.border(c)
+-- awful.mouse.client.dragtotag.widget(c)
 end),
 awful.button({modkey}, 3, awful.mouse.client.resize)
 )
 },
 }
 --                 new (unconfigured) tags?
 --  * guess_position: as above, but for position parameter
 --  * run : function to exec when shifty creates a new tag
 --  * all other parameters (e.g. layout, mwfact) follow awesome's tag API
 shifty.config.defaults = {
-layout = awful.layout.suit.tile.bottom,
+layout = awful.layout.suit.tile,
 ncol = 1,
 mwfact = 0.60,
 floatBars = true,
 guess_name = true,
 guess_position = true,
 my.mkinteractive(function() shifty.add({nopopup = true}) end)),
 my.make_key("Up", "View prev",
 function () awful.tag.viewprev(); return true; end),
 my.make_key("Down", "View next",
 function () awful.tag.viewnext(); return true; end),
-my.make_key("Shift+Up", "Move tag left",
+my.make_key("Shift+Up", "Move tag right",
 function()
 local t = awful.tag.selected()
 local s = awful.util.cycle(screen.count(), t.screen + 1)
 awful.tag.history.restore()
 t = shifty.tagtoscr(s, t)
 awful.tag.viewonly(t)
 return true
 end),
-my.make_key("Shift+Right", "Move tag left",
+my.make_key("Shift+Down", "Move tag left",
 function()
 local t = awful.tag.selected()
-local s = awful.util.cycle(screen.count(), t.screen + 1)
+local s = awful.util.cycle(screen.count(), t.screen - 1)
 awful.tag.history.restore()
 t = shifty.tagtoscr(s, t)
 awful.tag.viewonly(t)
 return true
 end),
 -- my.make_key("k", "Kill all clients",
 --             function ()
 --                for client.
 --                my.kill_all(function (c)
 my.make_key("r", "Restart", awesome.restart),
-my.make_key("q", "Quit", awesome.quit),
+my.make_key("q", "Quit", logout),
 my.make_key("t", "Terminal", my.mkspawn(terminal)),
+my.make_key("f", "Toggle sloppy mouse", my.sloppy_toggle)
 }
 local layout_keys = {
 my.make_key("Right", "Focus right",
 function () awful.client.focus.bydirection("right"); return true end),
 for i = 1, (shifty.config.maxtags or #number_row) do
 local k = number_row[i-1]
 globalkeys = awful.util.table.join(
 globalkeys,
 awful.key({modkey}, k, function()
-local t =  awful.tag.viewonly(shifty.getpos(i))
+local t =  awful.tag.viewonly(shifty.getpos(i-1))
 end),
 awful.key({modkey, "Control"}, k, function()
-local t = shifty.getpos(i)
+local t = shifty.getpos(i-1)
 t.selected = not t.selected
 end),
 awful.key({modkey, "Control", "Shift"}, k, function()
 if client.focus then
-awful.client.toggletag(shifty.getpos(i))
+awful.client.toggletag(shifty.getpos(i-1))
 end
 end),
 -- move clients to other tags
 awful.key({modkey, "Shift"}, k, function()
 if client.focus then
-t = shifty.getpos(i)
+t = shifty.getpos(i-1)
 awful.client.movetotag(t)
 awful.tag.viewonly(t)
 end
 end))
 end
 -- keychains.start(5)
 -- Hook function to execute when focusing a client.
 client.add_signal("focus",
 function(c)
+-- my.notify_error("Client focus:\n" .. debug.traceback())
 if not awful.client.ismarked(c) then
 c.border_color = beautiful.border_focus
 c.opacity = 1.0
 end
 end)
 c.border_color = beautiful.border_normal
 c.opacity = 0.8
 end
 end)
+my.sloppy_install(0.5)

changeset 8	0eae48be1d62
parent 7	03125e413ae3
child 11	7226709dc4c4