guillaume/awesome-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: guillaume:pulseaudio
Branches Tags
guillaume:master
guillaume:pulseaudio
guillaume:awesome-4.0
..
compare: guillaume:master
Branches Tags
guillaume:pulseaudio
guillaume:awesome-4.0
guillaume:master

No commits in common. "pulseaudio" and "master" have entirely different histories.
pulseaudio ... master

5 changed files with 316 additions and 387 deletions
Show Stats Expand all files Collapse all files

2
iniquitous

@ -1 +1 @@
Subproject commit c59f7e1b8b966a2aa54167d68f83e592923fb8b9 Subproject commit e975b5cfffd8d24ec9d2da62d4d933b3808b73d2

694
rc.lua
View File

@ -1,16 +1,15 @@
-- Standard awesome library -- Standard awesome library
local gears = require("gears") local gears = require("gears")
local awful = require("awful") local awful = require("awful")
require("awful.autofocus") awful.rules = require("awful.rules")
local tyrannical = require("tyrannical") local tyrannical = require("tyrannical")
require("awful.autofocus")
-- Widget and layout library -- Widget and layout library
local wibox = require("wibox") local wibox = require("wibox")
-- Theme handling library -- Theme handling library
local beautiful = require("beautiful") local beautiful = require("beautiful")
-- Notification library -- Notification library
local naughty = require("naughty") local naughty = require("naughty")
local menubar = require("menubar")
local hotkeys_popup = require("awful.hotkeys_popup").widget
local util = require("util") local util = require("util")
local config = {} local config = {}
@ -35,7 +34,7 @@ do
naughty.notify({ preset = naughty.config.presets.critical, naughty.notify({ preset = naughty.config.presets.critical,
title = "Oops, an error happened!", title = "Oops, an error happened!",
text = tostring(err) }) text = err })
in_error = false in_error = false
end) end)
end end
@ -46,12 +45,11 @@ debug_mode = debug_mode or false
wifi = wifi or false wifi = wifi or false
network = network or false network = network or false
sound = sound or "alsa" sound = sound or "alsa"
channel = channel or "Master" channel = channel or "pcm"
mytheme = mytheme or "dark" theme = theme or "dark"
-- Themes define colours, icons, font and wallpapers. -- Themes define colours, icons, and wallpapers
local mythemepath = awful.util.get_configuration_dir() .. "themes/" .. mytheme .. "/theme.lua" beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/"..theme.."/theme.lua")
beautiful.init(mythemepath)
-- This is used later as the default terminal and editor to run. -- This is used later as the default terminal and editor to run.
terminal = terminal or "xterm" terminal = terminal or "xterm"
@ -62,7 +60,8 @@ editor_cmd = terminal .. " -e " .. editor
modkey = "Mod4" modkey = "Mod4"
-- Table of layouts to cover with awful.layout.inc, order matters. -- Table of layouts to cover with awful.layout.inc, order matters.
awful.layout.layouts = { local layouts =
{
awful.layout.suit.floating, awful.layout.suit.floating,
awful.layout.suit.tile, awful.layout.suit.tile,
awful.layout.suit.tile.left, awful.layout.suit.tile.left,
@ -74,29 +73,10 @@ awful.layout.layouts = {
--awful.layout.suit.spiral.dwindle, --awful.layout.suit.spiral.dwindle,
awful.layout.suit.max, awful.layout.suit.max,
awful.layout.suit.max.fullscreen, awful.layout.suit.max.fullscreen,
--awful.layout.suit.magnifier, --awful.layout.suit.magnifier
awful.layout.suit.corner.nw,
-- awful.layout.suit.corner.ne,
-- awful.layout.suit.corner.sw,
-- awful.layout.suit.corner.se,
} }
-- }}} -- }}}
-- {{{ Helper functions
local function client_menu_toggle_fn()
local instance = nil
return function ()
if instance and instance.wibox.visible then
instance:hide()
instance = nil
else
instance = awful.menu.clients({ theme = { width = 250 } })
end
end
end
-- }}}
-- {{{ Loading of additionnal libraries -- {{{ Loading of additionnal libraries
-- Widgets library -- Widgets library
local iniquitous = {} local iniquitous = {}
@ -109,9 +89,7 @@ if not iniquitous_loaded then
end end
local vicious = {} local vicious = {}
vicious_loaded = pcall(function() vicious = require("vicious") end) vicious_loaded = pcall(function() vicious = require("vicious") end)
if vicious_loaded then if not vicious_loaded then
vicious.contrib = require("vicious.contrib")
else
naughty.notify({ preset = naughty.config.presets.critical, naughty.notify({ preset = naughty.config.presets.critical,
title = "Oops, Vicious is not available!", title = "Oops, Vicious is not available!",
text = "Install Vicious library to use more widgets." }) text = "Install Vicious library to use more widgets." })
@ -120,7 +98,7 @@ end
-- }}} -- }}}
-- {{{ Tyrannical Tags -- {{{ Tyrannical Tags
tyrannical.settings.default_layout = awful.layout.suit.fair tyrannical.settings.default_layout = awful.layout.suit.tile.left
tyrannical.settings.mwfact = 0.66 tyrannical.settings.mwfact = 0.66
tyrannical.tags = { tyrannical.tags = {
@ -129,7 +107,7 @@ tyrannical.tags = {
init = true, init = true,
exclusive = false, exclusive = false,
screen = {1,2}, screen = {1,2},
layout = awful.layout.suit.fair, layout = awful.layout.suit.tile,
selected = true, selected = true,
}, },
{ {
@ -139,22 +117,22 @@ tyrannical.tags = {
screen = {1,2}, screen = {1,2},
layout = awful.layout.suit.max, layout = awful.layout.suit.max,
no_focus_stealing_in = true, no_focus_stealing_in = true,
class = {"Navigator", "Firefox-esr", "Firefox", "Iceweasel", "Chromium"}, class = {"Firefox", "Iceweasel", "Chromium"},
exec_once = {"firefox-esr -P default"} exec_once = {"firefox -P default"}
}, },
{ {
name = "ウ", name = "ウ",
init = true, init = true,
exclusive = false, exclusive = false,
screen = {1,2}, screen = {1,2},
layout = awful.layout.suit.fair, layout = awful.layout.suit.tile,
}, },
{ {
name = "エ", name = "エ",
init = true, init = true,
exclusive = false, exclusive = false,
screen = {1,2}, screen = {1,2},
layout = awful.layout.suit.fair, layout = awful.layout.suit.tile,
}, },
{ {
name = "オ", name = "オ",
@ -163,19 +141,19 @@ tyrannical.tags = {
screen = screen.count()>1 and 2 or 1, screen = screen.count()>1 and 2 or 1,
layout = awful.layout.suit.max, layout = awful.layout.suit.max,
no_focus_stealing_in = true, no_focus_stealing_in = true,
class = {"Mail", "Thunderbird", "Icedove"}, class = {"Thunderbird", "Icedove"},
exec_once = {"icedove"}, exec_once = {"thunderbird"},
}, },
} }
-- Ignore the tag "exclusive" property for the following clients (matched by classes) -- Ignore the tag "exclusive" property for the following clients (matched by classes)
tyrannical.properties.intrusive = { tyrannical.properties.intrusive = {
"gcolor2", "Xephyr", "feh", "pavucontrol" "gcolor2", "Xephyr", "feh",
} }
-- Ignore the tiled layout for the matching clients -- Ignore the tiled layout for the matching clients
tyrannical.properties.floating = { tyrannical.properties.floating = {
"mpv", "Xephyr", "feh", "gcolor2", "pavucontrol" "mpv", "Xephyr", "feh", "gcolor2",
} }
-- Make the matching clients (by classes) on top of the default layout -- Make the matching clients (by classes) on top of the default layout
@ -188,37 +166,33 @@ tyrannical.properties.centered = {
} }
tyrannical.properties.size_hints_honor = { xterm = false, URxvt = false } tyrannical.properties.size_hints_honor = { xterm = false, URxvt = false }
tyrannical.settings.group_children = true
-- }}} -- }}}
-- {{{ Wibar -- {{{ Wibox
-- Reusable separators -- {{{ Reusable separators
local spacer = wibox.widget.textbox(" ") local spacer = wibox.widget.textbox(" ")
local separator = wibox.widget.textbox(" ") local separator = wibox.widget.textbox(" ")
-- }}}
-- Create a textclock widget -- Create a textclock widget
mytextclock = wibox.widget.textclock(" %a %b %d, %H:%M:%S ", 1) mytextclock = awful.widget.textclock(" %a %b %d, %H:%M:%S ", 1)
-- Create a wibox for each screen and add it -- Create a wibox for each screen and add it
local taglist_buttons = awful.util.table.join( mywibox = {}
awful.button({ }, 1, function(t) t:view_only() end), mypromptbox = {}
awful.button({ modkey }, 1, function(t) mylayoutbox = {}
if client.focus then mytaglist = {}
client.focus:move_to_tag(t) mytaglist.buttons = awful.util.table.join(
end awful.button({ }, 1, awful.tag.viewonly),
end), awful.button({ modkey }, 1, awful.client.movetotag),
awful.button({ }, 3, awful.tag.viewtoggle), awful.button({ }, 3, awful.tag.viewtoggle),
awful.button({ modkey }, 3, function(t) awful.button({ modkey }, 3, awful.client.toggletag),
if client.focus then awful.button({ }, 4, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end),
client.focus:toggle_tag(t) awful.button({ }, 5, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end)
end )
end), mytasklist = {}
awful.button({ }, 4, function(t) awful.tag.viewprev(t.screen) end), mytasklist.buttons = awful.util.table.join(
awful.button({ }, 5, function(t) awful.tag.viewnext(t.screen) end)
)
local tasklist_buttons = awful.util.table.join(
awful.button({ }, 1, function (c) awful.button({ }, 1, function (c)
if c == client.focus then if c == client.focus then
c.minimized = true c.minimized = true
@ -226,202 +200,229 @@ local tasklist_buttons = awful.util.table.join(
-- Without this, the following -- Without this, the following
-- :isvisible() makes no sense -- :isvisible() makes no sense
c.minimized = false c.minimized = false
if not c:isvisible() and c.first_tag then if not c:isvisible() then
c.first_tag:view_only() awful.tag.viewonly(c:tags()[1])
end end
-- This will also un-minimize -- This will also un-minimize
-- the client, if needed -- the client, if needed
client.focus = c client.focus = c
c:raise() c:raise()
end end
end), end),
awful.button({ }, 3, client_menu_toggle_fn()),
awful.button({ }, 4, function () awful.button({ }, 4, function ()
awful.client.focus.byidx(-1) awful.client.focus.byidx(1)
if client.focus then client.focus:raise() end
end), end),
awful.button({ }, 5, function () awful.button({ }, 5, function ()
awful.client.focus.byidx(1) awful.client.focus.byidx(-1)
if client.focus then client.focus:raise() end
end)) end))
-- MPD widget -- {{{ MPD widget
if iniquitous_loaded then if iniquitous_loaded then
w_music_img = wibox.widget.imagebox(beautiful.widget_music)
w_music_tb = iniquitous.mpc.init()
end end
-- }}}
local function set_wallpaper(s) for s = 1, screen.count() do
-- Wallpaper -- Create a promptbox
if beautiful.wallpaper then mypromptbox[s] = awful.widget.prompt()
local wallpaper = beautiful.wallpaper -- Create a layoubox
-- If wallpaper is a function, call it with the screen mylayoutbox[s] = awful.widget.layoutbox(s)
if type(wallpaper) == "function" then mylayoutbox[s]:buttons(awful.util.table.join(
wallpaper = wallpaper(s) awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
end awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end)
gears.wallpaper.maximized(wallpaper, s, true) ))
end
end
-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
--screen.connect_signal("property::geometry", set_wallpaper)
awful.screen.connect_for_each_screen(function(s)
-- Wallpaper
--set_wallpaper(s)
-- Create a promptbox for each screen
s.mypromptbox = awful.widget.prompt()
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
-- We need one layoutbox per screen.
s.mylayoutbox = awful.widget.layoutbox(s)
s.mylayoutbox:buttons(awful.util.table.join(
awful.button({ }, 1, function () awful.layout.inc( 1) end),
awful.button({ }, 3, function () awful.layout.inc(-1) end)))
-- Create a taglist widget -- Create a taglist widget
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
-- Create a tasklist widget -- Create a tasklist widget
s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
-- Create the wibox -- Create the wibox
s.mywibox = awful.wibar({ position = "top", screen = s, height = 15 }) mywibox[s] = awful.wibox({ height = 15, position = "top", screen = s })
-- Add widgets to the wibox -- Widgets that are aligned to the left
s.mywibox:setup { local left_layout = wibox.layout.fixed.horizontal()
layout = wibox.layout.align.horizontal, -- Only add menu on first screen
{ -- Left widgets left_layout:add(mytaglist[s])
layout = wibox.layout.fixed.horizontal, left_layout:add(mylayoutbox[s])
s.mytaglist, left_layout:add(mypromptbox[s])
s.mylayoutbox,
s.mypromptbox, -- Widgets that are aligned to the right
}, local right_layout = wibox.layout.fixed.horizontal()
s.mytasklist, -- Middle widget
mytextclock, if s == 2 and iniquitous_loaded then
} right_layout:add(w_music_img)
end) right_layout:add(spacer)
right_layout:add(w_music_tb)
right_layout:add(separator)
end
right_layout:add(mytextclock)
if s == 1 then right_layout:add(wibox.widget.systray()) end
-- Now bring it all together (with the tasklist in the middle)
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)
end
-- {{{ Bottom Wibox -- {{{ Bottom Wibox
do do
local mybottomwibox = awful.wibar({ position = "bottom", screen = 1, height = 14 }) mybottomwibox = awful.wibox({ height = 14, position = "bottom", screen = 1 })
local left_layout = wibox.layout.fixed.horizontal()
local right_layout = wibox.layout.fixed.horizontal()
-- {{{ Kernel version
local w_kernel_img = wibox.widget.imagebox(beautiful.widget_pacman) local w_kernel_img = wibox.widget.imagebox(beautiful.widget_pacman)
local w_kernel_tb = wibox.widget.textbox(io.popen("uname -r"):read()) local w_kernel_tb = wibox.widget.textbox(awful.util.pread("uname -r"))
local left = { left_layout:add(w_kernel_img)
layout = wibox.layout.fixed.horizontal, left_layout:add(spacer)
w_kernel_img, left_layout:add(w_kernel_tb)
spacer, -- }}}
w_kernel_tb,
}
local right = {
layout = wibox.layout.fixed.horizontal,
}
if vicious_loaded then if vicious_loaded then
-- CPU widget -- {{{ CPU
-- Initialize widget
local w_cpu_img = wibox.widget.imagebox(beautiful.widget_cpu) local w_cpu_img = wibox.widget.imagebox(beautiful.widget_cpu)
local w_cpu_g = wibox.widget { local w_cpu_g = awful.widget.graph()
widget = wibox.widget.graph,
forced_width = 50,
color = beautiful.fg_widget,
background_color = beautiful.fg_off_widget,
border_color = beautiful.border_color,
}
-- options
w_cpu_g:set_height(14):set_width(50)
w_cpu_g:set_border_color(beautiful.border_widget)
w_cpu_g:set_background_color(beautiful.fg_off_widget)
w_cpu_g:set_color(beautiful.fg_widget)
-- Register widget
vicious.register(w_cpu_g, vicious.widgets.cpu, "$1", 3) vicious.register(w_cpu_g, vicious.widgets.cpu, "$1", 3)
table.insert(left, separator) left_layout:add(separator)
table.insert(left, w_cpu_img) left_layout:add(w_cpu_img)
table.insert(left, spacer) left_layout:add(spacer)
table.insert(left, w_cpu_g) left_layout:add(w_cpu_g)
-- }}}
-- Memory usage --
-- {{{ Memory usage
local w_mem_img = wibox.widget.imagebox(beautiful.widget_mem) local w_mem_img = wibox.widget.imagebox(beautiful.widget_mem)
local w_mem_tb = wibox.widget.textbox()
vicious.register(w_mem_tb, vicious.widgets.mem, "$1%", 13) -- Initialize widget
table.insert(left, separator) w_mem_b = awful.widget.progressbar()
table.insert(left, w_mem_img) -- Pogressbar properties
table.insert(left, spacer) w_mem_b:set_height(14):set_width(10)
table.insert(left, w_mem_tb) w_mem_b:set_vertical(true)
w_mem_b:set_border_color(beautiful.border_widget)
w_mem_b:set_background_color(beautiful.fg_off_widget)
w_mem_b:set_color(beautiful.fg_widget)
-- Register widget
vicious.register(w_mem_b, vicious.widgets.mem, "$1", 13)
left_layout:add(separator)
left_layout:add(w_mem_img)
left_layout:add(spacer)
left_layout:add(w_mem_b)
-- }}} -- }}}
-- File system usage -- {{{ File system usage
local w_fs_img = wibox.widget.imagebox(beautiful.widget_fs) local w_fs_img = wibox.widget.imagebox(beautiful.widget_fs)
-- Initialize widgets
w_fs_p = {
r = awful.widget.progressbar(),
h = awful.widget.progressbar()
}
w_fs_tb = { w_fs_tb = {
r = wibox.widget.textbox(), r = wibox.widget.textbox(),
h = wibox.widget.textbox() h = wibox.widget.textbox()
} }
-- Set progressbars properties
for _, w in pairs(w_fs_p) do
w:set_vertical(true)
w:set_height(14):set_width(5)
w:set_border_color(beautiful.border_widget)
w:set_background_color(beautiful.fg_off_widget)
w:set_color(beautiful.fg_widget)
end
-- Register widgets
vicious.register(w_fs_p.r, vicious.widgets.fs, "${/ used_p}", 599)
vicious.register(w_fs_p.h, vicious.widgets.fs, "${/home used_p}", 599)
vicious.register(w_fs_tb.r, vicious.widgets.fs, "${/ used_p}%", 599) vicious.register(w_fs_tb.r, vicious.widgets.fs, "${/ used_p}%", 599)
vicious.register(w_fs_tb.h, vicious.widgets.fs, "${/home used_p}%", 599) vicious.register(w_fs_tb.h, vicious.widgets.fs, "${/home used_p}%", 599)
table.insert(left, separator) left_layout:add(separator)
table.insert(left, w_fs_img) left_layout:add(w_fs_img)
table.insert(left, spacer) left_layout:add(spacer)
table.insert(left, w_fs_tb.r) left_layout:add(w_fs_tb.r)
table.insert(left, spacer) left_layout:add(spacer)
table.insert(left, w_fs_tb.h) left_layout:add(w_fs_p.r)
left_layout:add(spacer)
left_layout:add(w_fs_tb.h)
left_layout:add(spacer)
left_layout:add(w_fs_p.h)
-- }}}
if network then if network then
-- Wifi Infos -- {{{ Wifi Infos
if wifi then if wifi then
w_wifi_img = wibox.widget.imagebox(beautiful.widget_wifi) w_wifi_img = wibox.widget.imagebox(beautiful.widget_wifi)
w_wifi_tb = wibox.widget.textbox() w_wifi_tb = wibox.widget.textbox()
vicious.register(w_wifi_tb, vicious.widgets.wifi, '${link}% [${ssid}]', 23, network) vicious.register(w_wifi_tb, vicious.widgets.wifi, '${link}% [${ssid}]', 23, network)
table.insert(left, separator) left_layout:add(separator)
table.insert(left, w_wifi_img) left_layout:add(w_wifi_img)
table.insert(left, spacer) left_layout:add(spacer)
table.insert(left, w_wifi_tb) left_layout:add(w_wifi_tb)
end end
-- Network usage -- }}}
-- {{{ Network usage
w_netdown_img = wibox.widget.imagebox(beautiful.widget_down) w_netdown_img = wibox.widget.imagebox(beautiful.widget_down)
w_netup_img = wibox.widget.imagebox(beautiful.widget_up) w_netup_img = wibox.widget.imagebox(beautiful.widget_up)
w_net_tb = wibox.widget.textbox() w_net_tb = wibox.widget.textbox()
vicious.register(w_net_tb, vicious.widgets.net, '${'..network..' down_kb} ${'..network..' up_kb}', 5) vicious.register(w_net_tb, vicious.widgets.net, '${'..network..' down_kb} ${'..network..' up_kb}', 5)
table.insert(left, separator) left_layout:add(separator)
table.insert(left, w_netdown_img) left_layout:add(w_netdown_img)
table.insert(left, spacer) left_layout:add(spacer)
table.insert(left, w_net_tb) left_layout:add(w_net_tb)
table.insert(left, spacer) left_layout:add(spacer)
table.insert(left, w_netup_img) left_layout:add(w_netup_img)
-- }}} -- }}}
end end
end end
if iniquitous_loaded then if iniquitous_loaded then
-- MPD widget -- MPD widget
local w_music_img = wibox.widget.imagebox(beautiful.widget_music) right_layout:add(w_music_img)
local w_music_tb = iniquitous.mpc.init() right_layout:add(spacer)
right_layout:add(w_music_tb)
table.insert(right, w_music_img) -- {{{ Volume widget
table.insert(right, spacer) iniquitous.volume.init(sound, channel)
table.insert(right, w_music_tb) local w_vol_tb = iniquitous.volume.textbox()
local w_vol_img = iniquitous.volume.imagebox()
right_layout:add(separator)
right_layout:add(w_vol_img)
right_layout:add(spacer)
right_layout:add(w_vol_tb)
-- }}}
end end
-- {{{ Volume widget right_layout:add(separator)
w_vol_tb = wibox.widget.textbox() right_layout:add(mytextclock)
vicious.register(w_vol_tb, vicious.contrib.pulse, " $1%", 3, sink)
w_vol_tb:buttons(awful.util.table.join(
awful.button({ }, 1, function() vicious.contrib.pulse.toggle(sink) end),
awful.button({ }, 3, function() awful.util.spawn("pavucontrol") end),
awful.button({ }, 4, function() vicious.contrib.pulse.add(2, sink) end),
awful.button({ }, 5, function() vicious.contrib.pulse.add(-2, sink) end)
))
table.insert(right, separator) local layout = wibox.layout.align.horizontal()
table.insert(right, w_vol_tb) layout:set_left(left_layout)
-- }}} layout:set_right(right_layout)
table.insert(right, separator) mybottomwibox:set_widget(layout)
table.insert(right, mytextclock)
mybottomwibox:setup {
layout = wibox.layout.align.horizontal,
left,
nil,
right,
}
end end
-- }}} -- }}}
@ -429,135 +430,84 @@ end
-- {{{ Key bindings -- {{{ Key bindings
globalkeys = awful.util.table.join( globalkeys = awful.util.table.join(
awful.key({ modkey, }, "Left", awful.tag.viewprev, awful.key({ modkey, }, "p", awful.tag.viewprev ),
{description = "view previous", group = "tag"}), awful.key({ modkey, }, "n", awful.tag.viewnext ),
awful.key({ modkey, }, "Right", awful.tag.viewnext, awful.key({ modkey, }, "Escape", awful.tag.history.restore),
{description = "view next", group = "tag"}),
awful.key({ modkey, }, "Escape", awful.tag.history.restore,
{description = "go back", group = "tag"}),
awful.key({ modkey, }, "j", awful.key({ modkey, }, "j",
function () function ()
awful.client.focus.byidx( 1) awful.client.focus.byidx(-1)
end, if client.focus then client.focus:raise() end
{description = "focus next by index", group = "client"} end),
),
awful.key({ modkey, }, "k", awful.key({ modkey, }, "k",
function () function ()
awful.client.focus.byidx(-1) awful.client.focus.byidx(1)
end, if client.focus then client.focus:raise() end
{description = "focus previous by index", group = "client"} end),
),
-- Layout manipulation -- Layout manipulation
awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(-1) end),
{description = "swap with next client by index", group = "client"}), awful.key({ modkey, "Shift" }, "k", 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),
{description = "swap with previous client by index", group = "client"}), awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
{description = "focus the next screen", group = "screen"}),
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
{description = "focus the previous screen", group = "screen"}),
awful.key({ modkey, }, "u", awful.client.urgent.jumpto,
{description = "jump to urgent client", group = "client"}),
awful.key({ modkey, }, "Tab", awful.key({ modkey, }, "Tab",
function () function ()
awful.client.focus.history.previous() awful.client.focus.history.previous()
if client.focus then if client.focus then
client.focus:raise() client.focus:raise()
end end
end, end),
{description = "go back", group = "client"}),
-- Standard program -- Standard program
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
{description = "open a terminal", group = "launcher"}), awful.key({ modkey, "Shift" }, "r", awesome.restart),
awful.key({ modkey, "Shift" }, "r", awesome.restart, awful.key({ modkey, "Shift" }, "q", awesome.quit),
{description = "reload awesome", group = "awesome"}),
awful.key({ modkey, "Shift" }, "q", awesome.quit,
{description = "quit awesome", group = "awesome"}),
awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end),
{description = "increase master width factor", group = "layout"}), awful.key({ modkey, }, "h", 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),
{description = "decrease master width factor", group = "layout"}), awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end),
{description = "increase the number of master clients", group = "layout"}), awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end),
awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end),
{description = "decrease the number of master clients", group = "layout"}), awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end,
{description = "increase the number of columns", group = "layout"}),
awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end,
{description = "decrease the number of columns", group = "layout"}),
awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end,
{description = "select next", group = "layout"}),
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end,
{description = "select previous", group = "layout"}),
awful.key({ modkey, "Control" }, "n", awful.key({ modkey, "Control" }, "n", awful.client.restore),
function ()
local c = awful.client.restore()
-- Focus restored client
if c then
client.focus = c
c:raise()
end
end,
{description = "restore minimized", group = "client"}),
-- Prompt -- Prompt
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
{description = "run prompt", group = "launcher"}),
awful.key({ modkey }, "x", awful.key({ modkey }, "x",
function () function ()
awful.prompt.run { awful.prompt.run({ prompt = "Run Lua code: " },
prompt = "Run Lua code: ", mypromptbox[mouse.screen].widget,
textbox = awful.screen.focused().mypromptbox.widget, awful.util.eval, nil,
exe_callback = awful.util.eval, awful.util.getdir("cache") .. "/history_eval")
history_path = awful.util.get_cache_dir() .. "/history_eval" end),
}
end,
{description = "lua execute prompt", group = "awesome"}),
-- Menubar
awful.key({ modkey }, "p", function() menubar.show() end,
{description = "show the menubar", group = "launcher"}),
awful.key({ modkey }, "a", util.add_tag), awful.key({ modkey, }, "a", util.add_tag),
awful.key({ modkey, "Control" }, "r", util.rename_tag), awful.key({ modkey, "Control" }, "r", util.rename_tag),
awful.key({ modkey }, "d", util.delete_tag), awful.key({ modkey, }, "d", util.delete_tag),
awful.key({modkey, "Shift"}, "Return", util.term_in_current_tag), awful.key({modkey, "Shift"}, "Return", util.term_in_current_tag),
awful.key({modkey, "Control"}, "Return", util.new_tag_with_term) awful.key({modkey, "Control"}, "Return", util.new_tag_with_term)
) )
clientkeys = awful.util.table.join( clientkeys = awful.util.table.join(
awful.key({ modkey, }, "f", awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
function (c)
c.fullscreen = not c.fullscreen
c:raise()
end,
{description = "toggle fullscreen", group = "client"}),
awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end,
{description = "close", group = "client"}),
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ,
{description = "toggle floating", group = "client"}),
awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
{description = "move to master", group = "client"}),
awful.key({ modkey, }, "o", function (c) c:move_to_screen() end,
{description = "move to screen", group = "client"}),
awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end,
{description = "toggle keep on top", group = "client"}),
awful.key({ modkey, }, "s", function (c) c.sticky = not c.sticky end), awful.key({ modkey, }, "s", function (c) c.sticky = not c.sticky end),
awful.key({ modkey, "Control" }, "m", awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end),
function (c) c.minimized = true end , awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
{description = "minimize", group = "client"}), awful.key({ modkey, "Mod1" }, "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, "Control" }, "m", function (c) c.minimized = true end),
awful.key({ modkey, }, "m", awful.key({ modkey, }, "m",
function (c) function (c)
c.maximized = not c.maximized c.maximized_horizontal = not c.maximized_horizontal
c:raise() c.maximized_vertical = not c.maximized_vertical
end , end)
{description = "maximize", group = "client"})
) )
-- Bind all key numbers to tags. -- Bind all key numbers to tags.
@ -565,49 +515,36 @@ clientkeys = awful.util.table.join(
-- This should map on the top row of your keyboard, usually 1 to 9. -- This should map on the top row of your keyboard, usually 1 to 9.
for i = 1, 9 do for i = 1, 9 do
globalkeys = awful.util.table.join(globalkeys, globalkeys = awful.util.table.join(globalkeys,
-- View tag only.
awful.key({ modkey }, "#" .. i + 9, awful.key({ modkey }, "#" .. i + 9,
function () function ()
local screen = awful.screen.focused() local screen = mouse.screen
local tag = screen.tags[i] local tag = awful.tag.gettags(screen)[i]
if tag then if tag then
tag:view_only() awful.tag.viewonly(tag)
end end
end, end),
{description = "view tag #"..i, group = "tag"}),
-- Toggle tag display.
awful.key({ modkey, "Control" }, "#" .. i + 9, awful.key({ modkey, "Control" }, "#" .. i + 9,
function () function ()
local screen = awful.screen.focused() local screen = mouse.screen
local tag = screen.tags[i] local tag = awful.tag.gettags(screen)[i]
if tag then if tag then
awful.tag.viewtoggle(tag) awful.tag.viewtoggle(tag)
end end
end, end),
{description = "toggle tag #" .. i, group = "tag"}),
-- Move client to tag.
awful.key({ modkey, "Shift" }, "#" .. i + 9, awful.key({ modkey, "Shift" }, "#" .. i + 9,
function () function ()
if client.focus then local tag = awful.tag.gettags(client.focus.screen)[i]
local tag = client.focus.screen.tags[i] if client.focus and tag then
if tag then awful.client.movetotag(tag)
client.focus:move_to_tag(tag)
end
end end
end, end),
{description = "move focused client to tag #"..i, group = "tag"}),
-- Toggle tag on focused client.
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
function () function ()
if client.focus then local tag = awful.tag.gettags(client.focus.screen)[i]
local tag = client.focus.screen.tags[i] if client.focus and tag then
if tag then awful.client.toggletag(tag)
client.focus:toggle_tag(tag)
end
end end
end, end))
{description = "toggle focused client on tag #" .. i, group = "tag"})
)
end end
clientbuttons = awful.util.table.join( clientbuttons = awful.util.table.join(
@ -618,15 +555,15 @@ clientbuttons = awful.util.table.join(
globalkeys = awful.util.table.join( globalkeys = awful.util.table.join(
globalkeys, globalkeys,
awful.key({ modkey, }, "i", function () awful.util.spawn("slock") end), awful.key({ modkey, }, "i", function () awful.util.spawn("xlock -mode blank") end),
awful.key({ }, "XF86AudioPlay", function () io.popen("mpc toggle") end), awful.key({ }, "XF86AudioPlay", function () awful.util.pread("mpc toggle") end),
awful.key({ }, "XF86AudioPrev", function () io.popen("mpc prev") end), awful.key({ }, "XF86AudioPrev", function () awful.util.pread("mpc prev") end),
awful.key({ }, "XF86AudioNext", function () io.popen("mpc next") end), awful.key({ }, "XF86AudioNext", function () awful.util.pread("mpc next") end),
awful.key({ }, "XF86AudioMute", function () vicious.contrib.pulse.toggle(sink) end), awful.key({ }, "XF86AudioMute", function () iniquitous.volume.volume("mute") end),
awful.key({ }, "XF86AudioLowerVolume", function () vicious.contrib.pulse.add(-5, sink) end), awful.key({ }, "XF86AudioLowerVolume", function () iniquitous.volume.volume("down") end),
awful.key({ }, "XF86AudioRaiseVolume", function () vicious.contrib.pulse.add(5, sink) end) awful.key({ }, "XF86AudioRaiseVolume", function () iniquitous.volume.volume("up") end)
) )
-- Set keys -- Set keys
@ -643,76 +580,69 @@ awful.rules.rules = {
focus = awful.client.focus.filter, focus = awful.client.focus.filter,
raise = true, raise = true,
keys = clientkeys, keys = clientkeys,
buttons = clientbuttons, buttons = clientbuttons } },
screen = awful.screen.preferred,
placement = awful.placement.no_overlap+awful.placement.no_offscreen
}
},
} }
-- }}} -- }}}
-- {{{ Signals -- {{{ Signals
-- Signal function to execute when a new client appears. -- Signal function to execute when a new client appears.
client.connect_signal("manage", function (c) client.connect_signal("manage", function (c, startup)
-- Set the windows at the slave, -- Enable sloppy focus
-- i.e. put it at the end of others instead of setting it master. c:connect_signal("mouse::enter", function(c)
-- if not awesome.startup then awful.client.setslave(c) end if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
and awful.client.focus.filter(c) then
client.focus = c
end
end)
if awesome.startup and if not startup then
not c.size_hints.user_position -- Set the windows at the slave,
and not c.size_hints.program_position then -- i.e. put it at the end of others instead of setting it master.
-- Prevent clients from being unreachable after screen count changes. -- awful.client.setslave(c)
awful.placement.no_offscreen(c)
-- Put windows in a smart way, only if they does not set an initial position.
if not c.size_hints.user_position and not c.size_hints.program_position then
awful.placement.no_overlap(c)
awful.placement.no_offscreen(c)
end
end end
end)
-- Add a titlebar if titlebars_enabled is set to true in the rules. local titlebars_enabled = false
client.connect_signal("request::titlebars", function(c) if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
-- buttons for the titlebar -- Widgets that are aligned to the left
local buttons = awful.util.table.join( local left_layout = wibox.layout.fixed.horizontal()
awful.button({ }, 1, function() left_layout:add(awful.titlebar.widget.iconwidget(c))
client.focus = c
c:raise()
awful.mouse.client.move(c)
end),
awful.button({ }, 3, function()
client.focus = c
c:raise()
awful.mouse.client.resize(c)
end)
)
awful.titlebar(c) : setup { -- Widgets that are aligned to the right
{ -- Left local right_layout = wibox.layout.fixed.horizontal()
awful.titlebar.widget.iconwidget(c), right_layout:add(awful.titlebar.widget.floatingbutton(c))
buttons = buttons, right_layout:add(awful.titlebar.widget.maximizedbutton(c))
layout = wibox.layout.fixed.horizontal right_layout:add(awful.titlebar.widget.stickybutton(c))
}, right_layout:add(awful.titlebar.widget.ontopbutton(c))
{ -- Middle right_layout:add(awful.titlebar.widget.closebutton(c))
{ -- Title
align = "center",
widget = awful.titlebar.widget.titlewidget(c)
},
buttons = buttons,
layout = wibox.layout.flex.horizontal
},
{ -- Right
awful.titlebar.widget.floatingbutton (c),
awful.titlebar.widget.maximizedbutton(c),
awful.titlebar.widget.stickybutton (c),
awful.titlebar.widget.ontopbutton (c),
awful.titlebar.widget.closebutton (c),
layout = wibox.layout.fixed.horizontal()
},
layout = wibox.layout.align.horizontal
}
end)
-- Enable sloppy focus, so that focus follows mouse. -- The title goes in the middle
client.connect_signal("mouse::enter", function(c) local title = awful.titlebar.widget.titlewidget(c)
if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier title:buttons(awful.util.table.join(
and awful.client.focus.filter(c) then awful.button({ }, 1, function()
client.focus = c client.focus = c
c:raise()
awful.mouse.client.move(c)
end),
awful.button({ }, 3, function()
client.focus = c
c:raise()
awful.mouse.client.resize(c)
end)
))
-- Now bring it all together
local layout = wibox.layout.align.horizontal()
layout:set_left(left_layout)
layout:set_right(right_layout)
layout:set_middle(title)
awful.titlebar(c):set_widget(layout)
end end
end) end)

2
tyrannical

@ -1 +1 @@
Subproject commit cb815e970c4f73cdd1bb5a8551078850ffae0ab6 Subproject commit d2b2cf5e91f9f72dd03b788362f21a5fa2678a28

3
util.lua
View File

@ -5,14 +5,13 @@ local aw_client = require("awful.client")
local aw_layout = require("awful.layout") local aw_layout = require("awful.layout")
local aw_key = require("awful.key") local aw_key = require("awful.key")
local aw_prompt = require("awful.prompt") local aw_prompt = require("awful.prompt")
local aw_screen = require("awful.screen")
local tyrannical = require("tyrannical") local tyrannical = require("tyrannical")
local util = {} local util = {}
function util.add_tag() function util.add_tag()
aw_prompt.run({ prompt = "New tag name: " }, aw_prompt.run({ prompt = "New tag name: " },
aw_screen.focused().mypromptbox.widget, mypromptbox[mouse.screen].widget,
function(new_name) function(new_name)
if not new_name or #new_name == 0 then if not new_name or #new_name == 0 then
return return

2
vicious

@ -1 +1 @@
Subproject commit 211a2bfcf541b7821bd06fc97ba6e3c9ee8b6d94 Subproject commit 02e1142749d219dbd6bb9af95c87a3a39ba19dc3