rc: comparison awesome/rc.lua

equal deleted inserted replaced

-:449bcf8e92c2
+:7226709dc4c4
-require("debug")
+local debug = require("debug")
 --
 -- Standard awesome library
-require("awful")
+local awful = require("awful")
-require("awful.autofocus")
+awful.autofocus = require("awful.autofocus")
+local wibox = require("wibox")
 -- Theme handling library
-require("beautiful")
+local beautiful = require("beautiful")
 -- Notification library
-require("naughty")
+local naughty = require("naughty")
 -- shifty - dynamic tagging library
-require("shifty")
+local shifty = require("shifty")
 -- Revelation
-require("revelation")
+local revelation = require("revelation")
 -- vicious widgets
 local vicious = require("vicious")
 local wicked = require("wicked")
 -- Load Debian menu entries
 require("debian.menu")
 -- require("keychains")
-require("my")
+local my = require("my")
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
 text = awesome.startup_errors })
 end
 -- Handle runtime errors after startup
 do
-awesome.add_signal("debug::error", my.notify_error)
+awesome.connect_signal("debug::error", my.notify_error)
 end
 -- }}}
 -- Variable definitions
 -- Themes define colours, icons, and wallpapers
 awful.layout.suit.tile.bottom,
 awful.layout.suit.tile.top,
 awful.layout.suit.fair,
 awful.layout.suit.fair.horizontal,
 awful.layout.suit.max,
-awful.layout.suit.max.fullscreen,
+-- awful.layout.suit.max.fullscreen,
 awful.layout.suit.magnifier,
 awful.layout.suit.floating
 }
 -- 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.config.sloppy = false
 -- Shifty configured tags.
 shifty.config.tags = {
 w1 = {
 layout    = awful.layout.suit.tile,
 },
 office = {
 layout   = awful.layout.suit.tile,
 position = 6,
 },
+OZoNE = {
+layout = awful.layout.suit.max,
+position = 7,
+spawn = terminal .. " -e ssh o"
+}
 }
 -- SHIFTY: application matching rules
 -- order here matters, early rules will be applied first
 shifty.config.apps = {
 guess_position = true,
 }
 --  Wibox
 -- Create a textbox widget
-mytextclock = awful.widget.textclock({align = "right"})
+mytextclock = awful.widget.textclock()
 -- Create a laucher widget and a main menu
 myawesomemenu = {
 {"manual", terminal .. " -e man awesome"},
 {"edit config",
 {"awesome", myawesomemenu, beautiful.awesome_icon},
 { "Debian", debian.menu.Debian_menu.Debian },
 {"open terminal", terminal}}
 })
