From 6fdc24f085d71c70b30f8678c08bd9b5f331895c Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sun, 29 Jan 2017 17:42:55 +0100 Subject: [PATCH] holo modular; closes #146 --- rc.lua.holo | 909 ------------------------------------------ rc.lua.template | 4 +- themes/holo/theme.lua | 314 ++++++++++++++- 3 files changed, 302 insertions(+), 925 deletions(-) delete mode 100644 rc.lua.holo diff --git a/rc.lua.holo b/rc.lua.holo deleted file mode 100644 index d922b7f..0000000 --- a/rc.lua.holo +++ /dev/null @@ -1,909 +0,0 @@ - ---[[ - - Holo Awesome WM config 3.0 - github.com/copycat-killer - ---]] - --- {{{ Required libraries -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 -if awesome.startup_errors then - naughty.notify({ preset = naughty.config.presets.critical, - title = "Oops, there were errors during startup!", - text = awesome.startup_errors }) -end - -do - local in_error = false - awesome.connect_signal("debug::error", function (err) - if in_error then return end - in_error = true - - naughty.notify({ preset = naughty.config.presets.critical, - title = "Oops, an error happened!", - text = tostring(err) }) - in_error = false - end) -end --- }}} - --- {{{ Autostart applications -local function run_once(cmd) - findme = cmd - firstspace = cmd:find(" ") - if firstspace then - findme = cmd:sub(0, firstspace-1) - end - awful.spawn.with_shell(string.format("pgrep -u $USER -x %s > /dev/null || (%s)", findme, cmd)) -end - -run_once("urxvtd") -run_once("unclutter -root") --- }}} - --- {{{ Variable definitions --- beautiful init -beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/holo/theme.lua") - --- common -local modkey = "Mod4" -local altkey = "Mod1" -local terminal = "urxvtc" or "xterm" -local editor = os.getenv("EDITOR") or "nano" or "vi" - --- user defined -local browser = "firefox" -local gui_editor = "gvim" -local graphics = "gimp" -local musicplr = terminal .. " -e ncmpcpp " -local tagnames = { " WEB ", " TERMINAL ", " FILES ", " OTHER " } - --- table of layouts to cover with awful.layout.inc, order matters. -awful.layout.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, - -- awful.layout.suit.max.fullscreen, - -- awful.layout.suit.magnifier, - -- awful.layout.suit.corner.nw, - -- awful.layout.suit.corner.ne, - -- awful.layout.suit.corner.sw, - -- awful.layout.suit.corner.se, -} - --- lain -lain.layout.termfair.nmaster = 3 -lain.layout.termfair.ncol = 1 -lain.layout.termfair.center.nmaster = 3 -lain.layout.termfair.center.ncol = 1 --- }}} - --- {{{ 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 --- }}} - --- {{{ Menu -local 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 } -} -local mymainmenu = freedesktop.menu.build({ - icon_size = 32, - before = { - { "Awesome", myawesomemenu, beautiful.awesome_icon_white }, - -- other triads can be put here - }, - after = { - { "Open terminal", terminal }, - -- other triads can be put here - } -}) -local mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu }) ---menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it --- }}} - --- {{{ Wibar -local markup = lain.util.markup -local blue = "#80CCE6" -local space3 = markup.font("Tamsyn 3", " ") - --- Clock -local mytextclock = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%H:%M " .. markup.font("Tamsyn 4", " "))) -local clock_icon = wibox.widget.imagebox(beautiful.clock) -local clockbg = wibox.container.background(mytextclock, beautiful.bg_focus, shape.rectangle) -local clockwidget = wibox.container.margin(clockbg, 0, 3, 5, 5) - --- Calendar -local mytextcalendar = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%d %b " .. markup.font("Tamsyn 5", " "))) -local calendar_icon = wibox.widget.imagebox(beautiful.calendar) -local calbg = wibox.container.background(mytextcalendar, beautiful.bg_focus, shape.rectangle) -local calendarwidget = wibox.container.margin(calbg, 0, 0, 5, 5) -lain.widgets.calendar.attach(calendarwidget, { notification_preset = { fg = "#FFFFFF", bg = beautiful.bg_normal, position = "bottom_right", font = "Monospace 10" } }) - ---[[ Mail IMAP check --- commented because it needs to be set before use -local mail = lain.widgets.imap({ - timeout = 180, - server = "server", - mail = "mail", - password = "keyring get mail", - settings = function() - mail_notification_preset.fg = "#FFFFFF" - mail = "" - count = "" - - if mailcount > 0 then - mail = "Mail " - count = mailcount .. " " - end - - widget:set_markup(markup(blue, mail) .. markup("#FFFFFF", count)) - end -}) ---]] - --- MPD -local mpd_icon = awful.widget.launcher({ image = beautiful.mpd, command = musicplr }) -local prev_icon = wibox.widget.imagebox(beautiful.prev) -local next_icon = wibox.widget.imagebox(beautiful.nex) -local stop_icon = wibox.widget.imagebox(beautiful.stop) -local pause_icon = wibox.widget.imagebox(beautiful.pause) -local play_pause_icon = wibox.widget.imagebox(beautiful.play) -local mpd = lain.widgets.mpd({ - settings = function () - if mpd_now.state == "play" then - mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower) - mpd_now.title = mpd_now.title:upper():gsub("&.-;", string.lower) - widget:set_markup(markup.font("Tamsyn 4", " ") - .. markup.font(beautiful.taglist_font, - " " .. mpd_now.artist - .. " - " .. - mpd_now.title .. " ") .. markup.font("Tamsyn 5", " ")) - play_pause_icon:set_image(beautiful.pause) - elseif mpd_now.state == "pause" then - widget:set_markup(markup.font("Tamsyn 4", " ") .. - markup.font(beautiful.taglist_font, " MPD PAUSED ") .. - markup.font("Tamsyn 5", " ")) - play_pause_icon:set_image(beautiful.play) - else - widget:set_markup("") - play_pause_icon:set_image(beautiful.play) - end - end -}) -local musicbg = wibox.container.background(mpd.widget, beautiful.bg_focus, shape.rectangle) -local musicwidget = wibox.container.margin(musicbg, 0, 0, 5, 5) - -musicwidget:buttons(awful.util.table.join(awful.button({ }, 1, -function () awful.spawn.with_shell(musicplr) end))) -prev_icon:buttons(awful.util.table.join(awful.button({}, 1, -function () - awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") - mpd.update() -end))) -next_icon:buttons(awful.util.table.join(awful.button({}, 1, -function () - awful.spawn.with_shell("mpc next || ncmpc next || pms next") - mpd.update() -end))) -stop_icon:buttons(awful.util.table.join(awful.button({}, 1, -function () - play_pause_icon:set_image(beautiful.play) - awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") - mpd.update() -end))) -play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1, -function () - awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") - mpd.update() -end))) - --- Battery ---[[ -local bat = lain.widgets.bat({ - settings = function() - bat_header = " Bat " - bat_p = bat_now.perc .. " " - if bat_now.ac_status == 1 then - bat_p = bat_p .. "Plugged " - end - widget:set_markup(markup(blue, bat_header) .. bat_p) - end -}) ---]] - --- ALSA volume bar -local volume = lain.widgets.alsabar({ - notifications = { font = "Monospace", font_size = 10 }, - --togglechannel = "IEC958,3", - --[[ - width = 75, height = 10, border_width = 0, - colors = { - background = "#383838", - unmute = "#80CCE6", - mute = "#FF9F9F" - }, - --]] -}) ---[[ -local volumemar = wibox.container.margin(volume.bar, 0, 0, 10, 10) -local volumewidget = wibox.container.background(volumemar, beautiful.bg_focus, shape.rectangle) -volumewidget.shape_border_width = 5 -volumewidget.shape_border_color = beautiful.tasklist_bg_normal ---]] - --- CPU -local cpu_icon = wibox.widget.imagebox(beautiful.cpu) -local cpu = lain.widgets.cpu({ - settings = function() - widget:set_markup(space3 .. "CPU " .. cpu_now.usage - .. "% " .. markup.font("Tamsyn 5", " ")) - end -}) -local cpubg = wibox.container.background(cpu.widget, beautiful.bg_focus, shape.rectangle) -local cpuwidget = wibox.container.margin(cpubg, 0, 0, 5, 5) - --- Net -local netdown_icon = wibox.widget.imagebox(beautiful.net_down) -local netup_icon = wibox.widget.imagebox(beautiful.net_up) -local net = lain.widgets.net({ - settings = function() - widget:set_markup(markup.font("Tamsyn 1", " ") .. net_now.received .. " - " - .. net_now.sent .. markup.font("Tamsyn 2", " ")) - end -}) -local netbg = wibox.container.background(net.widget, beautiful.bg_focus, shape.rectangle) -local networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5) - --- Weather -local myweather = lain.widgets.weather({ - city_id = 2643743, -- placeholder (London) - notification_preset = { font = "Monospace 9", position = "bottom_right" }, -}) - --- Separators -local first = wibox.widget.textbox(' ') -local spr_small = wibox.widget.imagebox(beautiful.spr_small) -local spr_very_small = wibox.widget.imagebox(beautiful.spr_very_small) -local spr_right = wibox.widget.imagebox(beautiful.spr_right) -local spr_bottom_right = wibox.widget.imagebox(beautiful.spr_bottom_right) -local spr_left = wibox.widget.imagebox(beautiful.spr_left) -local bar = wibox.widget.imagebox(beautiful.bar) -local bottom_bar = wibox.widget.imagebox(beautiful.bottom_bar) - --- Create a wibox for each screen and add it -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, 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 - else - -- Without this, the following - -- :isvisible() makes no sense - c.minimized = false - if not c:isvisible() and c.first_tag then - c.first_tag:view_only() - end - -- This will also un-minimize - -- the client, if needed - client.focus = c - c:raise() - end - end), - awful.button({ }, 3, client_menu_toggle_fn()), - awful.button({ }, 4, function () - awful.client.focus.byidx(1) - end), - awful.button({ }, 5, function () - awful.client.focus.byidx(-1) - end)) - -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 - -local barcolor = gears.color({ - type = "linear", - from = { 32, 0 }, - to = { 32, 32 }, - stops = { {0, beautiful.bg_focus }, {0.25, "#505050"}, {1, beautiful.bg_focus} } -}) - --- 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) - - -- Tags - awful.tag(tagnames, s, awful.layout.layouts) - - -- 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), - awful.button({ }, 4, function () awful.layout.inc( 1) end), - awful.button({ }, 5, function () awful.layout.inc(-1) end))) - -- Create a taglist widget - s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons, {bg_focus = barcolor}) - - mytaglistcont = wibox.container.background(s.mytaglist, beautiful.bg_focus, shape.rectangle) - s.mytag = wibox.container.margin(mytaglistcont, 0, 0, 5, 5) - - -- Create a tasklist widget - s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons, { bg_focus = beautiful.bg_focus, shape = shape.rectangle, shape_border_width = 5, shape_border_color = beautiful.tasklist_bg_normal, align = "center" }) - - -- Create the wibox - s.mywibox = awful.wibar({ position = "top", screen = s, height = 32 }) - - -- Add widgets to the wibox - s.mywibox:setup { - layout = wibox.layout.align.horizontal, - { -- Left widgets - layout = wibox.layout.fixed.horizontal, - first, - s.mytag, - spr_small, - s.mylayoutbox, - spr_small, - s.mypromptbox, - }, - nil, -- Middle widget - { -- Right widgets - layout = wibox.layout.fixed.horizontal, - wibox.widget.systray(), - --mail, - --bat, - spr_right, - musicwidget, - bar, - prev_icon, - next_icon, - stop_icon, - play_pause_icon, - bar, - mpd_icon, - --bar, - --spr_very_small, - --volumewidget, - spr_left, - }, - } - - -- Create the bottom wibox - s.mybottomwibox = awful.wibar({ position = "bottom", screen = s, border_width = 0, height = 32 }) - s.borderwibox = awful.wibar({ position = "bottom", screen = s, height = 1, bg = beautiful.fg_focus, x = 0, y = 33}) - - -- Add widgets to the bottom wibox - s.mybottomwibox:setup { - layout = wibox.layout.align.horizontal, - { -- Left widgets - layout = wibox.layout.fixed.horizontal, - mylauncher, - }, - s.mytasklist, -- Middle widget - { -- Right widgets - layout = wibox.layout.fixed.horizontal, - spr_bottom_right, - netdown_icon, - networkwidget, - netup_icon, - bottom_bar, - cpu_icon, - cpuwidget, - bottom_bar, - calendar_icon, - calendarwidget, - bottom_bar, - clock_icon, - clockwidget, - }, - } -end) --- }}} - --- {{{ Mouse bindings -root.buttons(awful.util.table.join( - awful.button({ }, 3, function () mymainmenu:toggle() end), - awful.button({ }, 4, awful.tag.viewnext), - awful.button({ }, 5, awful.tag.viewprev) -)) --- }}} - --- {{{ Key bindings -globalkeys = awful.util.table.join( - -- Take a screenshot - -- 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, - {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, - {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, }, "j", - function () - awful.client.focus.byidx( 1) - end, - {description = "focus next by index", group = "client"} - ), - awful.key({ altkey, }, "k", - function () - awful.client.focus.byidx(-1) - end, - {description = "focus previous by index", group = "client"} - ), - - -- By direction client focus - awful.key({ modkey }, "j", - function() - awful.client.focus.bydirection("down") - if client.focus then client.focus:raise() end - end), - awful.key({ modkey }, "k", - function() - awful.client.focus.bydirection("up") - if client.focus then client.focus:raise() end - end), - awful.key({ modkey }, "h", - function() - awful.client.focus.bydirection("left") - if client.focus then client.focus:raise() end - end), - awful.key({ modkey }, "l", - function() - awful.client.focus.bydirection("right") - if client.focus then client.focus:raise() end - 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, - {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, - {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), - - -- Dynamic tagging - awful.key({ modkey, "Shift" }, "n", function () lain.util.add_tag() end), - awful.key({ modkey, "Shift" }, "r", function () lain.util.rename_tag() end), - awful.key({ modkey, "Shift" }, "Left", function () lain.util.move_tag(1) end), -- move to next tag - awful.key({ modkey, "Shift" }, "Right", function () lain.util.move_tag(-1) end), -- move to previous tag - awful.key({ modkey, "Shift" }, "d", function () lain.util.delete_tag() end), - - -- Standard program - 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 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, }, "w", function () myweather.show(7) end), - - -- ALSA volume control - awful.key({ altkey }, "Up", - function () - 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%%-", volume.channel)) - volume.notify() - end), - awful.key({ altkey }, "m", - function () - 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%%", 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.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") - mpd.update() - end), - awful.key({ altkey, "Control" }, "Down", - function () - awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") - mpd.update() - end), - awful.key({ altkey, "Control" }, "Left", - function () - awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") - mpd.update() - end), - awful.key({ altkey, "Control" }, "Right", - function () - awful.spawn.with_shell("mpc next || ncmpc next || pms next") - mpd.update() - end), - --]] - - -- Copy primary to clipboard - awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end), - - -- User programs - 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.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({ 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 , - {description = "minimize", group = "client"}), - awful.key({ modkey, }, "m", - function (c) - 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. --- 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 = awful.screen.focused() - local tag = screen.tags[i] - if tag then - tag:view_only() - end - end, - {description = "view tag #"..i, group = "tag"}), - -- Toggle tag display. - awful.key({ modkey, "Control" }, "#" .. i + 9, - function () - local screen = awful.screen.focused() - local tag = screen.tags[i] - if tag then - awful.tag.viewtoggle(tag) - 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 = client.focus.screen.tags[i] - if tag then - client.focus:move_to_tag(tag) - end - end - 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 = client.focus.screen.tags[i] - if tag then - client.focus:toggle_tag(tag) - end - end - end, - {description = "toggle focused client on tag #" .. i, group = "tag"}) - ) -end - -clientbuttons = awful.util.table.join( - awful.button({ }, 1, function (c) client.focus = c; c:raise() end), - awful.button({ modkey }, 1, awful.mouse.client.move), - awful.button({ modkey }, 3, awful.mouse.client.resize)) - --- Set keys -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, - 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 = true } }, - - -- Set Firefox to always map on the first tag on screen 1. - { rule = { class = "Firefox" }, - properties = { screen = 1, tag = screen[1].tags[1] } }, - - { rule = { class = "Gimp", role = "gimp-image-window" }, - properties = { maximized_horizontal = true, - maximized_vertical = true } }, -} --- }}} - --- {{{ Signals --- 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 - - 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) - --- 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 then -- no borders if only 1 client visible - c.border_width = 0 - elseif #awful.screen.focused().clients > 1 then - c.border_width = beautiful.border_width - c.border_color = beautiful.border_focus - end - end) -client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) --- }}} diff --git a/rc.lua.template b/rc.lua.template index 2ab63de..6eae48f 100644 --- a/rc.lua.template +++ b/rc.lua.template @@ -404,10 +404,10 @@ globalkeys = awful.util.table.join( local common = { text = "MPD widget ", position = "top_middle", timeout = 2 } if beautiful.mpd.timer.started then beautiful.mpd.timer:stop() - common.text = common.text .. lain.util.markup.bold("ON") + common.text = common.text .. lain.util.markup.bold("OFF") else beautiful.mpd.timer:start() - common.text = common.text .. lain.util.markup.bold("OFF") + common.text = common.text .. lain.util.markup.bold("ON") end naughty.notify(common) end), diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index b72f73e..a27bc51 100644 --- a/themes/holo/theme.lua +++ b/themes/holo/theme.lua @@ -1,20 +1,24 @@ --[[ - - Holo Awesome WM config 3.0 - github.com/copycat-killer - + + Holo Awesome WM theme 3.0 + github.com/copycat-killer + --]] -local theme = {} +local gears = require("gears") +local lain = require("lain") +local awful = require("awful") +local wibox = require("wibox") +local string = string +local os = { getenv = os.getenv } +local theme = {} theme.default_dir = require("awful.util").get_themes_dir() .. "default" theme.icon_dir = os.getenv("HOME") .. "/.config/awesome/themes/holo/icons" theme.wallpaper = os.getenv("HOME") .. "/.config/awesome/themes/holo/wall.png" - theme.font = "Roboto Bold 10" theme.taglist_font = "Roboto Condensed Regular 8" - theme.fg_normal = "#FFFFFF" theme.fg_focus = "#0099CC" theme.bg_focus = "#303030" @@ -27,10 +31,8 @@ theme.border_focus = "#0099CC" theme.taglist_fg_focus = "#FFFFFF" theme.tasklist_bg_normal = "#222222" theme.tasklist_fg_focus = "#4CB7DB" - theme.menu_height = 20 theme.menu_width = 160 - theme.awesome_icon = theme.icon_dir .. "/awesome_icon.png" theme.awesome_icon_white = theme.icon_dir .. "/awesome_icon_white.png" theme.vol_bg = theme.icon_dir .. "/vol_bg.png" @@ -43,7 +45,7 @@ theme.spr_bottom_right = theme.icon_dir .. "/spr_bottom theme.spr_left = theme.icon_dir .. "/spr_left.png" theme.bar = theme.icon_dir .. "/bar.png" theme.bottom_bar = theme.icon_dir .. "/bottom_bar.png" -theme.mpd = theme.icon_dir .. "/mpd.png" +theme.mpdl = theme.icon_dir .. "/mpd.png" theme.mpd_on = theme.icon_dir .. "/mpd_on.png" theme.prev = theme.icon_dir .. "/prev.png" theme.nex = theme.icon_dir .. "/next.png" @@ -55,7 +57,6 @@ theme.calendar = theme.icon_dir .. "/cal.png" theme.cpu = theme.icon_dir .. "/cpu.png" theme.net_up = theme.icon_dir .. "/net_up.png" theme.net_down = theme.icon_dir .. "/net_down.png" - theme.layout_tile = theme.icon_dir .. "/tile.png" theme.layout_tilegaps = theme.icon_dir .. "/tilegaps.png" theme.layout_tileleft = theme.icon_dir .. "/tileleft.png" @@ -69,12 +70,9 @@ theme.layout_max = theme.icon_dir .. "/max.png" theme.layout_fullscreen = theme.icon_dir .. "/fullscreen.png" theme.layout_magnifier = theme.icon_dir .. "/magnifier.png" theme.layout_floating = theme.icon_dir .. "/floating.png" - theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true - theme.useless_gap = 4 - 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" @@ -96,4 +94,292 @@ theme.titlebar_maximized_button_focus_inactive = theme.default_dir.."/titlebar/ 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" +theme.musicplr = string.format("%s -e ncmpcpp", awful.util.terminal) + +local markup = lain.util.markup +local blue = "#80CCE6" +local space3 = markup.font("Roboto 3", " ") + +-- Clock +local mytextclock = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%H:%M " .. markup.font("Roboto 4", " "))) +mytextclock.font = theme.font +local clock_icon = wibox.widget.imagebox(theme.clock) +local clockbg = wibox.container.background(mytextclock, theme.bg_focus, gears.shape.rectangle) +local clockwidget = wibox.container.margin(clockbg, 0, 3, 5, 5) + +-- Calendar +local mytextcalendar = wibox.widget.textclock(markup.fontfg(theme.font, "#FFFFFF", space3 .. "%d %b " .. markup.font("Roboto 5", " "))) +local calendar_icon = wibox.widget.imagebox(theme.calendar) +local calbg = wibox.container.background(mytextcalendar, theme.bg_focus, gears.shape.rectangle) +local calendarwidget = wibox.container.margin(calbg, 0, 0, 5, 5) +lain.widgets.calendar({ + attach_to = { mytextclock, mytextcalendar }, + notification_preset = { + fg = "#FFFFFF", + bg = theme.bg_normal, + position = "bottom_right", + font = "Monospace 10" + } +}) + +--[[ Mail IMAP check +-- commented because it needs to be set before use +local mail = lain.widgets.imap({ + timeout = 180, + server = "server", + mail = "mail", + password = "keyring get mail", + settings = function() + mail_notification_preset.fg = "#FFFFFF" + mail = "" + count = "" + + if mailcount > 0 then + mail = "Mail " + count = mailcount .. " " + end + + widget:set_markup(markup.font(theme.font, markup(blue, mail) .. markup("#FFFFFF", count))) + end +}) +--]] + +-- MPD +local mpd_icon = awful.widget.launcher({ image = theme.mpdl, command = theme.musicplr }) +local prev_icon = wibox.widget.imagebox(theme.prev) +local next_icon = wibox.widget.imagebox(theme.nex) +local stop_icon = wibox.widget.imagebox(theme.stop) +local pause_icon = wibox.widget.imagebox(theme.pause) +local play_pause_icon = wibox.widget.imagebox(theme.play) +theme.mpd = lain.widgets.mpd({ + settings = function () + if mpd_now.state == "play" then + mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower) + mpd_now.title = mpd_now.title:upper():gsub("&.-;", string.lower) + widget:set_markup(markup.font("Roboto 4", " ") + .. markup.font(theme.taglist_font, + " " .. mpd_now.artist + .. " - " .. + mpd_now.title .. " ") .. markup.font("Roboto 5", " ")) + play_pause_icon:set_image(theme.pause) + elseif mpd_now.state == "pause" then + widget:set_markup(markup.font("Roboto 4", " ") .. + markup.font(theme.taglist_font, " MPD PAUSED ") .. + markup.font("Roboto 5", " ")) + play_pause_icon:set_image(theme.play) + else + widget:set_markup("") + play_pause_icon:set_image(theme.play) + end + end +}) +local musicbg = wibox.container.background(theme.mpd.widget, theme.bg_focus, gears.shape.rectangle) +local musicwidget = wibox.container.margin(musicbg, 0, 0, 5, 5) + +musicwidget:buttons(awful.util.table.join(awful.button({ }, 1, +function () awful.spawn(theme.musicplr) end))) +prev_icon:buttons(awful.util.table.join(awful.button({}, 1, +function () + awful.spawn.with_shell("mpc prev") + mpd.update() +end))) +next_icon:buttons(awful.util.table.join(awful.button({}, 1, +function () + awful.spawn.with_shell("mpc next") + mpd.update() +end))) +stop_icon:buttons(awful.util.table.join(awful.button({}, 1, +function () + play_pause_icon:set_image(theme.play) + awful.spawn.with_shell("mpc stop") + mpd.update() +end))) +play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1, +function () + awful.spawn.with_shell("mpc toggle") + mpd.update() +end))) + +-- Battery +--[[ +local bat = lain.widgets.bat({ + settings = function() + bat_header = " Bat " + bat_p = bat_now.perc .. " " + if bat_now.ac_status == 1 then + bat_p = bat_p .. "Plugged " + end + widget:set_markup(markup.font(theme.font, markup(blue, bat_header) .. bat_p)) + end +}) +--]] +-- +-- fs +theme.fs = lain.widgets.fs({ + options = "--exclude-type=tmpfs", + notification_preset = { bg = theme.bg_normal, font = "Monospace 9, " }, +}) + +-- ALSA volume bar +theme.volume = lain.widgets.alsabar({ + notification_preset = { font = "Monospace 9"}, + --togglechannel = "IEC958,3", + width = 80, height = 10, border_width = 0, + colors = { + background = "#383838", + unmute = "#80CCE6", + mute = "#FF9F9F" + }, +}) +theme.volume.bar.paddings = 0 +theme.volume.bar.margins = 5 +local volumewidget = wibox.container.background(theme.volume.bar, theme.bg_focus, gears.shape.rectangle) +volumewidget = wibox.container.margin(volumewidget, 0, 0, 5, 5) + +-- CPU +local cpu_icon = wibox.widget.imagebox(theme.cpu) +local cpu = lain.widgets.cpu({ + settings = function() + widget:set_markup(space3 .. markup.font(theme.font, "CPU " .. cpu_now.usage + .. "% ") .. markup.font("Roboto 5", " ")) + end +}) +local cpubg = wibox.container.background(cpu.widget, theme.bg_focus, gears.shape.rectangle) +local cpuwidget = wibox.container.margin(cpubg, 0, 0, 5, 5) + +-- Net +local netdown_icon = wibox.widget.imagebox(theme.net_down) +local netup_icon = wibox.widget.imagebox(theme.net_up) +local net = lain.widgets.net({ + settings = function() + widget:set_markup(markup.font("Roboto 1", " ") .. markup.font(theme.font, net_now.received .. " - " + .. net_now.sent) .. markup.font("Roboto 2", " ")) + end +}) +local netbg = wibox.container.background(net.widget, theme.bg_focus, gears.shape.rectangle) +local networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5) + +-- Weather +theme.weather = lain.widgets.weather({ + city_id = 2643743, -- placeholder (London) + notification_preset = { font = "Monospace 9", position = "bottom_right" }, +}) + +-- Separators +local first = wibox.widget.textbox(' ') +local spr_small = wibox.widget.imagebox(theme.spr_small) +local spr_very_small = wibox.widget.imagebox(theme.spr_very_small) +local spr_right = wibox.widget.imagebox(theme.spr_right) +local spr_bottom_right = wibox.widget.imagebox(theme.spr_bottom_right) +local spr_left = wibox.widget.imagebox(theme.spr_left) +local bar = wibox.widget.imagebox(theme.bar) +local bottom_bar = wibox.widget.imagebox(theme.bottom_bar) + +local barcolor = gears.color({ + type = "linear", + from = { 32, 0 }, + to = { 32, 32 }, + stops = { {0, theme.bg_focus }, {0.25, "#505050"}, {1, theme.bg_focus} } +}) + +function theme.at_screen_connect(s) + -- Quake application + s.quake = lain.util.quake({ app = awful.util.terminal }) + + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + theme.wallpaper = theme.wallpaper(s) + end + gears.wallpaper.maximized(theme.wallpaper, s, true) + + -- Tags + awful.tag(awful.util.tagnames, s, awful.layout.layouts) + + -- 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), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) + -- Create a taglist widget + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons, { bg_focus = barcolor }) + + mytaglistcont = wibox.container.background(s.mytaglist, theme.bg_focus, gears.shape.rectangle) + s.mytag = wibox.container.margin(mytaglistcont, 0, 0, 5, 5) + + -- Create a tasklist widget + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons, { bg_focus = theme.bg_focus, shape = gears.shape.rectangle, shape_border_width = 5, shape_border_color = theme.tasklist_bg_normal, align = "center" }) + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s, height = 32 }) + + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + first, + s.mytag, + spr_small, + s.mylayoutbox, + spr_small, + s.mypromptbox, + }, + nil, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + --mail.widget, + --bat.widget, + spr_right, + musicwidget, + bar, + prev_icon, + next_icon, + stop_icon, + play_pause_icon, + bar, + mpd_icon, + bar, + spr_very_small, + volumewidget, + spr_left, + }, + } + + -- Create the bottom wibox + s.mybottomwibox = awful.wibar({ position = "bottom", screen = s, border_width = 0, height = 32 }) + s.borderwibox = awful.wibar({ position = "bottom", screen = s, height = 1, bg = theme.fg_focus, x = 0, y = 33}) + + -- Add widgets to the bottom wibox + s.mybottomwibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + mylauncher, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + spr_bottom_right, + netdown_icon, + networkwidget, + netup_icon, + bottom_bar, + cpu_icon, + cpuwidget, + bottom_bar, + calendar_icon, + calendarwidget, + bottom_bar, + clock_icon, + clockwidget, + }, + } +end + return theme