From 80c903e8fdca969730e9c2ea41db5c28bd06c7f6 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sun, 29 Jan 2017 16:13:15 +0100 Subject: [PATCH] steamburn modular; closes #149 --- rc.lua.steamburn | 829 ----------------------------- themes/rainbow/theme.lua | 9 +- themes/steamburn/icons/awesome.png | Bin 0 -> 188 bytes themes/steamburn/theme.lua | 229 +++++++- 4 files changed, 213 insertions(+), 854 deletions(-) delete mode 100644 rc.lua.steamburn create mode 100644 themes/steamburn/icons/awesome.png diff --git a/rc.lua.steamburn b/rc.lua.steamburn deleted file mode 100644 index fa0e0ce..0000000 --- a/rc.lua.steamburn +++ /dev/null @@ -1,829 +0,0 @@ - ---[[ - - Steamburn 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 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/steamburn/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 tagnames = { "web", "term", "docs", "media", "down" } - --- 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({ - 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 -local markup = lain.util.markup -local gray = "#94928F" - --- Textclock -local mytextclock = wibox.widget.textclock(" %H:%M ") - --- Calendar -lain.widgets.calendar.attach(mytextclock, { - notification_preset = { - font = "Tamsyn 10.5", - fg = gray, - bg = beautiful.bg_normal -}}) - ---[[ 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 = "" - count = "" - - if mailcount > 0 then - mail = "Mail " - count = mailcount .. " " - end - - widget:set_markup(markup(gray, mail) .. count) - end -}) ---]] - --- MPD -local mpd = lain.widgets.mpd({ - settings = function() - artist = mpd_now.artist .. " " - title = mpd_now.title .. " " - - if mpd_now.state == "pause" then - artist = "mpd " - title = "paused " - elseif mpd_now.state == "stop" then - artist = "" - title = "" - end - - widget:set_markup(markup(gray, artist) .. title) - end -}) - --- CPU -local cpu = lain.widgets.sysload({ - settings = function() - widget:set_markup(markup(gray, " Cpu ") .. load_1 .. " ") - end -}) - --- MEM -local mem = lain.widgets.mem({ - settings = function() - widget:set_markup(markup(gray, " Mem ") .. mem_now.used .. " ") - end -}) - --- /home fs -local fshome = lain.widgets.fs({ - options = "--exclude-type=tmpfs", - partition = "/home", - notification_preset = { fg = beautiful.fg_normal, bg = beautiful.bg_normal, font = "Tamsyn 10.5" }, -}) - --- Battery -local bat = lain.widgets.bat({ - settings = function() - bat_perc = bat_now.perc - if bat_now.ac_status == 1 then bat_perc = "Plug" end - widget:set_markup(markup(gray, " Bat ") .. bat_perc .. " ") - end -}) - --- Net checker -local net = lain.widgets.net({ - settings = function() - if net_now.state == "up" then net_state = "On" - else net_state = "Off" end - widget:set_markup(markup(gray, " Net ") .. net_state .. " ") - end -}) - --- ALSA volume -local volume = lain.widgets.alsa({ - settings = function() - header = " Vol " - vlevel = volume_now.level - - if volume_now.status == "off" then - vlevel = vlevel .. "M " - else - vlevel = vlevel .. " " - end - - widget:set_markup(markup(gray, header) .. vlevel) - end -}) - --- Weather -local myweather = lain.widgets.weather({ - city_id = 2643743, -- placeholder (London) -}) - --- Separators -local first = wibox.widget.textbox(markup.font("Tamsyn 4", " ")) -local spr = wibox.widget.textbox(' ') - --- 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 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 - --- 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() - - --[[ 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 - s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) - - -- Create a tasklist widget - s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) - - -- Create the wibox - s.mywibox = awful.wibar({ position = "top", screen = s, height = 18 }) - - -- Add widgets to the wibox - s.mywibox:setup { - layout = wibox.layout.align.horizontal, - { -- Left widgets - layout = wibox.layout.fixed.horizontal, - first, - s.mytaglist, - spr, - s.mytxtlayoutbox, - --spr, - s.mypromptbox, - spr, - }, - s.mytasklist, -- Middle widget - { -- Right widgets - layout = wibox.layout.fixed.horizontal, - wibox.widget.systray(), - spr, - mpd.widget, - --mail.widget, - cpu.widget, - mem.widget, - bat.widget, - net.widget, - volume.widget, - mytextclock - }, - } -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 - 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, }, "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 1%%+", volume.channel)) - volume.update() - end), - awful.key({ altkey }, "Down", - function () - 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.togglechannel or volume.channel)) - volume.update() - end), - awful.key({ altkey, "Control" }, "m", - function () - os.execute(string.format("amixer set %s 100%%", volume.channel)) - 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.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 = false } }, - - -- 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/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index 0ec5673..94905b9 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -37,7 +37,7 @@ 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.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" @@ -198,10 +198,6 @@ theme.weather = lain.widgets.weather({ notification_preset = { font = theme.font, fg = white } }) -local mybase = lain.widgets.abase({ - cmd = "echo 123" -}) - -- Separators local first = wibox.widget.textbox(markup.font("Misc Tamsyn 4", " ")) local spr = wibox.widget.textbox(' ') @@ -252,7 +248,7 @@ function theme.at_screen_connect(s) layout = wibox.layout.align.horizontal, { -- Left widgets layout = wibox.layout.fixed.horizontal, - small_spr, + first, s.mytaglist, spr, s.mytxtlayoutbox, @@ -268,7 +264,6 @@ function theme.at_screen_connect(s) theme.mpd.widget, --mail.widget, theme.fs.widget, - mybase.widget, volumewidget, mytextclock, }, diff --git a/themes/steamburn/icons/awesome.png b/themes/steamburn/icons/awesome.png new file mode 100644 index 0000000000000000000000000000000000000000..a1fdc1cdda61f529386535f8b2c47a0f071f8b41 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI zppNSx%;=;sy8Q$ppd7hi(`nz>Er~7oCd*T6(wnh>x+0M z7;`41BmlvpY29q|9eb8!Iq-W&NNfy{y3uUjvm#A^dtr;4#s*HQ7GGw)!|jy`{B{fs Y#?OT70@s8p01ajEboFyt=akR{0O%k#BLDyZ literal 0 HcmV?d00001 diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 54136e6..c89808f 100644 --- a/themes/steamburn/theme.lua +++ b/themes/steamburn/theme.lua @@ -1,19 +1,22 @@ --[[ - - Steamburn Awesome WM config 3.0 - github.com/copycat-killer - + + Steamburn Awesome WM theme 3.0 + github.com/copycat-killer + --]] +local gears = require("gears") +local lain = require("lain") +local awful = require("awful") +local wibox = require("wibox") +local os = { getenv = os.getenv } + local theme = {} - theme.zenburn_dir = require("awful.util").get_themes_dir() .. "zenburn" -themes_dir = os.getenv("HOME") .. "/.config/awesome/themes/steamburn" -theme.wallpaper = themes_dir .. "/wall.png" - -theme.font = "Tamsyn 10.5" - +theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/steamburn" +theme.wallpaper = theme.dir .. "/wall.png" +theme.font = "Misc Tamsyn 10.5" theme.fg_normal = "#e2ccb0" theme.fg_focus = "#d88166" theme.fg_urgent = "#CC9393" @@ -27,13 +30,12 @@ theme.border_marked = "#CC9393" theme.taglist_fg_focus = "#d88166" theme.tasklist_bg_focus = "#140c0b" theme.tasklist_fg_focus = "#d88166" -theme.taglist_squares_sel = themes_dir .. "/icons/square_sel.png" -theme.taglist_squares_unsel = themes_dir .. "/icons/square_unsel.png" - +theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" +theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" theme.menu_height = 16 theme.menu_width = 140 -theme.menu_submenu_icon = themes_dir .. "/icons/submenu.png" - +theme.awesome_icon = theme.dir .."/icons/awesome.png" +theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" theme.layout_txt_tile = "[t]" theme.layout_txt_tileleft = "[l]" theme.layout_txt_tilebottom = "[b]" @@ -46,12 +48,9 @@ theme.layout_txt_max = "[m]" theme.layout_txt_fullscreen = "[F]" theme.layout_txt_magnifier = "[M]" theme.layout_txt_floating = "[|]" - theme.tasklist_plain_task_name = true theme.tasklist_disable_icon = true - theme.useless_gap = 0 - theme.titlebar_close_button_normal = theme.zenburn_dir.."/titlebar/close_normal.png" theme.titlebar_close_button_focus = theme.zenburn_dir.."/titlebar/close_focus.png" theme.titlebar_minimize_button_normal = theme.zenburn_dir.."/titlebar/minimize_normal.png" @@ -77,4 +76,198 @@ theme.titlebar_maximized_button_focus_active = theme.zenburn_dir.."/titlebar/ theme.layout_txt_termfair = "[termfair]" theme.layout_txt_centerfair = "[centerfair]" +local markup = lain.util.markup +local gray = "#94928F" + +-- Textclock +local mytextclock = wibox.widget.textclock(" %H:%M ") +mytextclock.font = theme.font + +-- Calendar +lain.widgets.calendar({ + attach_to = { mytextclock }, + notification_preset = { + font = "Misc Tamsyn 11", + fg = theme.fg_normal, + bg = theme.bg_normal + } +}) + +--[[ 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 = "" + count = "" + + if mailcount > 0 then + mail = "Mail " + count = mailcount .. " " + end + + widget:set_markup(markup(gray, mail) .. count) + end +}) +--]] + +-- MPD +theme.mpd = lain.widgets.mpd({ + settings = function() + artist = mpd_now.artist .. " " + title = mpd_now.title .. " " + + if mpd_now.state == "pause" then + artist = "mpd " + title = "paused " + elseif mpd_now.state == "stop" then + artist = "" + title = "" + end + + widget:set_markup(markup.font(theme.font, markup(gray, artist) .. title)) + end +}) + +-- CPU +local cpu = lain.widgets.sysload({ + settings = function() + widget:set_markup(markup.font(theme.font, markup(gray, " Cpu ") .. load_1 .. " ")) + end +}) + +-- MEM +local mem = lain.widgets.mem({ + settings = function() + widget:set_markup(markup.font(theme.font, markup(gray, " Mem ") .. mem_now.used .. " ")) + end +}) + +-- /home fs +theme.fs = lain.widgets.fs({ + options = "--exclude-type=tmpfs", + partition = "/home", + notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, +}) + +-- Battery +local bat = lain.widgets.bat({ + settings = function() + bat_perc = bat_now.perc + if bat_now.ac_status == 1 then bat_perc = "Plug" end + widget:set_markup(markup.font(theme.font, markup(gray, " Bat ") .. bat_perc .. " ")) + end +}) + +-- Net checker +local net = lain.widgets.net({ + settings = function() + if net_now.state == "up" then net_state = "On" + else net_state = "Off" end + widget:set_markup(markup.font(theme.font, markup(gray, " Net ") .. net_state .. " ")) + end +}) + +-- ALSA volume +theme.volume = lain.widgets.alsa({ + settings = function() + header = " Vol " + vlevel = volume_now.level + + if volume_now.status == "off" then + vlevel = vlevel .. "M " + else + vlevel = vlevel .. " " + end + + widget:set_markup(markup.font(theme.font, markup(gray, header) .. vlevel)) + end +}) + +-- Weather +theme.weather = lain.widgets.weather({ + city_id = 2643743, -- placeholder (London) +}) + +-- Separators +local first = wibox.widget.textbox(markup.font("Misc Tamsyn 4", " ")) +local spr = wibox.widget.textbox(' ') + +local function update_txt_layoutbox(s) + -- Writes a string representation of the current layout in a textbox widget + local txt_l = theme["layout_txt_" .. awful.layout.getname(awful.layout.get(s))] or "" + s.mytxtlayoutbox:set_text(txt_l) +end + +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() + + -- Textual layoutbox + s.mytxtlayoutbox = wibox.widget.textbox(theme["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 + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons) + + -- Create a tasklist widget + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons) + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s, height = 18, bg = theme.bg_normal, fg = theme.fg_normal }) + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s, height = 18 }) + + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + first, + s.mytaglist, + spr, + s.mytxtlayoutbox, + --spr, + s.mypromptbox, + spr, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + spr, + theme.mpd.widget, + --mail.widget, + cpu.widget, + mem.widget, + bat.widget, + net.widget, + theme.volume.widget, + mytextclock + }, + } +end + return theme