-mylauncher = awful.widget.launcher({image = image(beautiful.awesome_icon),
+mylauncher = awful.widget.launcher({image = beautiful.awesome_icon,
 menu = mymainmenu})
 -- Create a systray
-mysystray = widget({type = "systray", align = "right"})
+mysystray = wibox.widget.systray({align = "right"})
 -- Create a wibox for each screen and add it
 mywibox = {}
 mypromptbox = {}
 mylayoutbox = {}
 awful.util.spawn("awsetbg -a " .. wallpaper, false, s)
 -- status box
 -- Create a promptbox for each screen
-mypromptbox[s] =
+mypromptbox[s] = awful.widget.prompt()
-awful.widget.prompt({layout = awful.widget.layout.leftright})
 -- Create an imagebox widget which will contains an icon indicating which
 -- layout we're using.  We need one layoutbox per screen.
 mylayoutbox[s] = awful.widget.layoutbox(s)
 mylayoutbox[s]:buttons(awful.util.table.join(
 awful.button({}, 1, function() awful.layout.inc(layouts, 1) end),
 awful.button({}, 3, function() awful.layout.inc(layouts, -1) end),
 awful.button({}, 4, function() awful.layout.inc(layouts, 1) end),
 awful.button({}, 5, function() awful.layout.inc(layouts, -1) end)))
 -- Create a taglist widget
-mytaglist[s] = awful.widget.taglist.new(s,
+mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
-awful.widget.taglist.label.all,
-mytaglist.buttons)
 -- Create a tasklist widget
-mytasklist[s] = awful.widget.tasklist.new(
+mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
-function(c)
-return awful.widget.tasklist.label.currenttags(c, s)
-end,
-mytasklist.buttons)
 -- Create the wibox
 mywibox[s] = awful.wibox({position = "top", screen = s})
 -- Add widgets to the wibox - order matters
-mywibox[s].widgets = {
+local left_layout = wibox.layout.fixed.horizontal()
-{
+left_layout:add(myktwidget)
-myktwidget,
+left_layout:add(mylauncher)
-mylauncher,
+if s == 1 then
-s == 1 and mycpuwidget or nil,
+left_layout:add(mycpuwidget)
-s == 1 and mymemwidget or nil,
+left_layout:add(mymemwidget)
-mytaglist[s],
+end
-mypromptbox[s],
+left_layout:add(mytaglist[s])
-layout = awful.widget.layout.horizontal.leftright
+left_layout:add(mypromptbox[s])
-},
-mylayoutbox[s],
+local right_layout = wibox.layout.fixed.horizontal()
-s == 1 and mynetwidget or nil,
+right_layout:add(mylayoutbox[s])
-mytextclock,
+if (s == 1) then right_layout:add(mynetwidget) end
-s == 1 and mysystray or nil,
+right_layout:add(mytextclock)
-mytasklist[s],
+if (s == 1) then right_layout:add(mysystray) end
-layout = awful.widget.layout.horizontal.rightleft
-}
+local layout = wibox.layout.align.horizontal()
+layout:set_left(left_layout)
+layout:set_middle(mytasklist[s])
+layout:set_right(right_layout)
+mywibox[s]:set_widget(layout)
 mywibox[s].screen = s
 end
 -- SHIFTY: initialize shifty
 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 right",
+-- my.make_key("Shift+Up", "Move tag right",
-function()
+--          function()
-local t = awful.tag.selected()
+--             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()
+--             awful.tag.history.restore()
-t = shifty.tagtoscr(s, t)
+--             t = shifty.tagtoscr(s, t)
-awful.tag.viewonly(t)
+--             awful.tag.viewonly(t)
-return true
+--             return true
-end),
+-- end),
-my.make_key("Shift+Down", "Move tag left",
+-- my.make_key("Shift+Down", "Move tag left",
-function()
+--          function()
-local t = awful.tag.selected()
+--             local t = awful.tag.selected()
-local s = awful.util.cycle(screen.count(), t.screen - 1)
+--             local s = screen.count() + t.screen - 1
-awful.tag.history.restore()
+--             s = awful.util.cycle(screen.count(), s)
-t = shifty.tagtoscr(s, t)
+--             awful.tag.history.restore()
-awful.tag.viewonly(t)
+--             t = shifty.tagtoscr(s, t)
-return true
+--             awful.tag.viewonly(t)
-end),
+--             return true
+-- end),
 }
 local awesome_keys = {
 my.make_key("m", "Menu", my.mkinteractive(function ()
 mymainmenu:show({keygrabber=true})
 -- end
 -- keychains.add({modkey}, "w", "Awesome", nil, kt2kc(awesome_keys))
 -- keychains.start(5)
 -- Hook function to execute when focusing a client.
-client.add_signal("focus",
+client.connect_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)
 -- Hook function to execute when unfocusing a client.
-client.add_signal("unfocus", function(c)
+client.connect_signal("unfocus", function(c)
 if not awful.client.ismarked(c) then
 c.border_color = beautiful.border_normal
 c.opacity = 0.8
 end
 end)

changeset 11	7226709dc4c4
parent 8	0eae48be1d62
child 12	ffc02bf394cb