From 07f64c2c23a1ceaf22ca34d5f7644516e35d237f Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sun, 8 Jan 2017 14:19:51 +0100 Subject: [PATCH] multicolor ported to 4.0 --- README.rst | 3 +- freedesktop | 2 +- lain | 2 +- rc.lua.blackburn | 8 +- rc.lua.copland | 13 +- rc.lua.dremora | 8 +- rc.lua.multicolor | 743 ++++++++++++++++++++---------------- themes/multicolor/theme.lua | 16 +- 8 files changed, 440 insertions(+), 355 deletions(-) diff --git a/README.rst b/README.rst index 5470f11..fe8491b 100644 --- a/README.rst +++ b/README.rst @@ -11,6 +11,7 @@ I am in the process of updating to awesome 4.0. Currently, the ported themes are - blackburn - copland - dremora +- multicolor ------------------------- Themes for Awesome WM 4.x @@ -24,7 +25,7 @@ Themes for Awesome WM 4.x Description =========== -A set of themes with the aim of making Awesome_ appearance awesome too! +A set of themes for the Awesome_ window manager. Notable features ================ diff --git a/freedesktop b/freedesktop index 67af64e..a81d6bd 160000 --- a/freedesktop +++ b/freedesktop @@ -1 +1 @@ -Subproject commit 67af64e08a23cb0126294a3f536ac2aef0d58e83 +Subproject commit a81d6bdc7da07b9a7bfb9012fc9ebcb6bb893076 diff --git a/lain b/lain index 42ef1c3..2f1f0c5 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 42ef1c3f3d6e2431d44cc710f8862cdb7c11a645 +Subproject commit 2f1f0c572a85f3d393315b6b63aff12a063649b3 diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 99bf284..df07ec0 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -543,9 +543,9 @@ globalkeys = awful.util.table.join( awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end), -- User programs - awful.key({ modkey }, "q", function () awful.util.spawn(browser) end), - awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end), - awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end), + awful.key({ modkey }, "q", function () awful.spawn(browser) end), + awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end), + awful.key({ modkey }, "g", function () awful.spawn(graphics) end), --[[ Default -- Prompt @@ -564,7 +564,7 @@ globalkeys = awful.util.table.join( -- dmenu awful.key({ modkey }, "x", function () - awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", + awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus)) end) ) diff --git a/rc.lua.copland b/rc.lua.copland index d7eb17c..9fe7ff5 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -124,6 +124,7 @@ red = "#EB8F8F" green = "#8FEB8F" -- Textclock +--os.setlocale(os.getenv("LANG")) -- to localize the clock mytextclock = awful.widget.textclock(" %H:%M ") -- Calendar @@ -221,7 +222,7 @@ batupd = lain.widgets.bat({ end }) batbg = wibox.container.background(batbar, "#474747", shape.rectangle) -batwidget = wibox.container.margin(batbg, 2, 7, 4, 4) +batwidget = wibox.container.margin(batbg, 2, 7, 4, 4) -- /home fs fsicon = wibox.widget.imagebox(beautiful.disk) @@ -248,7 +249,7 @@ fshome = lain.widgets.fs({ end }) fsbg = wibox.container.background(fsbar, "#474747", shape.rectangle) -fswidget = wibox.container.margin(fsbg, 2, 7, 4, 4) +fswidget = wibox.container.margin(fsbg, 2, 7, 4, 4) -- ALSA volume bar volicon = wibox.widget.imagebox(beautiful.vol) @@ -615,9 +616,9 @@ globalkeys = awful.util.table.join( awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end), -- User programs - awful.key({ modkey }, "q", function () awful.util.spawn(browser) end), - awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end), - awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end), + awful.key({ modkey }, "q", function () awful.spawn(browser) end), + awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end), + awful.key({ modkey }, "g", function () awful.spawn(graphics) end), --[[ Default -- Prompt @@ -636,7 +637,7 @@ globalkeys = awful.util.table.join( -- dmenu awful.key({ modkey }, "x", function () - awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", + awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus)) end) ) diff --git a/rc.lua.dremora b/rc.lua.dremora index 9c8e77e..152f6ce 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -543,9 +543,9 @@ globalkeys = awful.util.table.join( awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end), -- User programs - awful.key({ modkey }, "q", function () awful.util.spawn(browser) end), - awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end), - awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end), + awful.key({ modkey }, "q", function () awful.spawn(browser) end), + awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end), + awful.key({ modkey }, "g", function () awful.spawn(graphics) end), --[[ Default -- Prompt @@ -564,7 +564,7 @@ globalkeys = awful.util.table.join( -- dmenu awful.key({ modkey }, "x", function () - awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", + awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus)) end) ) diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 24678e7..4fbbb39 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -1,3 +1,4 @@ + --[[ Multicolor Awesome WM config 2.0 @@ -6,15 +7,15 @@ --]] -- {{{ Required libraries -local gears = require("gears") -local awful = require("awful") -awful.rules = require("awful.rules") - require("awful.autofocus") -local wibox = require("wibox") -local beautiful = require("beautiful") -local naughty = require("naughty") -local lain = require("lain") ---local menubar = require("menubar") +local gears = require("gears") +local awful = require("awful") + require("awful.autofocus") +local wibox = require("wibox") +local beautiful = require("beautiful") +local naughty = require("naughty") +local lain = require("lain") +--local menubar = require("menubar") +local hotkeys_popup = require("awful.hotkeys_popup").widget -- }}} -- {{{ Error handling @@ -32,20 +33,20 @@ do naughty.notify({ preset = naughty.config.presets.critical, title = "Oops, an error happened!", - text = err }) + text = tostring(err) }) in_error = false end) end -- }}} -- {{{ Autostart applications -function run_once(cmd) +local function run_once(cmd) findme = cmd firstspace = cmd:find(" ") if firstspace then findme = cmd:sub(0, firstspace-1) end - awful.util.spawn_with_shell("pgrep -u $USER -x " .. findme .. " > /dev/null || (" .. cmd .. ")") + awful.spawn.with_shell(string.format("pgrep -u $USER -x %s > /dev/null || (%s)", findme, cmd)) end run_once("urxvtd") @@ -62,67 +63,67 @@ modkey = "Mod4" altkey = "Mod1" terminal = "urxvtc" or "xterm" editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor -- user defined browser = "firefox" gui_editor = "gvim" graphics = "gimp" -mail = terminal .. " -e mutt " -local layouts = { - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, - 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, -} +-- lain +lain.layout.termfair.nmaster = 3 +lain.layout.termfair.ncol = 1 +lain.layout.centerfair.nmaster = 3 +lain.layout.centerfair.ncol = 1 -- quake terminal local quakeconsole = {} -for s = 1, screen.count() do +for s in screen do quakeconsole[s] = lain.util.quake({ app = terminal }) end -- }}} --- {{{ Tags -tags = { - names = { "web", "term", "docs", "media", "files", "other" }, - layout = { layouts[1], layouts[3], layouts[4], layouts[1], layouts[7], layouts[1] } -} -for s = 1, screen.count() do --- Each screen has its own tag table. - tags[s] = awful.tag(tags.names, s, tags.layout) -end --- }}} +-- {{{ Helper functions +local function client_menu_toggle_fn() + local instance = nil --- {{{ Wallpaper -if beautiful.wallpaper then - for s = 1, screen.count() do - gears.wallpaper.maximized(beautiful.wallpaper, s, true) + return function () + if instance and instance.wibox.visible then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ theme = { width = 250 } }) + end end end -- }}} -- {{{ Menu -mymainmenu = awful.menu.new({ items = require("freedesktop").menu.build(), - theme = { height = 16, width = 130 }}) --- Menubar configuration ---menubar.utils.terminal = terminal -- Set the terminal for applications that require it +myawesomemenu = { + { "hotkeys", function() return false, hotkeys_popup.show_help end }, + { "manual", terminal .. " -e man awesome" }, + { "edit config", string.format("%s -e %s %s", terminal, editor, awesome.conffile) }, + { "restart", awesome.restart }, + { "quit", function() awesome.quit() end } +} +mymainmenu = awful.menu({ + items = { + { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "applications", require("freedesktop").menu.build() }, + { "open terminal", terminal }, + } +}) +--menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it -- }}} -- {{{ Wibox -markup = lain.util.markup +markup = lain.util.markup -- Textclock +os.setlocale(os.getenv("LANG")) -- to localize the clock clockicon = wibox.widget.imagebox(beautiful.widget_clock) ---mytextclock = awful.widget.textclock(markup("#7788af", "%A %d %B ") .. markup("#343639", ">") .. markup("#de5e1e", " %H:%M ")) -mytextclock = lain.widgets.abase({ +mytextclock = awful.widget.textclock(markup("#7788af", "%A %d %B ") .. markup("#535f7a", ">") .. markup("#de5e1e", " %H:%M ")) +--[[ +mytextclock = lain.widgets.base({ timeout = 60, cmd = "date +'%A %d %B %R'", settings = function() @@ -134,6 +135,7 @@ mytextclock = lain.widgets.abase({ widget:set_markup(markup("#7788af", t_output) .. markup("#343639", " > ") .. markup("#de5e1e", o_it(1)) .. " ") end }) +]] -- Calendar lain.widgets.calendar.attach(mytextclock, { font_size = 10 }) @@ -142,6 +144,7 @@ lain.widgets.calendar.attach(mytextclock, { font_size = 10 }) weathericon = wibox.widget.imagebox(beautiful.widget_weather) myweather = lain.widgets.weather({ city_id = 123456, -- placeholder + weather_na_markup = markup("#eca4c4", "N/A "), settings = function() descr = weather_now["weather"][1]["description"]:lower() units = math.floor(weather_now["main"]["temp"]) @@ -151,7 +154,7 @@ myweather = lain.widgets.weather({ -- / fs fsicon = wibox.widget.imagebox(beautiful.widget_fs) -fswidget = lain.widgets.fs({ +fsroot = lain.widgets.fs({ settings = function() widget:set_markup(markup("#80d9d8", fs_now.used .. "% ")) end @@ -160,7 +163,6 @@ fswidget = lain.widgets.fs({ --[[ Mail IMAP check -- commented because it needs to be set before use mailicon = wibox.widget.imagebox() -mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end))) mailwidget = lain.widgets.imap({ timeout = 180, server = "server", @@ -172,7 +174,10 @@ mailwidget = lain.widgets.imap({ widget:set_markup(markup("#cccccc", mailcount .. " ")) else widget:set_text("") - mailicon:set_image(nil) + --mailicon:set_image() -- not working in 4.0 + mailicon._private.image = nil + mailicon:emit_signal("widget::redraw_needed") + mailicon:emit_signal("widget::layout_changed") end end }) @@ -199,17 +204,20 @@ tempwidget = lain.widgets.temp({ baticon = wibox.widget.imagebox(beautiful.widget_batt) batwidget = lain.widgets.bat({ settings = function() - perc = bat_now.perc .. "% " - if bat_now.ac_status == 1 then - perc = perc .. "Plug " + if bat_now.perc ~= "N/A" then + bat_now.perc = bat_now.perc .. "%" end - widget:set_text(perc) + if bat_now.ac_status == 1 then + bat_now.perc = bat_now.perc .. " plug" + end + + widget:set_text(bat_now.perc .. " ") end }) -- ALSA volume volicon = wibox.widget.imagebox(beautiful.widget_vol) -volumewidget = lain.widgets.alsa({ +volume = lain.widgets.alsa({ settings = function() if volume_now.status == "off" then volume_now.level = volume_now.level .. "M" @@ -265,35 +273,34 @@ mpdwidget = lain.widgets.mpd({ else artist = "" title = "" - mpdicon:set_image(nil) + --mpdicon:set_image() -- not working in 4.0 + mpdicon._private.image = nil + mpdicon:emit_signal("widget::redraw_needed") + mpdicon:emit_signal("widget::layout_changed") end widget:set_markup(markup("#e54c62", artist) .. markup("#b2b2b2", title)) end }) --- Spacer -spacer = wibox.widget.textbox(" ") - --- }}} - --- {{{ Layout - -- Create a wibox for each screen and add it -mywibox = {} -mybottomwibox = {} -mypromptbox = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), +local taglist_buttons = awful.util.table.join( + awful.button({ }, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 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) - ) -mytasklist = {} -mytasklist.buttons = awful.util.table.join( + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) + ) + +local tasklist_buttons = awful.util.table.join( awful.button({ }, 1, function (c) if c == client.focus then c.minimized = true @@ -301,8 +308,8 @@ mytasklist.buttons = awful.util.table.join( -- Without this, the following -- :isvisible() makes no sense c.minimized = false - if not c:isvisible() then - awful.tag.viewonly(c:tags()[1]) + if not c:isvisible() and c.first_tag then + c.first_tag:view_only() end -- This will also un-minimize -- the client, if needed @@ -310,109 +317,125 @@ mytasklist.buttons = awful.util.table.join( c:raise() end end), - awful.button({ }, 3, function () - if instance then - instance:hide() - instance = nil - else - instance = awful.menu.clients({ width=250 }) - end - end), + awful.button({ }, 3, client_menu_toggle_fn()), awful.button({ }, 4, function () awful.client.focus.byidx(1) - if client.focus then client.focus:raise() end end), awful.button({ }, 5, function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end end)) -for s = 1, screen.count() do +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + 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) + + awful.tag({ "web", "term", "docs", "media", "files", "other" }, s, { + awful.layout.suit.floating, + awful.layout.suit.tile, + awful.layout.suit.tile.left, + 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 + }) -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt() - - + 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. - 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))) - + 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), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) -- Create a tasklist widget - mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) - -- Create the upper wibox - mywibox[s] = awful.wibox({ position = "top", screen = s, height = 20 }) - --border_width = 0, height = 20 }) + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s, height = 20 }) - -- Widgets that are aligned to the upper left - local left_layout = wibox.layout.fixed.horizontal() - left_layout:add(mytaglist[s]) - left_layout:add(mypromptbox[s]) - left_layout:add(mpdicon) - left_layout:add(mpdwidget) - - -- Widgets that are aligned to the upper right - local right_layout = wibox.layout.fixed.horizontal() - if s == 1 then right_layout:add(wibox.widget.systray()) end - --right_layout:add(mailicon) - --right_layout:add(mailwidget) - right_layout:add(netdownicon) - right_layout:add(netdowninfo) - right_layout:add(netupicon) - right_layout:add(netupinfo) - right_layout:add(volicon) - right_layout:add(volumewidget) - right_layout:add(memicon) - right_layout:add(memwidget) - right_layout:add(cpuicon) - right_layout:add(cpuwidget) - right_layout:add(fsicon) - right_layout:add(fswidget) - right_layout:add(weathericon) - right_layout:add(myweather) - right_layout:add(tempicon) - right_layout:add(tempwidget) - right_layout:add(baticon) - right_layout:add(batwidget) - right_layout:add(clockicon) - right_layout:add(mytextclock) - - -- 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) + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + --s.mylayoutbox, + s.mytaglist, + s.mypromptbox, + mpdicon, + mpdwidget, + }, + --s.mytasklist, -- Middle widget + nil, + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + mailicon, + mailwidget, + netdownicon, + netdowninfo, + netupicon, + netupinfo, + volicon, + volume, + memicon, + memwidget, + cpuicon, + cpuwidget, + fsicon, + fsroot, + weathericon, + myweather, + tempicon, + tempwidget, + baticon, + batwidget, + clockicon, + mytextclock, + }, + } -- Create the bottom wibox - mybottomwibox[s] = awful.wibox({ position = "bottom", screen = s, border_width = 0, height = 20 }) - --mybottomwibox[s].visible = false + s.mybottomwibox = awful.wibar({ position = "bottom", screen = s, border_width = 0, height = 20 }) - -- Widgets that are aligned to the bottom left - bottom_left_layout = wibox.layout.fixed.horizontal() - - -- Widgets that are aligned to the bottom right - bottom_right_layout = wibox.layout.fixed.horizontal() - bottom_right_layout:add(mylayoutbox[s]) - - -- Now bring it all together (with the tasklist in the middle) - bottom_layout = wibox.layout.align.horizontal() - bottom_layout:set_left(bottom_left_layout) - bottom_layout:set_middle(mytasklist[s]) - bottom_layout:set_right(bottom_right_layout) - mybottomwibox[s]:set_widget(bottom_layout) -end + -- Add widgets to the bottom wibox + s.mybottomwibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + s.mylayoutbox, + }, + } +end) -- }}} --- {{{ Mouse Bindings +-- {{{ Mouse bindings root.buttons(awful.util.table.join( awful.button({ }, 3, function () mymainmenu:toggle() end), awful.button({ }, 4, awful.tag.viewnext), @@ -426,26 +449,36 @@ globalkeys = awful.util.table.join( -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot awful.key({ altkey }, "p", function() os.execute("screenshot") end), + -- Hotkeys + awful.key({ modkey, }, "s", hotkeys_popup.show_help, + {description="show help", group="awesome"}), -- Tag browsing - awful.key({ modkey }, "Left", awful.tag.viewprev ), - awful.key({ modkey }, "Right", awful.tag.viewnext ), - awful.key({ modkey }, "Escape", awful.tag.history.restore), + awful.key({ modkey, }, "Left", awful.tag.viewprev, + {description = "view previous", group = "tag"}), + awful.key({ modkey, }, "Right", awful.tag.viewnext, + {description = "view next", group = "tag"}), + awful.key({ modkey, }, "Escape", awful.tag.history.restore, + {description = "go back", group = "tag"}), -- Non-empty tag browsing - awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), - awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), + awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end, + {description = "view previous nonempty", group = "tag"}), + awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end, + {description = "view previous nonempty", group = "tag"}), -- Default client focus - awful.key({ altkey }, "k", + awful.key({ altkey, }, "j", function () awful.client.focus.byidx( 1) - if client.focus then client.focus:raise() end - end), - awful.key({ altkey }, "j", + end, + {description = "focus next by index", group = "client"} + ), + awful.key({ altkey, }, "k", function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end - end), + end, + {description = "focus previous by index", group = "client"} + ), -- By direction client focus awful.key({ modkey }, "j", @@ -468,106 +501,146 @@ globalkeys = awful.util.table.join( awful.client.focus.bydirection("right") if client.focus then client.focus:raise() end end), - - -- Show Menu - awful.key({ modkey }, "w", - function () - mymainmenu:show({ keygrabber = true }) - end), - - -- Show/Hide Wibox - awful.key({ modkey }, "b", function () - mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible - mybottomwibox[mouse.screen].visible = not mybottomwibox[mouse.screen].visible - end), + awful.key({ modkey, }, "w", function () mymainmenu:show() end, + {description = "show main menu", group = "awesome"}), -- 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, "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, + {description = "swap with previous client by index", group = "client"}), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, + {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", function () awful.client.focus.history.previous() if client.focus then client.focus:raise() end - end), - awful.key({ altkey, "Shift" }, "l", function () awful.tag.incmwfact( 0.05) end), - awful.key({ altkey, "Shift" }, "h", function () awful.tag.incmwfact(-0.05) end), - awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), - awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), - awful.key({ modkey, "Control" }, "h", 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({ modkey, "Control" }, "n", awful.client.restore), + end, + {description = "go back", group = "client"}), + + -- Show/Hide Wibox + awful.key({ modkey }, "b", function () + for s in screen do + s.mywibox.visible = not s.mywibox.visible + s.mybottomwibox.visible = not s.mybottomwibox.visible + end + end), + + -- On the fly useless gaps change + awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), + awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + + -- Rename tag + awful.key({ altkey, "Shift" }, "r", function () lain.util.rename_tag() 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({ modkey, }, "Return", function () awful.spawn(terminal) end, + {description = "open a terminal", group = "launcher"}), + awful.key({ modkey, "Control" }, "r", awesome.restart, + {description = "reload awesome", group = "awesome"}), + awful.key({ modkey, "Shift" }, "q", awesome.quit, + {description = "quit awesome", group = "awesome"}), + + awful.key({ altkey, "Shift" }, "l", function () awful.tag.incmwfact( 0.05) end, + {description = "increase master width factor", group = "layout"}), + awful.key({ altkey, "Shift" }, "h", function () awful.tag.incmwfact(-0.05) end, + {description = "decrease master width factor", group = "layout"}), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, + {description = "increase the number of master clients", group = "layout"}), + awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, + {description = "decrease the number of master clients", group = "layout"}), + 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", + function () + local c = awful.client.restore() + -- Focus restored client + if c then + client.focus = c + c:raise() + end + end, + {description = "restore minimized", group = "client"}), -- Dropdown terminal awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fswidget.show(7) end), + awful.key({ altkey, }, "h", function () fsroot.show(7, "--exclude-type=tmpfs") end), awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", function () - os.execute(string.format("amixer set %s 1%%+", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 1%%+", volume.channel)) + volume.notify() end), awful.key({ altkey }, "Down", function () - os.execute(string.format("amixer set %s 1%%-", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 1%%-", volume.channel)) + volume.notify() end), awful.key({ altkey }, "m", function () - os.execute(string.format("amixer set %s toggle", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s toggle", volume.togglechannel or volume.channel)) + volume.notify() end), awful.key({ altkey, "Control" }, "m", function () - os.execute(string.format("amixer set %s 100%%", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 100%%", volume.channel)) + volume.notify() end), + awful.key({ altkey, "Control" }, "0", + function () + os.execute(string.format("amixer -q set %s 0%%", volume.channel)) + volume.notify() + end), + -- MPD control awful.key({ altkey, "Control" }, "Up", function () - awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle") + awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") mpdwidget.update() end), awful.key({ altkey, "Control" }, "Down", function () - awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop") + awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") mpdwidget.update() end), awful.key({ altkey, "Control" }, "Left", function () - awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev") + awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") mpdwidget.update() end), awful.key({ altkey, "Control" }, "Right", function () - awful.util.spawn_with_shell("mpc next || ncmpc next || pms next") + awful.spawn.with_shell("mpc next || ncmpc next || pms next") mpdwidget.update() end), + --]] - -- Copy to clipboard - awful.key({ modkey }, "c", function () os.execute("xsel -p -o | xsel -i -b") end), + -- Copy primary to clipboard + awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end), -- User programs - awful.key({ modkey }, "q", function () awful.util.spawn(browser) end), - awful.key({ modkey }, "s", function () awful.util.spawn(gui_editor) end), - awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end), + awful.key({ modkey }, "q", function () awful.spawn(browser) end), + awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end), + awful.key({ modkey }, "g", function () awful.spawn(graphics) end), --[[ Default -- Prompt @@ -586,74 +659,92 @@ globalkeys = awful.util.table.join( -- dmenu awful.key({ modkey }, "x", function () - awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", + awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'", beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus)) 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({ altkey, "Shift" }, "m", lain.util.magnify_client ), + awful.key({ modkey, }, "f", + 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, }, "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), + end , + {description = "minimize", group = "client"}), awful.key({ modkey, }, "m", function (c) - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical - end) + c.maximized = not c.maximized + c:raise() + end , + {description = "maximize", group = "client"}) ) -- Bind all key numbers to tags. --- be careful: we use keycodes to make it works on any keyboard layout. +-- Be careful: we use keycodes to make it works on any keyboard layout. -- This should map on the top row of your keyboard, usually 1 to 9. for i = 1, 9 do globalkeys = awful.util.table.join(globalkeys, -- View tag only. awful.key({ modkey }, "#" .. i + 9, function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] + local screen = awful.screen.focused() + local tag = screen.tags[i] if tag then - awful.tag.viewonly(tag) + tag:view_only() end - end), - -- Toggle tag. + end, + {description = "view tag #"..i, group = "tag"}), + -- Toggle tag display. awful.key({ modkey, "Control" }, "#" .. i + 9, function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] + local screen = awful.screen.focused() + local tag = screen.tags[i] if tag then awful.tag.viewtoggle(tag) end - end), + end, + {description = "toggle tag #" .. i, group = "tag"}), -- Move client to tag. awful.key({ modkey, "Shift" }, "#" .. i + 9, function () if client.focus then - local tag = awful.tag.gettags(client.focus.screen)[i] + local tag = client.focus.screen.tags[i] if tag then - awful.client.movetotag(tag) + client.focus:move_to_tag(tag) end end - end), - -- Toggle tag. + end, + {description = "move focused client to tag #"..i, group = "tag"}), + -- Toggle tag on focused client. awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function () if client.focus then - local tag = awful.tag.gettags(client.focus.screen)[i] + local tag = client.focus.screen.tags[i] if tag then - awful.client.toggletag(tag) + client.focus:toggle_tag(tag) end end - end)) + end, + {description = "toggle focused client on tag #" .. i, group = "tag"}) + ) end clientbuttons = awful.util.table.join( @@ -666,6 +757,7 @@ root.keys(globalkeys) -- }}} -- {{{ Rules +-- Rules to apply to new clients (through the "manage" signal). awful.rules.rules = { -- All clients will match this rule. { rule = { }, @@ -675,15 +767,19 @@ awful.rules.rules = { raise = true, keys = clientkeys, buttons = clientbuttons, - size_hints_honor = false } }, + screen = awful.screen.preferred, + placement = awful.placement.no_overlap+awful.placement.no_offscreen, + size_hints_honor = false + } + }, + + -- Titlebars + { rule_any = { type = { "dialog", "normal" } }, + properties = { titlebars_enabled = false } }, + + -- Set Firefox to always map on the first tag on screen 1. { rule = { class = "Firefox" }, - properties = { tag = tags[1][1] } }, - - { rule = { instance = "plugin-container" }, - properties = { tag = tags[1][1] } }, - - { rule = { class = "Gimp" }, - properties = { tag = tags[1][4] } }, + properties = { screen = 1, tag = awful.screen.focused().tags[1] } }, { rule = { class = "Gimp", role = "gimp-image-window" }, properties = { maximized_horizontal = true, @@ -692,66 +788,78 @@ awful.rules.rules = { -- }}} -- {{{ Signals --- signal function to execute when a new client appears. -local sloppyfocus_last = {c=nil} -client.connect_signal("manage", function (c, startup) - -- Enable sloppy focus - client.connect_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - -- Skip focusing the client if the mouse wasn't moved. - if c ~= sloppyfocus_last.c then - client.focus = c - sloppyfocus_last.c = c - end - end - end) +-- Signal function to execute when a new client appears. +client.connect_signal("manage", function (c) + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- if not awesome.startup then awful.client.setslave(c) end - local titlebars_enabled = false - if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then - -- buttons for the titlebar - local buttons = awful.util.table.join( - awful.button({ }, 1, function() - 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) - ) - - -- widgets that are aligned to the right - local right_layout = wibox.layout.fixed.horizontal() - right_layout:add(awful.titlebar.widget.floatingbutton(c)) - right_layout:add(awful.titlebar.widget.maximizedbutton(c)) - right_layout:add(awful.titlebar.widget.stickybutton(c)) - right_layout:add(awful.titlebar.widget.ontopbutton(c)) - right_layout:add(awful.titlebar.widget.closebutton(c)) - - -- the title goes in the middle - local middle_layout = wibox.layout.flex.horizontal() - local title = awful.titlebar.widget.titlewidget(c) - title:set_align("center") - middle_layout:add(title) - middle_layout:buttons(buttons) - - -- now bring it all together - local layout = wibox.layout.align.horizontal() - layout:set_right(right_layout) - layout:set_middle(middle_layout) - - awful.titlebar(c,{size=16}):set_widget(layout) + if awesome.startup and + not c.size_hints.user_position + and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count changes. + awful.placement.no_offscreen(c) end end) --- No border for maximized or single clients +-- Add a titlebar if titlebars_enabled is set to true in the rules. +client.connect_signal("request::titlebars", function(c) + -- buttons for the titlebar + local buttons = awful.util.table.join( + awful.button({ }, 1, function() + 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, {size = 16}) : setup { + { -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { -- Middle + { -- 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. +--[[ +client.connect_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end +end) +]] + +-- No border for maximized clients client.connect_signal("focus", function(c) if c.maximized_horizontal == true and c.maximized_vertical == true then c.border_width = 0 + -- no borders if only 1 client visible elseif #awful.client.visible(mouse.screen) > 1 then c.border_width = beautiful.border_width c.border_color = beautiful.border_focus @@ -759,20 +867,3 @@ client.connect_signal("focus", end) client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} - --- {{{ Arrange signal handler -for s = 1, screen.count() do screen[s]:connect_signal("arrange", - function () - local clients = awful.client.visible(s) - local layout = awful.layout.getname(awful.layout.get(s)) - - if #clients > 0 then - for _, c in pairs(clients) do -- Floaters always have borders - if awful.client.floating.get(c) or layout == "floating" then - c.border_width = beautiful.border_width - end - end - end - end) -end --- }}} diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index 278327a..fa83a21 100644 --- a/themes/multicolor/theme.lua +++ b/themes/multicolor/theme.lua @@ -7,7 +7,7 @@ --]] -theme = {} +local theme = {} theme.confdir = os.getenv("HOME") .. "/.config/awesome/themes/multicolor" theme.wallpaper = theme.confdir .. "/wall.png" @@ -23,21 +23,12 @@ theme.fg_normal = "#aaaaaa" theme.fg_focus = "#ff8c00" theme.fg_urgent = "#af1d18" theme.fg_minimize = "#ffffff" -theme.fg_black = "#424242" -theme.fg_red = "#ce5666" -theme.fg_green = "#80a673" -theme.fg_yellow = "#ffaf5f" -theme.fg_blue = "#7788af" -theme.fg_magenta = "#94738c" -theme.fg_cyan = "#778baf" -theme.fg_white = "#aaaaaa" -theme.fg_blu = "#8ebdde" theme.border_width = "1" theme.border_normal = "#1c2022" theme.border_focus = "#606060" theme.border_marked = "#3ca4d8" -theme.menu_width = "110" -theme.menu_border_width = "0" +theme.menu_border_width = 0 +theme.menu_width = 130 theme.menu_fg_normal = "#aaaaaa" theme.menu_fg_focus = "#ff8c00" theme.menu_bg_normal = "#050505dd" @@ -82,5 +73,6 @@ theme.layout_fullscreen = theme.confdir .. "/icons/fullscreen.png" theme.layout_magnifier = theme.confdir .. "/icons/magnifier.png" theme.layout_floating = theme.confdir .. "/icons/floating.png" +theme.useless_gap = 0 return theme