From 558a7133c475941f8bd2b2cc52651593486bd79c Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sun, 15 Jan 2017 17:15:48 +0100 Subject: [PATCH] port to 4.0 completed; closes #129 --- README.rst | 18 +- rc.lua.rainbow | 712 ++++++++++++++++++-------------- themes/rainbow/icons/vol_bg.png | Bin 175 -> 0 bytes themes/rainbow/theme.lua | 125 +++--- 4 files changed, 488 insertions(+), 367 deletions(-) delete mode 100644 themes/rainbow/icons/vol_bg.png diff --git a/README.rst b/README.rst index 57f8431..d80b60a 100644 --- a/README.rst +++ b/README.rst @@ -1,16 +1,6 @@ -=================== Awesome WM Copycats =================== -------- -Warning -------- - -I am in the process of updating to awesome 4.0. The following themes are still not ported: - -- rainbow -- steamburn - ------------------------- Themes for Awesome WM 4.x ------------------------- @@ -20,6 +10,11 @@ Themes for Awesome WM 4.x :License: BY-NC-SA_ :Source: https://github.com/copycat-killer/awesome-copycats +Warning +======= + +If you still have to use branch 3.5.x, you can refer to the commit 4c8b1da_. Be aware that it's no longer supported, so update to 4.x ASAP. + Description =========== @@ -38,7 +33,7 @@ Features - OpenWeatherMap integration - Net carrier status notifier - Symbolic tag names -- Text layoutbox +- DWM-like textual layoutbox - Cairo wibar - Custom layouts - No borders when there's only one visible client @@ -128,6 +123,7 @@ Default additional software used: :: unclutter firefox scrot mpd mpc dmenu xsel .. _BY-NC-SA: http://creativecommons.org/licenses/by-nc-sa/4.0 +.. _4c8b1da: https://github.com/copycat-killer/awesome-copycats/tree/4c8b1da4d0fc3aeea561bbd2eed5e7ca2353ad3d .. _Awesome: http://github.com/awesomeWM/awesome .. _lucamanni: https://github.com/lucamanni/awesome .. _romockee: https://github.com/romockee/powerarrow diff --git a/rc.lua.rainbow b/rc.lua.rainbow index 078777c..32b34f6 100644 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -1,3 +1,4 @@ + --[[ Rainbow Awesome WM config 2.0 @@ -6,14 +7,17 @@ --]] -- {{{ 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 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 shape = require("gears.shape") +--local menubar = require("menubar") +local freedesktop = require("freedesktop") +local hotkeys_popup = require("awful.hotkeys_popup").widget -- }}} -- {{{ Error handling @@ -31,20 +35,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") @@ -52,7 +56,6 @@ run_once("unclutter -root") -- }}} -- {{{ Variable definitions - -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/rainbow/theme.lua") @@ -61,7 +64,6 @@ 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" @@ -69,50 +71,46 @@ gui_editor = "gvim" graphics = "gimp" -- lain -lain.layout.termfair.nmaster = 3 -lain.layout.termfair.ncol = 1 - -local layouts = { - awful.layout.suit.floating, - awful.layout.suit.fair, - awful.layout.suit.tile, - lain.layout.uselessfair.horizontal, - lain.layout.uselesstile, - lain.layout.uselessfair, - lain.layout.termfair, - lain.layout.uselesspiral.dwindle -} - --- quake terminal -local quakeconsole = {} -for s = 1, screen.count() do - quakeconsole[s] = lain.util.quake({ app = terminal }) -end +lain.layout.termfair.nmaster = 3 +lain.layout.termfair.ncol = 1 +lain.layout.centerfair.nmaster = 3 +lain.layout.centerfair.ncol = 1 -- }}} --- {{{ Tags -tags = { - names = { "www", "dev", "docs", "media" }, - layout = { layouts[1], layouts[2], layouts[3], layouts[4] } -} -for s = 1, screen.count() do - 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 = freedesktop.menu.build({ + before = { + { "Awesome", myawesomemenu, beautiful.awesome_icon }, + -- other triads can be put here + }, + after = { + { "Open terminal", terminal }, + -- other triads can be put here + } +}) +--menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it -- }}} -- {{{ Wibox @@ -121,8 +119,7 @@ white = beautiful.fg_focus gray = beautiful.fg_normal -- Textclock -mytextclock = wibox.widget.textclock(markup.font("Tamsyn 3", " ") .. - markup(white, " %H:%M ")) +mytextclock = wibox.widget.textclock(markup(white, " %H:%M ")) -- Calendar lain.widgets.calendar.attach(mytextclock, { fg = beautiful.fg_focus }) @@ -173,6 +170,7 @@ mpdwidget = lain.widgets.mpd({ -- /home fs fshome = lain.widgets.fs({ partition = "/home", + options = "--exclude-type=tmpfs", settings = function() notification_preset.fg = white @@ -189,12 +187,9 @@ fshome = lain.widgets.fs({ }) -- ALSA volume bar -volume = lain.widgets.alsabar({ card = "0", ticks = true }) -volmargin = wibox.layout.margin(volume.bar, 5, 8, 80) -volmargin:set_top(7) -volmargin:set_bottom(7) -volumewidget = wibox.widget.background(volmargin) -volumewidget:set_bgimage(beautiful.vol_bg) +volume = lain.widgets.alsabar({ ticks = true, width = 67 }) +volumebg = wibox.container.background(volume.bar, "#585858", shape.rectangle) +volumewidget = wibox.container.margin(volumebg, 7, 7, 5, 5) -- Weather myweather = lain.widgets.weather({ @@ -209,20 +204,29 @@ spr = wibox.widget.textbox(' ') small_spr = wibox.widget.textbox(' ') med_spr = wibox.widget.textbox(' ') +-- Separators +first = wibox.widget.textbox(markup.font("Tamsyn 4", " ")) +spr = wibox.widget.textbox(' ') + -- Create a wibox for each screen and add it -mywibox = {} -mypromptbox = {} -txtlayoutbox = {} -mytaglist = {} -mytasklist = {} -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.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 @@ -230,8 +234,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 @@ -239,86 +243,109 @@ 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)) --- Writes a string representation of the current layout in a textbox widget -function updatelayoutbox(layout, s) - local screen = s or 1 - local txt_l = beautiful["layout_txt_" .. awful.layout.getname(awful.layout.get(screen))] or "" - layout:set_text(txt_l) +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 -for s = 1, screen.count() do - -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt() +local function update_txt_layoutbox(s) + -- Writes a string representation of the current layout in a textbox widget + local txt_l = beautiful["layout_txt_" .. awful.layout.getname(awful.layout.get(s))] or "" + s.mytxtlayoutbox:set_text(txt_l) +end - -- Create a textbox widget which will contains a short string representing the - -- layout we're using. We need one layoutbox per screen. - txtlayoutbox[s] = wibox.widget.textbox(beautiful["layout_txt_" .. awful.layout.getname(awful.layout.get(s))]) - awful.tag.attached_connect_signal(s, "property::selected", function () - updatelayoutbox(txtlayoutbox[s], s) - end) - awful.tag.attached_connect_signal(s, "property::layout", function () - updatelayoutbox(txtlayoutbox[s], s) - end) - txtlayoutbox[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))) +-- 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) + -- Quake application + s.quake = lain.util.quake({ app = terminal }) + + -- Wallpaper + set_wallpaper(s) + + awful.tag({ "www", "dev", "docs", "media" }, s, { + awful.layout.suit.floating, + awful.layout.suit.fair, + awful.layout.suit.tile, + awful.layout.suit.fair.horizontal, + lain.layout.termfair, + }) + + -- Create a promptbox for each screen + s.mypromptbox = awful.widget.prompt() + + --[[ Standard layoutbox + -- 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), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) + --]] + + -- Textual layoutbox + s.mytxtlayoutbox = wibox.widget.textbox(beautiful["layout_txt_" .. awful.layout.getname(awful.layout.get(s))]) + awful.tag.attached_connect_signal(s, "property::selected", function () update_txt_layoutbox(s) end) + awful.tag.attached_connect_signal(s, "property::layout", function () update_txt_layoutbox(s) end) + s.mytxtlayoutbox:buttons(awful.util.table.join( + awful.button({}, 1, function() awful.layout.inc(layouts, 1) end), + awful.button({}, 3, function() awful.layout.inc(layouts, -1) end), + awful.button({}, 4, function() awful.layout.inc(layouts, 1) end), + awful.button({}, 5, function() awful.layout.inc(layouts, -1) end))) -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(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 wibox - mywibox[s] = awful.wibox({ position = "top", screen = s, height = 18 }) + s.mywibox = awful.wibar({ position = "top", screen = s, height = 18 }) - -- Widgets that are aligned to the left - local left_layout = wibox.layout.fixed.horizontal() - left_layout:add(small_spr) - left_layout:add(mytaglist[s]) - left_layout:add(spr) - left_layout:add(txtlayoutbox[s]) - left_layout:add(spr) - left_layout:add(mypromptbox[s]) - - -- Widgets that are aligned to the right - local right_layout = wibox.layout.fixed.horizontal() - if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(small_spr) - right_layout:add(mpdwidget) - --right_layout:add(mailwidget) - right_layout:add(fshome) - right_layout:add(med_spr) - right_layout:add(volumewidget) - 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) -end + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + small_spr, + s.mytaglist, + spr, + s.mytxtlayoutbox, + --spr, + s.mypromptbox, + spr, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + spr, + mpdwidget, + mailwidget, + fshome, + volumewidget, + mytextclock, + }, + } +end) -- }}} -- {{{ Mouse bindings @@ -335,26 +362,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", @@ -377,73 +414,101 @@ 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 - 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), + 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 + 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"}), - -- Dropdown terminal - awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), + 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 application + awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7) end), - awful.key({ altkey, }, "w", function () myweather.show(7) end), - + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "h", function () fshome.show(7) 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 %s+", volume.channel, volume.step)) + os.execute(string.format("amixer set %s 1%%+", volume.channel)) volume.update() end), awful.key({ altkey }, "Down", function () - os.execute(string.format("amixer set %s %s-", volume.channel, volume.step)) + os.execute(string.format("amixer set %s 1%%-", volume.channel)) volume.update() end), awful.key({ altkey }, "m", function () - os.execute(string.format("amixer set %s toggle", volume.channel)) + os.execute(string.format("amixer set %s toggle", volume.togglechannel or volume.channel)) volume.update() end), awful.key({ altkey, "Control" }, "m", @@ -452,106 +517,152 @@ globalkeys = awful.util.table.join( volume.update() end), + awful.key({ altkey, "Control" }, "0", + function () + os.execute(string.format("amixer -q set %s 0%%", volume.channel)) + volume.update() + 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 + awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, + {description = "run prompt", group = "launcher"}), + + awful.key({ modkey }, "x", + function () + awful.prompt.run { + prompt = "Run Lua code: ", + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = awful.util.eval, + history_path = awful.util.get_cache_dir() .. "/history_eval" + } + end, + {description = "lua execute prompt", group = "awesome"}), + -- Menubar + awful.key({ modkey }, "p", function() menubar.show() end, + {description = "show the menubar", group = "launcher"}) + --]] + + --[[ 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( @@ -564,23 +675,29 @@ root.keys(globalkeys) -- }}} -- {{{ Rules +-- Rules to apply to new clients (through the "manage" signal). awful.rules.rules = { -- All clients will match this rule. { rule = { }, properties = { border_width = beautiful.border_width, border_color = beautiful.border_normal, focus = awful.client.focus.filter, + 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, @@ -589,66 +706,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 @@ -656,20 +785,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/rainbow/icons/vol_bg.png b/themes/rainbow/icons/vol_bg.png deleted file mode 100644 index 7778d33cf4360d5d6533eb6c59369b9171ffff89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^Za^%=!3HFs8LmhLQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#E{CjuiKghum6kvu8&4Oz6+NRQK?vu9d?S?Z8)p`sLaXgM?zHpfF@O920#@97E QKyw&8UHx3vIVCg!02^*JHUIzs diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index ca3726f..668aa73 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -6,68 +6,81 @@ --]] -theme = {} +local theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/rainbow" -theme.wallpaper = theme.dir .. "/wall.png" +theme.default_dir = require("awful.util").get_themes_dir() .. "default" +theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/rainbow" +theme.wallpaper = theme.dir .. "/wall.png" -theme.font = "Tamsyn 10.5" -theme.fg_normal = "#9E9E9E" -theme.fg_focus = "#EBEBFF" -theme.bg_normal = "#242424" -theme.bg_focus = "#242424" -theme.fg_urgent = "#000000" -theme.bg_urgent = "#FFFFFF" -theme.border_width = 1 -theme.border_normal = "#242424" -theme.border_focus = "#EBEBFF" -theme.taglist_fg_focus = "#EDEFFF" -theme.taglist_bg_focus = "#242424" -theme.menu_height = "16" -theme.menu_width = "150" +theme.font = "Tamsyn 10.5" +theme.fg_normal = "#9E9E9E" +theme.fg_focus = "#EBEBFF" +theme.bg_normal = "#242424" +theme.bg_focus = "#242424" +theme.fg_urgent = "#000000" +theme.bg_urgent = "#FFFFFF" +theme.border_width = 1 +theme.border_normal = "#242424" +theme.border_focus = "#EBEBFF" +theme.taglist_fg_focus = "#EDEFFF" +theme.taglist_bg_focus = "#242424" -theme.ocol = "" -theme.ccol = "" -theme.tasklist_sticky = theme.ocol .. "[S]" .. theme.ccol -theme.tasklist_ontop = theme.ocol .. "[T]" .. theme.ccol -theme.tasklist_floating = theme.ocol .. "[F]" .. theme.ccol -theme.tasklist_maximized_horizontal = theme.ocol .. "[M] " .. theme.ccol -theme.tasklist_maximized_vertical = "" -theme.tasklist_disable_icon = true +theme.menu_height = 16 +theme.menu_width = 140 -theme.menu_awesome_icon = theme.dir .."/icons/awesome.png" -theme.menu_submenu_icon = theme.dir .."/icons/submenu.png" -theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" -theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" -theme.vol_bg = theme.dir .. "/icons/vol_bg.png" +theme.ocol = "" +theme.tasklist_sticky = theme.ocol .. "[S]" +theme.tasklist_ontop = theme.ocol .. "[T]" +theme.tasklist_floating = theme.ocol .. "[F]" +theme.tasklist_maximized_horizontal = theme.ocol .. "[M] " +theme.tasklist_maximized_vertical = "" +theme.tasklist_disable_icon = true +theme.menu_awesome_icon = theme.dir .."/icons/awesome.png" +theme.menu_submenu_icon = theme.dir .."/icons/submenu.png" +theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" +theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" -theme.layout_txt_tile = "[t]" -theme.layout_txt_tileleft = "[l]" -theme.layout_txt_tilebottom = "[b]" -theme.layout_txt_tiletop = "[tt]" -theme.layout_txt_fairv = "[fv]" -theme.layout_txt_fairh = "[fh]" -theme.layout_txt_spiral = "[s]" -theme.layout_txt_dwindle = "[d]" -theme.layout_txt_max = "[m]" -theme.layout_txt_fullscreen = "[F]" -theme.layout_txt_magnifier = "[M]" -theme.layout_txt_floating = "[*]" +theme.useless_gap = 8 + +theme.layout_txt_tile = "[t]" +theme.layout_txt_tileleft = "[l]" +theme.layout_txt_tilebottom = "[b]" +theme.layout_txt_tiletop = "[tt]" +theme.layout_txt_fairv = "[fv]" +theme.layout_txt_fairh = "[fh]" +theme.layout_txt_spiral = "[s]" +theme.layout_txt_dwindle = "[d]" +theme.layout_txt_max = "[m]" +theme.layout_txt_fullscreen = "[F]" +theme.layout_txt_magnifier = "[M]" +theme.layout_txt_floating = "[*]" -- lain related -theme.useless_gap_width = 10 -theme.layout_txt_cascade = "[cascade]" -theme.layout_txt_cascadetile = "[cascadetile]" -theme.layout_txt_centerwork = "[centerwork]" -theme.layout_txt_termfair = "[termfair]" -theme.layout_txt_centerfair = "[centerfair]" -theme.layout_txt_uselessfair = "[uf]" -theme.layout_txt_uselessfairh = "[ufh]" -theme.layout_txt_uselesspiral = "[us]" -theme.layout_txt_uselessdwindle = "[ud]" -theme.layout_txt_uselesstile = "[ut]" -theme.layout_txt_uselesstileleft = "[utl]" -theme.layout_txt_uselesstiletop = "[utt]" -theme.layout_txt_uselesstilebottom = "[utb]" +theme.layout_txt_cascade = "[cascade]" +theme.layout_txt_cascadetile = "[cascadetile]" +theme.layout_txt_centerwork = "[centerwork]" +theme.layout_txt_termfair = "[termfair]" +theme.layout_txt_centerfair = "[centerfair]" + +theme.titlebar_close_button_normal = theme.default_dir.."/titlebar/close_normal.png" +theme.titlebar_close_button_focus = theme.default_dir.."/titlebar/close_focus.png" +theme.titlebar_minimize_button_normal = theme.default_dir.."/titlebar/minimize_normal.png" +theme.titlebar_minimize_button_focus = theme.default_dir.."/titlebar/minimize_focus.png" +theme.titlebar_ontop_button_normal_inactive = theme.default_dir.."/titlebar/ontop_normal_inactive.png" +theme.titlebar_ontop_button_focus_inactive = theme.default_dir.."/titlebar/ontop_focus_inactive.png" +theme.titlebar_ontop_button_normal_active = theme.default_dir.."/titlebar/ontop_normal_active.png" +theme.titlebar_ontop_button_focus_active = theme.default_dir.."/titlebar/ontop_focus_active.png" +theme.titlebar_sticky_button_normal_inactive = theme.default_dir.."/titlebar/sticky_normal_inactive.png" +theme.titlebar_sticky_button_focus_inactive = theme.default_dir.."/titlebar/sticky_focus_inactive.png" +theme.titlebar_sticky_button_normal_active = theme.default_dir.."/titlebar/sticky_normal_active.png" +theme.titlebar_sticky_button_focus_active = theme.default_dir.."/titlebar/sticky_focus_active.png" +theme.titlebar_floating_button_normal_inactive = theme.default_dir.."/titlebar/floating_normal_inactive.png" +theme.titlebar_floating_button_focus_inactive = theme.default_dir.."/titlebar/floating_focus_inactive.png" +theme.titlebar_floating_button_normal_active = theme.default_dir.."/titlebar/floating_normal_active.png" +theme.titlebar_floating_button_focus_active = theme.default_dir.."/titlebar/floating_focus_active.png" +theme.titlebar_maximized_button_normal_inactive = theme.default_dir.."/titlebar/maximized_normal_inactive.png" +theme.titlebar_maximized_button_focus_inactive = theme.default_dir.."/titlebar/maximized_focus_inactive.png" +theme.titlebar_maximized_button_normal_active = theme.default_dir.."/titlebar/maximized_normal_active.png" +theme.titlebar_maximized_button_focus_active = theme.default_dir.."/titlebar/maximized_focus_active.png" return theme