|
|
@@ -1,14 +1,13 @@
|
|
|
--- Standard awesome library
|
|
|
local gears = require("gears")
|
|
|
-local awful = require("awful")
|
|
|
+awful = require("awful")
|
|
|
awful.rules = require("awful.rules")
|
|
|
require("awful.autofocus")
|
|
|
--- Widget and layout library
|
|
|
local wibox = require("wibox")
|
|
|
--- Theme handling library
|
|
|
local beautiful = require("beautiful")
|
|
|
--- Notification library
|
|
|
-local naughty = require("naughty")
|
|
|
+naughty = require("naughty")
|
|
|
+require("obvious.battery")
|
|
|
+require("obvious.volume_alsa")
|
|
|
+require("obvious.wlan")
|
|
|
local menubar = require("menubar")
|
|
|
|
|
|
-- {{{ Error handling
|
|
|
@@ -19,6 +18,9 @@ if awesome.startup_errors then
|
|
|
title = "Oops, there were errors during startup!",
|
|
|
text = awesome.startup_errors })
|
|
|
end
|
|
|
+tagone = tag({ name = 'one' })
|
|
|
+tagone.screen = 1
|
|
|
+tagone.selected = true
|
|
|
|
|
|
-- Handle runtime errors after startup
|
|
|
do
|
|
|
@@ -36,46 +38,46 @@ do
|
|
|
end
|
|
|
-- }}}
|
|
|
|
|
|
+awful.util.spawn_with_shell('compton &')
|
|
|
+awful.util.spawn('killall conky 2>/dev/null 1>&2; conky -c ' .. os.getenv('HOME') .. '/.config/conky/conkyrc')
|
|
|
+awful.util.spawn('pidgin')
|
|
|
+
|
|
|
-- {{{ Variable definitions
|
|
|
-- Themes define colours, icons, font and wallpapers.
|
|
|
-beautiful.init("/usr/share/awesome/themes/default/theme.lua")
|
|
|
+beautiful.init(awful.util.getdir("config") .. "/theme.lua")
|
|
|
|
|
|
-- This is used later as the default terminal and editor to run.
|
|
|
-terminal = "xterm"
|
|
|
-editor = os.getenv("EDITOR") or "nano"
|
|
|
+terminal = "urxvtc"
|
|
|
+editor = os.getenv("EDITOR") or "vim"
|
|
|
editor_cmd = terminal .. " -e " .. editor
|
|
|
|
|
|
--- 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 another modifier like Mod1, but it may interact with others.
|
|
|
-modkey = "Mod4"
|
|
|
+s_mod = "Mod4"
|
|
|
+alt_mod = "Mod1"
|
|
|
|
|
|
-- Table of layouts to cover with awful.layout.inc, order matters.
|
|
|
local layouts =
|
|
|
{
|
|
|
- awful.layout.suit.floating,
|
|
|
- awful.layout.suit.tile,
|
|
|
+ --awful.layout.suit.tile,
|
|
|
awful.layout.suit.tile.left,
|
|
|
- awful.layout.suit.tile.bottom,
|
|
|
- awful.layout.suit.tile.top,
|
|
|
+ --awful.layout.suit.tile.bottom,
|
|
|
+ --awful.layout.suit.tile.top,
|
|
|
awful.layout.suit.fair,
|
|
|
- awful.layout.suit.fair.horizontal,
|
|
|
- awful.layout.suit.spiral,
|
|
|
- awful.layout.suit.spiral.dwindle,
|
|
|
- awful.layout.suit.max,
|
|
|
- awful.layout.suit.max.fullscreen,
|
|
|
- awful.layout.suit.magnifier
|
|
|
+ --awful.layout.suit.fair.horizontal,
|
|
|
+ --awful.layout.suit.spiral,
|
|
|
+ --awful.layout.suit.spiral.dwindle,
|
|
|
+ --awful.layout.suit.max,
|
|
|
+ --awful.layout.suit.max.fullscreen,
|
|
|
+ --awful.layout.suit.magnifier,
|
|
|
+ awful.layout.suit.floating,
|
|
|
}
|
|
|
-- }}}
|
|
|
|
|
|
-- {{{ Wallpaper
|
|
|
-if beautiful.wallpaper then
|
|
|
- for s = 1, screen.count() do
|
|
|
- gears.wallpaper.maximized(beautiful.wallpaper, s, true)
|
|
|
- end
|
|
|
-end
|
|
|
+--if beautiful.wallpaper then
|
|
|
+ --for s = 1, screen.count() do
|
|
|
+ --gears.wallpaper.maximized(beautiful.wallpaper, s, true)
|
|
|
+ --end
|
|
|
+--end
|
|
|
-- }}}
|
|
|
|
|
|
-- {{{ Tags
|
|
|
@@ -119,9 +121,9 @@ mylayoutbox = {}
|
|
|
mytaglist = {}
|
|
|
mytaglist.buttons = awful.util.table.join(
|
|
|
awful.button({ }, 1, awful.tag.viewonly),
|
|
|
- awful.button({ modkey }, 1, awful.client.movetotag),
|
|
|
+ awful.button({ s_mod }, 1, awful.client.movetotag),
|
|
|
awful.button({ }, 3, awful.tag.viewtoggle),
|
|
|
- awful.button({ modkey }, 3, awful.client.toggletag),
|
|
|
+ awful.button({ s_mod }, 3, awful.client.toggletag),
|
|
|
awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
|
|
|
awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
|
|
|
)
|
|
|
@@ -162,6 +164,8 @@ mytasklist.buttons = awful.util.table.join(
|
|
|
if client.focus then client.focus:raise() end
|
|
|
end))
|
|
|
|
|
|
+
|
|
|
+
|
|
|
for s = 1, screen.count() do
|
|
|
-- Create a promptbox for each screen
|
|
|
mypromptbox[s] = awful.widget.prompt()
|
|
|
@@ -190,8 +194,17 @@ for s = 1, screen.count() do
|
|
|
|
|
|
-- Widgets that are aligned to the right
|
|
|
local right_layout = wibox.layout.fixed.horizontal()
|
|
|
+ local seperator = wibox.widget.textbox()
|
|
|
+ seperator:set_text(' | ')
|
|
|
if s == 1 then right_layout:add(wibox.widget.systray()) end
|
|
|
right_layout:add(mytextclock)
|
|
|
+ --right_layout:add(seperator)
|
|
|
+ --right_layout:add(obvious.wlan())
|
|
|
+ right_layout:add(seperator)
|
|
|
+ right_layout:add(obvious.volume_alsa(1, "Master"))
|
|
|
+ right_layout:add(seperator)
|
|
|
+ right_layout:add(obvious.battery())
|
|
|
+ right_layout:add(seperator)
|
|
|
right_layout:add(mylayoutbox[s])
|
|
|
|
|
|
-- Now bring it all together (with the tasklist in the middle)
|
|
|
@@ -214,29 +227,29 @@ root.buttons(awful.util.table.join(
|
|
|
|
|
|
-- {{{ Key bindings
|
|
|
globalkeys = awful.util.table.join(
|
|
|
- awful.key({ modkey, }, "Left", awful.tag.viewprev ),
|
|
|
- awful.key({ modkey, }, "Right", awful.tag.viewnext ),
|
|
|
- awful.key({ modkey, }, "Escape", awful.tag.history.restore),
|
|
|
+ awful.key({ s_mod, }, "Left", awful.tag.viewprev ),
|
|
|
+ awful.key({ s_mod, }, "Right", awful.tag.viewnext ),
|
|
|
+ awful.key({ s_mod, }, "Escape", awful.tag.history.restore),
|
|
|
|
|
|
- awful.key({ modkey, }, "j",
|
|
|
+ awful.key({ s_mod, }, "j",
|
|
|
function ()
|
|
|
awful.client.focus.byidx( 1)
|
|
|
if client.focus then client.focus:raise() end
|
|
|
end),
|
|
|
- awful.key({ modkey, }, "k",
|
|
|
+ awful.key({ s_mod, }, "k",
|
|
|
function ()
|
|
|
awful.client.focus.byidx(-1)
|
|
|
if client.focus then client.focus:raise() end
|
|
|
end),
|
|
|
- awful.key({ modkey, }, "w", function () mymainmenu:show() end),
|
|
|
+ awful.key({ s_mod, }, "Space", function () mymainmenu:show() end),
|
|
|
|
|
|
-- Layout manipulation
|
|
|
- awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end),
|
|
|
- awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end),
|
|
|
- awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
|
|
|
- awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
|
|
|
- awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
|
|
|
- awful.key({ modkey, }, "Tab",
|
|
|
+ awful.key({ s_mod, "Shift" }, "j", function () awful.client.swap.byidx( 1) end),
|
|
|
+ awful.key({ s_mod, "Shift" }, "k", function () awful.client.swap.byidx( -1) end),
|
|
|
+ awful.key({ s_mod, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
|
|
|
+ awful.key({ s_mod, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
|
|
|
+ awful.key({ s_mod, }, "u", awful.client.urgent.jumpto),
|
|
|
+ awful.key({ alt_mod, }, "Tab",
|
|
|
function ()
|
|
|
awful.client.focus.history.previous()
|
|
|
if client.focus then
|
|
|
@@ -245,25 +258,24 @@ globalkeys = awful.util.table.join(
|
|
|
end),
|
|
|
|
|
|
-- Standard program
|
|
|
- awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
|
|
|
- awful.key({ modkey, "Control" }, "r", awesome.restart),
|
|
|
- awful.key({ modkey, "Shift" }, "q", awesome.quit),
|
|
|
+ awful.key({ s_mod, "Control" }, "r", awesome.restart),
|
|
|
+ awful.key({ s_mod, "Shift" }, "q", awesome.quit),
|
|
|
|
|
|
- awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end),
|
|
|
- awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end),
|
|
|
- awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
|
|
|
- awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
|
|
|
- awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end),
|
|
|
- awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end),
|
|
|
- awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end),
|
|
|
- awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
|
|
|
+ awful.key({ s_mod, }, "l", function () awful.tag.incmwfact( 0.05) end),
|
|
|
+ awful.key({ s_mod, }, "h", function () awful.tag.incmwfact(-0.05) end),
|
|
|
+ awful.key({ s_mod, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
|
|
|
+ awful.key({ s_mod, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
|
|
|
+ awful.key({ s_mod, "Control" }, "h", function () awful.tag.incncol( 1) end),
|
|
|
+ awful.key({ s_mod, "Control" }, "l", function () awful.tag.incncol(-1) end),
|
|
|
+ awful.key({ s_mod, }, "space", function () awful.layout.inc(layouts, 1) end),
|
|
|
+ awful.key({ s_mod, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
|
|
|
|
|
|
- awful.key({ modkey, "Control" }, "n", awful.client.restore),
|
|
|
+ awful.key({ s_mod, "Control" }, "n", awful.client.restore),
|
|
|
|
|
|
-- Prompt
|
|
|
- awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
|
|
|
+ awful.key({ s_mod }, "r", function () mypromptbox[mouse.screen]:run() end),
|
|
|
|
|
|
- awful.key({ modkey }, "x",
|
|
|
+ awful.key({ s_mod }, "x",
|
|
|
function ()
|
|
|
awful.prompt.run({ prompt = "Run Lua code: " },
|
|
|
mypromptbox[mouse.screen].widget,
|
|
|
@@ -271,23 +283,23 @@ globalkeys = awful.util.table.join(
|
|
|
awful.util.getdir("cache") .. "/history_eval")
|
|
|
end),
|
|
|
-- Menubar
|
|
|
- awful.key({ modkey }, "p", function() menubar.show() end)
|
|
|
+ awful.key({ s_mod }, "p", function() menubar.show() end)
|
|
|
)
|
|
|
|
|
|
clientkeys = awful.util.table.join(
|
|
|
- awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
|
|
|
- awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end),
|
|
|
- awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
|
|
|
- awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
|
|
|
- awful.key({ modkey, }, "o", awful.client.movetoscreen ),
|
|
|
- awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end),
|
|
|
- awful.key({ modkey, }, "n",
|
|
|
+ awful.key({ s_mod, }, "f", function (c) c.fullscreen = not c.fullscreen end),
|
|
|
+ awful.key({ s_mod, "Shift" }, "c", function (c) c:kill() end),
|
|
|
+ awful.key({ s_mod, "Control" }, "space", awful.client.floating.toggle ),
|
|
|
+ awful.key({ s_mod, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
|
|
|
+ awful.key({ s_mod, }, "o", awful.client.movetoscreen ),
|
|
|
+ awful.key({ s_mod, }, "t", function (c) c.ontop = not c.ontop end),
|
|
|
+ awful.key({ s_mod, }, "n",
|
|
|
function (c)
|
|
|
-- The client currently has the input focus, so it cannot be
|
|
|
-- minimized, since minimized clients can't have the focus.
|
|
|
c.minimized = true
|
|
|
end),
|
|
|
- awful.key({ modkey, }, "m",
|
|
|
+ awful.key({ s_mod, }, "m",
|
|
|
function (c)
|
|
|
c.maximized_horizontal = not c.maximized_horizontal
|
|
|
c.maximized_vertical = not c.maximized_vertical
|
|
|
@@ -300,7 +312,7 @@ clientkeys = awful.util.table.join(
|
|
|
for i = 1, 9 do
|
|
|
globalkeys = awful.util.table.join(globalkeys,
|
|
|
-- View tag only.
|
|
|
- awful.key({ modkey }, "#" .. i + 9,
|
|
|
+ awful.key({ s_mod }, "#" .. i + 9,
|
|
|
function ()
|
|
|
local screen = mouse.screen
|
|
|
local tag = awful.tag.gettags(screen)[i]
|
|
|
@@ -309,7 +321,7 @@ for i = 1, 9 do
|
|
|
end
|
|
|
end),
|
|
|
-- Toggle tag.
|
|
|
- awful.key({ modkey, "Control" }, "#" .. i + 9,
|
|
|
+ awful.key({ s_mod, "Control" }, "#" .. i + 9,
|
|
|
function ()
|
|
|
local screen = mouse.screen
|
|
|
local tag = awful.tag.gettags(screen)[i]
|
|
|
@@ -318,7 +330,7 @@ for i = 1, 9 do
|
|
|
end
|
|
|
end),
|
|
|
-- Move client to tag.
|
|
|
- awful.key({ modkey, "Shift" }, "#" .. i + 9,
|
|
|
+ awful.key({ s_mod, "Shift" }, "#" .. i + 9,
|
|
|
function ()
|
|
|
if client.focus then
|
|
|
local tag = awful.tag.gettags(client.focus.screen)[i]
|
|
|
@@ -328,7 +340,7 @@ for i = 1, 9 do
|
|
|
end
|
|
|
end),
|
|
|
-- Toggle tag.
|
|
|
- awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
|
|
|
+ awful.key({ s_mod, "Control", "Shift" }, "#" .. i + 9,
|
|
|
function ()
|
|
|
if client.focus then
|
|
|
local tag = awful.tag.gettags(client.focus.screen)[i]
|
|
|
@@ -341,8 +353,8 @@ end
|
|
|
|
|
|
clientbuttons = awful.util.table.join(
|
|
|
awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
|
|
|
- awful.button({ modkey }, 1, awful.mouse.client.move),
|
|
|
- awful.button({ modkey }, 3, awful.mouse.client.resize))
|
|
|
+ awful.button({ s_mod }, 1, awful.mouse.client.move),
|
|
|
+ awful.button({ s_mod }, 3, awful.mouse.client.resize))
|
|
|
|
|
|
-- Set keys
|
|
|
root.keys(globalkeys)
|
|
|
@@ -358,16 +370,24 @@ awful.rules.rules = {
|
|
|
focus = awful.client.focus.filter,
|
|
|
raise = true,
|
|
|
keys = clientkeys,
|
|
|
- buttons = clientbuttons } },
|
|
|
- { rule = { class = "MPlayer" },
|
|
|
- properties = { floating = true } },
|
|
|
- { rule = { class = "pinentry" },
|
|
|
- properties = { floating = true } },
|
|
|
+ buttons = clientbuttons,
|
|
|
+ size_hints_honor = false } },
|
|
|
+ { rule = { class = "Pidgin", role = "buddy_list" },
|
|
|
+ properties = { floating = true, width = 235, height = 450 } },
|
|
|
+ { rule = { class = "Skype" },
|
|
|
+ properties = { floating = true} },
|
|
|
{ rule = { class = "gimp" },
|
|
|
properties = { floating = true } },
|
|
|
- -- Set Firefox to always map on tags number 2 of screen 1.
|
|
|
- -- { rule = { class = "Firefox" },
|
|
|
- -- properties = { tag = tags[1][2] } },
|
|
|
+ { rule = { class = 'urxvt' },
|
|
|
+ properties = { border = 0 } },
|
|
|
+ { rule = { class = "Conky" },
|
|
|
+ properties = {
|
|
|
+ floating = true,
|
|
|
+ sticky = true,
|
|
|
+ ontop = false,
|
|
|
+ focusable = false,
|
|
|
+ size_hints = {"program_position", "program_size"}
|
|
|
+ } }
|
|
|
}
|
|
|
-- }}}
|
|
|
|
