From c189f41415fb58f69d5563c07b12e8bd869e33f7 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sun, 15 Jan 2017 14:09:09 +0100 Subject: [PATCH] powerarrow-darker ported to 4.0; all ported themes so far have titlebars #129 --- README.rst | 9 +- rc.lua.blackburn | 1 - rc.lua.powerarrow-darker | 732 ++++++++++-------- .../icons/titlebar/close_focus.png | Bin 0 -> 187 bytes .../icons/titlebar/close_normal.png | Bin 0 -> 254 bytes .../icons/titlebar/floating_focus_active.png | Bin 0 -> 186 bytes .../titlebar/floating_focus_inactive.png | Bin 0 -> 154 bytes .../icons/titlebar/floating_normal_active.png | Bin 0 -> 217 bytes .../titlebar/floating_normal_inactive.png | Bin 0 -> 176 bytes .../icons/titlebar/maximized_focus_active.png | Bin 0 -> 264 bytes .../titlebar/maximized_focus_inactive.png | Bin 0 -> 176 bytes .../titlebar/maximized_normal_active.png | Bin 0 -> 244 bytes .../titlebar/maximized_normal_inactive.png | Bin 0 -> 174 bytes .../icons/titlebar/ontop_focus_active.png | Bin 0 -> 184 bytes .../icons/titlebar/ontop_focus_inactive.png | Bin 0 -> 161 bytes .../icons/titlebar/ontop_normal_active.png | Bin 0 -> 224 bytes .../icons/titlebar/ontop_normal_inactive.png | Bin 0 -> 171 bytes .../icons/titlebar/sticky_focus_active.png | Bin 0 -> 184 bytes .../icons/titlebar/sticky_focus_inactive.png | Bin 0 -> 155 bytes .../icons/titlebar/sticky_normal_active.png | Bin 0 -> 235 bytes .../icons/titlebar/sticky_normal_inactive.png | Bin 0 -> 165 bytes themes/powerarrow-darker/theme.lua | 138 ++-- 22 files changed, 494 insertions(+), 386 deletions(-) create mode 100644 themes/powerarrow-darker/icons/titlebar/close_focus.png create mode 100644 themes/powerarrow-darker/icons/titlebar/close_normal.png create mode 100644 themes/powerarrow-darker/icons/titlebar/floating_focus_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/floating_focus_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/floating_normal_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/floating_normal_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/maximized_focus_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/maximized_focus_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/maximized_normal_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/maximized_normal_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/ontop_focus_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/ontop_focus_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/ontop_normal_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/ontop_normal_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/sticky_focus_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/sticky_focus_inactive.png create mode 100644 themes/powerarrow-darker/icons/titlebar/sticky_normal_active.png create mode 100644 themes/powerarrow-darker/icons/titlebar/sticky_normal_inactive.png diff --git a/README.rst b/README.rst index 2cc0d44..57f8431 100644 --- a/README.rst +++ b/README.rst @@ -6,13 +6,10 @@ Awesome WM Copycats Warning ------- -I am in the process of updating to awesome 4.0. Currently, the ported themes are: +I am in the process of updating to awesome 4.0. The following themes are still not ported: -- blackburn -- copland -- dremora -- holo -- multicolor +- rainbow +- steamburn ------------------------- Themes for Awesome WM 4.x diff --git a/rc.lua.blackburn b/rc.lua.blackburn index a1a630b..3fbd663 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -767,7 +767,6 @@ client.connect_signal("request::titlebars", function(c) layout = wibox.layout.fixed.horizontal() }, layout = wibox.layout.align.horizontal - } end) diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index c8906af..f3c6efd 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -1,20 +1,22 @@ + --[[ - - Powerarrow Darker Awesome WM config 2.0 - github.com/copycat-killer - + + Powerarrow Darker Awesome WM config 2.0 + github.com/copycat-killer + --]] -- {{{ Required libraries -local gears = require("gears") -local awful = require("awful") -awful.rules = require("awful.rules") - require("awful.autofocus") -local wibox = require("wibox") -local beautiful = require("beautiful") -local naughty = require("naughty") -local lain = require("lain") ---local menubar = require("menubar") +local gears = require("gears") +local awful = require("awful") + require("awful.autofocus") +local wibox = require("wibox") +local beautiful = require("beautiful") +local naughty = require("naughty") +local lain = require("lain") +--local menubar = require("menubar") +local freedesktop = require("freedesktop") +local hotkeys_popup = require("awful.hotkeys_popup").widget -- }}} -- {{{ Error handling @@ -32,20 +34,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") @@ -53,7 +55,6 @@ run_once("unclutter -root") -- }}} -- {{{ Variable definitions - -- beautiful init beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-darker/theme.lua") @@ -62,68 +63,68 @@ modkey = "Mod4" altkey = "Mod1" terminal = "urxvtc" or "xterm" editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor +mail = terminal .. " -e mutt " +iptraf = terminal .. " -g 180x54-20+34 -e sudo iptraf-ng -i all " +musicplr = terminal .. " -g 130x34-320+16 -e ncmpcpp " -- user defined browser = "firefox" gui_editor = "gvim" graphics = "gimp" -mail = terminal .. " -e mutt " -iptraf = terminal .. " -g 180x54-20+34 -e sudo iptraf-ng -i all " -musicplr = terminal .. " -g 130x34-320+16 -e ncmpcpp " -local layouts = { - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.bottom, - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, -} - --- quake terminal -local quakeconsole = {} -for s = 1, screen.count() do - quakeconsole[s] = lain.util.quake({ app = terminal }) -end +-- lain +lain.layout.termfair.nmaster = 3 +lain.layout.termfair.ncol = 1 +lain.layout.centerfair.nmaster = 3 +lain.layout.centerfair.ncol = 1 -- }}} --- {{{ Tags -tags = { - names = { "1", "2", "3", "4", "5"}, - layout = { layouts[1], layouts[2], layouts[3], layouts[1], layouts[4] } -} +-- {{{ Helper functions +local function client_menu_toggle_fn() + local instance = nil -for s = 1, screen.count() do - tags[s] = awful.tag(tags.names, s, tags.layout) -end --- }}} - --- {{{ 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 markup = lain.util.markup separators = lain.util.separators --- Textclock clockicon = wibox.widget.imagebox(beautiful.widget_clock) --mytextclock = wibox.widget.textclock(" %a %d %b %H:%M") mytextclock = lain.widgets.abase({ timeout = 60, - cmd = "date +'%a %d %b %R'", + cmd = " date +'%a %d %b %R'", settings = function() widget:set_markup(" " .. output) end @@ -201,8 +202,9 @@ tempwidget = lain.widgets.temp({ -- / fs fsicon = wibox.widget.imagebox(beautiful.widget_hdd) -fswidget = lain.widgets.fs({ - settings = function() +fsroot = lain.widgets.fs({ + options = "--exclude-type=tmpfs", + settings = function() widget:set_text(" " .. fs_now.used .. "% ") end }) @@ -232,7 +234,7 @@ batwidget = lain.widgets.bat({ -- ALSA volume volicon = wibox.widget.imagebox(beautiful.widget_vol) -volumewidget = lain.widgets.alsa({ +volume = lain.widgets.alsa({ settings = function() if volume_now.status == "off" then volicon:set_image(beautiful.widget_vol_mute) @@ -265,20 +267,24 @@ arrl_dl = separators.arrow_left(beautiful.bg_focus, "alpha") arrl_ld = separators.arrow_left("alpha", beautiful.bg_focus) -- Create a wibox for each screen and add it -mywibox = {} -mypromptbox = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), +local taglist_buttons = awful.util.table.join( + awful.button({ }, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, awful.client.toggletag), - awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end), - awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end) - ) -mytasklist = {} -mytasklist.buttons = awful.util.table.join( + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) + ) + +local tasklist_buttons = awful.util.table.join( awful.button({ }, 1, function (c) if c == client.focus then c.minimized = true @@ -286,8 +292,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 @@ -295,96 +301,116 @@ mytasklist.buttons = awful.util.table.join( c:raise() end end), - awful.button({ }, 3, function () - if instance then - instance:hide() - instance = nil - else - instance = awful.menu.clients({ width=250 }) - end - end), + awful.button({ }, 3, client_menu_toggle_fn()), awful.button({ }, 4, function () awful.client.focus.byidx(1) - if client.focus then client.focus:raise() end end), awful.button({ }, 5, function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end end)) -for s = 1, screen.count() do +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end +end + +-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) +screen.connect_signal("property::geometry", set_wallpaper) + +awful.screen.connect_for_each_screen(function(s) + -- Quake application + s.quake = lain.util.quake({ app = terminal }) + + -- Wallpaper + set_wallpaper(s) + + awful.tag({ "1", "2", "3", "4", "5" }, s, { + awful.layout.suit.floating, + awful.layout.suit.tile, + awful.layout.suit.tile.bottom, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + }) -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt() - + s.mypromptbox = awful.widget.prompt() + -- Create an imagebox widget which will contains an icon indicating which layout we're using. -- We need one layoutbox per screen. - mylayoutbox[s] = awful.widget.layoutbox(s) - mylayoutbox[s]:buttons(awful.util.table.join( - awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), - awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end))) - + s.mylayoutbox = awful.widget.layoutbox(s) + s.mylayoutbox:buttons(awful.util.table.join( + awful.button({ }, 1, function () awful.layout.inc( 1) end), + awful.button({ }, 3, function () awful.layout.inc(-1) end), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) -- Create a tasklist widget - mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) -- Create the 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 upper left - local left_layout = wibox.layout.fixed.horizontal() - --left_layout:add(spr) - left_layout:add(mytaglist[s]) - left_layout:add(mypromptbox[s]) - left_layout:add(spr) - - -- Widgets that are aligned to the upper right - local right_layout_toggle = true - local function right_layout_add (...) - local arg = {...} - if right_layout_toggle then - right_layout:add(arrl_ld) - for i, n in pairs(arg) do - right_layout:add(wibox.widget.background(n ,beautiful.bg_focus)) - end - else - right_layout:add(arrl_dl) - for i, n in pairs(arg) do - right_layout:add(n) - end - end - right_layout_toggle = not right_layout_toggle - end - - right_layout = wibox.layout.fixed.horizontal() - if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(spr) - right_layout_add(mpdicon, mpdwidget) - right_layout_add(volicon, volumewidget) - --right_layout_add(mailicon, mailwidget) - right_layout_add(memicon, memwidget) - right_layout_add(cpuicon, cpuwidget) - right_layout_add(tempicon, tempwidget) - right_layout_add(fsicon, fswidget) - right_layout_add(baticon, batwidget) - right_layout_add(neticon,netwidget) - right_layout_add(mytextclock, spr) - right_layout_add(mylayoutbox[s]) - - -- 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, + spr, + s.mytaglist, + s.mypromptbox, + spr, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + spr, + arrl_ld, + wibox.container.background(mpdicon, beautiful.bg_focus), + wibox.container.background(mpdwidget, beautiful.bg_focus), + arrl_dl, + volicon, + volume, + arrl_ld, + wibox.container.background(mailicon, beautiful.bg_focus), + --wibox.container.background(mailwidget, beautiful.bg_focus), + arrl_dl, + memicon, + memwidget, + arrl_ld, + wibox.container.background(cpuicon, beautiful.bg_focus), + wibox.container.background(cpuwidget, beautiful.bg_focus), + arrl_dl, + tempicon, + tempwidget, + arrl_ld, + wibox.container.background(fsicon, beautiful.bg_focus), + wibox.container.background(fsroot, beautiful.bg_focus), + arrl_dl, + baticon, + batwidget, + arrl_ld, + wibox.container.background(neticon, beautiful.bg_focus), + wibox.container.background(netwidget, beautiful.bg_focus), + arrl_dl, + mytextclock, + spr, + arrl_ld, + wibox.container.background(s.mylayoutbox, beautiful.bg_focus), + }, + } +end) -- }}} --- {{{ Mouse Bindings +-- {{{ Mouse bindings root.buttons(awful.util.table.join( awful.button({ }, 3, function () mymainmenu:toggle() end), awful.button({ }, 4, awful.tag.viewnext), @@ -398,26 +424,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", @@ -440,190 +476,254 @@ 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), + 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 () fswidget.show(7) end), + awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), + awful.key({ altkey, }, "h", function () fsroot.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%%+", volumewidget.channel)) - volumewidget.update() + 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%%-", volumewidget.channel)) - volumewidget.update() + 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", volumewidget.channel)) - volumewidget.update() + 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%%", volumewidget.channel)) - volumewidget.update() + 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.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 () awful.util.spawn("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 () mypromptbox[mouse.screen]:run() end), + 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: " }, - mypromptbox[mouse.screen].widget, - awful.util.eval, nil, - awful.util.getdir("cache") .. "/history_eval") - end), + 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) + 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( @@ -636,6 +736,7 @@ root.keys(globalkeys) -- }}} -- {{{ Rules +-- Rules to apply to new clients (through the "manage" signal). awful.rules.rules = { -- All clients will match this rule. { rule = { }, @@ -645,15 +746,19 @@ awful.rules.rules = { raise = true, keys = clientkeys, buttons = clientbuttons, - size_hints_honor = false } }, + screen = awful.screen.preferred, + placement = awful.placement.no_overlap+awful.placement.no_offscreen, + size_hints_honor = false + } + }, + + -- Titlebars + { rule_any = { type = { "dialog", "normal" } }, + properties = { titlebars_enabled = false } }, + + -- Set Firefox to always map on the first tag on screen 1. { rule = { class = "Firefox" }, - properties = { tag = tags[1][1] } }, - - { rule = { instance = "plugin-container" }, - properties = { tag = tags[1][1] } }, - - { rule = { class = "Gimp" }, - properties = { tag = tags[1][4] } }, + properties = { screen = 1, tag = awful.screen.focused().tags[1] } }, { rule = { class = "Gimp", role = "gimp-image-window" }, properties = { maximized_horizontal = true, @@ -662,66 +767,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 @@ -729,20 +846,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/powerarrow-darker/icons/titlebar/close_focus.png b/themes/powerarrow-darker/icons/titlebar/close_focus.png new file mode 100644 index 0000000000000000000000000000000000000000..b2051b02e9cdd2d3899e1da108c123b4a809d875 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR`Lc&KGrCL7CWEJ|pUXO@geCwM*fp;J literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/close_normal.png b/themes/powerarrow-darker/icons/titlebar/close_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..da6028c16cd531894d108ee3303eeef0c0a95374 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR?;*DPw2+C7@8Zr;B5V#p&b(304tix16Sv-e1KG zHyi!23OYaQ(18O75<bP0l+XkKiSR0` literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/floating_normal_active.png b/themes/powerarrow-darker/icons/titlebar/floating_normal_active.png new file mode 100644 index 0000000000000000000000000000000000000000..576fa367913534824092dc75600e124abee7af1c GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR`Lc=>(st7lA@)o-U3d7N?UFBv?h5-Ex}t*fjBg zfR0g79Eh%;XLIY=fddCV{5)OFvsH&hCqU&1(;Bu7Cr&&yG%(okukzCh@l*au2?-BU zcYLf<+7+cHwCA*=pG1oD;RLOni62r;=3ZoEVAv=jX8iZ8mpsr$22WQ%mvv4FO#t0S BMAiTR literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/floating_normal_inactive.png b/themes/powerarrow-darker/icons/titlebar/floating_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..4adc5e9dd1d24a6eff17dc531272dd4a8b2bcab0 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Rni_n+Ah4nJ za0`PlBg3pY5H=O_J@r8+*bPE9)&Le3ORbZIEHAPPfn1CYM9k-vw);}z{+PI7(P))@2jE4%J`Hne-2j91S=W!NfU|8^!>+)R} RHhrLB44$rjF6*2UngBsiGcEuC literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/maximized_focus_active.png b/themes/powerarrow-darker/icons/titlebar/maximized_focus_active.png new file mode 100644 index 0000000000000000000000000000000000000000..7d9a11a1204c73d8113ebc5b4ba069b29e569797 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR`Lc#k;>RbAUoqJzX3_EKVmUNU(}9yX7?HY4iP0 zPe@3JNd4C~v9Yl+@l~X}8XFtiu~!1u_P@xA{4lf5qMV8O@qT+A9#6af5)u+KHm*!O zq_*SKAKv75i@bKcZmEcr*wnlIkLoRk4jy5!%KwrxB~sLGJ`8K~HF&e+#Q&3qYybau zZq6vmx&42`WTpQbS00sS+ZNod$TmmDH`j!fL5f91_TQ!6K%fH|JYD@<);T3K0RV#R BUp@c; literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/maximized_focus_inactive.png b/themes/powerarrow-darker/icons/titlebar/maximized_focus_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..bce1d000547aa78ae817db4039d4d1e8fbc112f9 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Lrfwp-Kzd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{Vu17kOjB?2hmobkfW!IV~EE2xneN|s z$}lj?g4@i|k@xSL|2+RC*Xwr9I&|Q`fd!(;bC{>ja+<=(!^0CV0R$6&_VD!l->8{# zMD52LA9iLSXx`hITP0BBzXvCCPU5HjM3D)v{xkiDmiV~EE2-xSaHb9|VPZ!4!i_^&o609Q3ZaGco&y^&E z>ZArWDjsV&U$S;as%4bn>7oxS6BQpE(r?+*kmT@s)_ooxp8pbCl6*c(NJ#vPj}|hW z+1S|VXq{I1t-kHQ4p3H@b6104;%ECAH-G~1g_YAEImobvFfj0&Ni*G!%E$s*%;4$j K=d#Wzp$Pz&Nk`KF literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/ontop_normal_inactive.png b/themes/powerarrow-darker/icons/titlebar/ontop_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..a9a3206846dedf2cc615841df4de2de58da8af9c GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Lrfwp-Kzd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{Vu17kd?AV@%_I*AsbH@#}JM4$q5on4T1-4npJX`(hV18 z8l)Mxi6%G(ALw7#%If;PzO9yrhsTV^ho^mmrohoOT}O95P6mbr*I4^A&rf>|G>5^{ L)z4*}Q$iB}i?u8N literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/sticky_focus_active.png b/themes/powerarrow-darker/icons/titlebar/sticky_focus_active.png new file mode 100644 index 0000000000000000000000000000000000000000..a9bc8a214f99bfd90a3c39fbd1a86853831ae6fa GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR`KR$3^=WjX)t+PZ!4!i_^&o609Q3ZaGbP+I;`h z6A}_CE=3$Tap1rKg<$)K_RP%8hu3jL^L+I&DQuj!%rNZe^>y=87xZ(#kYZch0Cd^k XWMQt=Tst2E4P@|i^>bP0l+XkK?$|d3 literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/sticky_focus_inactive.png b/themes/powerarrow-darker/icons/titlebar/sticky_focus_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..5493d8ec21c113c59bec23fead7d2959811a22a9 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Lrfwp-Kzd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{Vu17kTo+G+qn{;kdCK|V~EE2todRjKK%5Y{L^JOOCv2L1^uMb_>>eGHzielF{r5}E*kCMk;m literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/sticky_normal_active.png b/themes/powerarrow-darker/icons/titlebar/sticky_normal_active.png new file mode 100644 index 0000000000000000000000000000000000000000..1e150f5856db4d824d2ea94280e353a592c6ff04 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR`KRw};tIYoJhtr;B5V#p$;btoa-q7+mK2doFw~ z=eIQIm1#&d@AANv7bh!7?f2T0*xGXGbz0ZSGY8IRn?xSDd4fr0qCC^A$S%wh<{H2QwFIF>Uq*yK@QL(=D`?Dp~- Z7)$;r-ruYnW&?BsgQu&X%Q~loCIHDpQAz*+ literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/icons/titlebar/sticky_normal_inactive.png b/themes/powerarrow-darker/icons/titlebar/sticky_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..7e6c99b66699d29411799f479788303298d36d02 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Lrfwp-Kzd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{Vu17FoWvT>T_*CAu~@G#}JM4$q5os4|?uOTF0@)wHY5v z?-5+26A{v-R4gIr6Q}a87>aZ`d+XoFrvgo2@O1TaS?83{ F1OVZ^D<=Q| literal 0 HcmV?d00001 diff --git a/themes/powerarrow-darker/theme.lua b/themes/powerarrow-darker/theme.lua index 9e5aac9..b9faa64 100644 --- a/themes/powerarrow-darker/theme.lua +++ b/themes/powerarrow-darker/theme.lua @@ -6,74 +6,86 @@ --]] -theme = {} +local theme = {} -themes_dir = os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-darker" -theme.wallpaper = themes_dir .. "/wall.png" +theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-darker" +theme.wallpaper = theme.dir .. "/wall.png" -theme.font = "Terminus 9" -theme.fg_normal = "#DDDDFF" -theme.fg_focus = "#F0DFAF" -theme.fg_urgent = "#CC9393" -theme.bg_normal = "#1A1A1A" -theme.bg_focus = "#313131" -theme.bg_urgent = "#1A1A1A" -theme.border_width = "1" -theme.border_normal = "#3F3F3F" -theme.border_focus = "#7F7F7F" -theme.border_marked = "#CC9393" -theme.titlebar_bg_focus = "#FFFFFF" -theme.titlebar_bg_normal = "#FFFFFF" -theme.taglist_fg_focus = "#D8D782" -theme.tasklist_bg_focus = "#1A1A1A" -theme.tasklist_fg_focus = "#D8D782" -theme.textbox_widget_margin_top = 1 -theme.notify_fg = theme.fg_normal -theme.notify_bg = theme.bg_normal -theme.notify_border = theme.border_focus -theme.awful_widget_height = 14 -theme.awful_widget_margin_top = 2 -theme.mouse_finder_color = "#CC9393" -theme.menu_height = "16" -theme.menu_width = "140" +theme.font = "Terminus 9" +theme.fg_normal = "#DDDDFF" +theme.fg_focus = "#F0DFAF" +theme.fg_urgent = "#CC9393" +theme.bg_normal = "#1A1A1A" +theme.bg_focus = "#313131" +theme.bg_urgent = "#1A1A1A" +theme.border_width = 1 +theme.border_normal = "#3F3F3F" +theme.border_focus = "#7F7F7F" +theme.border_marked = "#CC9393" +theme.tasklist_bg_focus = "#1A1A1A" +theme.titlebar_bg_focus = theme.bg_focus +theme.titlebar_bg_normal = theme.bg_normal +theme.titlebar_fg_focus = theme.fg_focus -theme.menu_submenu_icon = themes_dir .. "/icons/submenu.png" -theme.taglist_squares_sel = themes_dir .. "/icons/square_sel.png" -theme.taglist_squares_unsel = themes_dir .. "/icons/square_unsel.png" +theme.menu_height = 16 +theme.menu_width = 140 +theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" -theme.layout_tile = themes_dir .. "/icons/tile.png" -theme.layout_tilegaps = themes_dir .. "/icons/tilegaps.png" -theme.layout_tileleft = themes_dir .. "/icons/tileleft.png" -theme.layout_tilebottom = themes_dir .. "/icons/tilebottom.png" -theme.layout_tiletop = themes_dir .. "/icons/tiletop.png" -theme.layout_fairv = themes_dir .. "/icons/fairv.png" -theme.layout_fairh = themes_dir .. "/icons/fairh.png" -theme.layout_spiral = themes_dir .. "/icons/spiral.png" -theme.layout_dwindle = themes_dir .. "/icons/dwindle.png" -theme.layout_max = themes_dir .. "/icons/max.png" -theme.layout_fullscreen = themes_dir .. "/icons/fullscreen.png" -theme.layout_magnifier = themes_dir .. "/icons/magnifier.png" -theme.layout_floating = themes_dir .. "/icons/floating.png" +theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" +theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" +theme.layout_tile = theme.dir .. "/icons/tile.png" +theme.layout_tilegaps = theme.dir .. "/icons/tilegaps.png" +theme.layout_tileleft = theme.dir .. "/icons/tileleft.png" +theme.layout_tilebottom = theme.dir .. "/icons/tilebottom.png" +theme.layout_tiletop = theme.dir .. "/icons/tiletop.png" +theme.layout_fairv = theme.dir .. "/icons/fairv.png" +theme.layout_fairh = theme.dir .. "/icons/fairh.png" +theme.layout_spiral = theme.dir .. "/icons/spiral.png" +theme.layout_dwindle = theme.dir .. "/icons/dwindle.png" +theme.layout_max = theme.dir .. "/icons/max.png" +theme.layout_fullscreen = theme.dir .. "/icons/fullscreen.png" +theme.layout_magnifier = theme.dir .. "/icons/magnifier.png" +theme.layout_floating = theme.dir .. "/icons/floating.png" +theme.widget_ac = theme.dir .. "/icons/ac.png" +theme.widget_battery = theme.dir .. "/icons/battery.png" +theme.widget_battery_low = theme.dir .. "/icons/battery_low.png" +theme.widget_battery_empty = theme.dir .. "/icons/battery_empty.png" +theme.widget_mem = theme.dir .. "/icons/mem.png" +theme.widget_cpu = theme.dir .. "/icons/cpu.png" +theme.widget_temp = theme.dir .. "/icons/temp.png" +theme.widget_net = theme.dir .. "/icons/net.png" +theme.widget_hdd = theme.dir .. "/icons/hdd.png" +theme.widget_music = theme.dir .. "/icons/note.png" +theme.widget_music_on = theme.dir .. "/icons/note_on.png" +theme.widget_vol = theme.dir .. "/icons/vol.png" +theme.widget_vol_low = theme.dir .. "/icons/vol_low.png" +theme.widget_vol_no = theme.dir .. "/icons/vol_no.png" +theme.widget_vol_mute = theme.dir .. "/icons/vol_mute.png" +theme.widget_mail = theme.dir .. "/icons/mail.png" +theme.widget_mail_on = theme.dir .. "/icons/mail_on.png" -theme.widget_ac = themes_dir .. "/icons/ac.png" -theme.widget_battery = themes_dir .. "/icons/battery.png" -theme.widget_battery_low = themes_dir .. "/icons/battery_low.png" -theme.widget_battery_empty = themes_dir .. "/icons/battery_empty.png" -theme.widget_mem = themes_dir .. "/icons/mem.png" -theme.widget_cpu = themes_dir .. "/icons/cpu.png" -theme.widget_temp = themes_dir .. "/icons/temp.png" -theme.widget_net = themes_dir .. "/icons/net.png" -theme.widget_hdd = themes_dir .. "/icons/hdd.png" -theme.widget_music = themes_dir .. "/icons/note.png" -theme.widget_music_on = themes_dir .. "/icons/note_on.png" -theme.widget_vol = themes_dir .. "/icons/vol.png" -theme.widget_vol_low = themes_dir .. "/icons/vol_low.png" -theme.widget_vol_no = themes_dir .. "/icons/vol_no.png" -theme.widget_vol_mute = themes_dir .. "/icons/vol_mute.png" -theme.widget_mail = themes_dir .. "/icons/mail.png" -theme.widget_mail_on = themes_dir .. "/icons/mail_on.png" +theme.tasklist_plain_task_name = true +theme.tasklist_disable_icon = true -theme.tasklist_plain_task_name = true -theme.tasklist_disable_icon = true +theme.useless_gap = 0 + +theme.titlebar_close_button_focus = theme.dir .. "/icons/titlebar/close_focus.png" +theme.titlebar_close_button_normal = theme.dir .. "/icons/titlebar/close_normal.png" +theme.titlebar_ontop_button_focus_active = theme.dir .. "/icons/titlebar/ontop_focus_active.png" +theme.titlebar_ontop_button_normal_active = theme.dir .. "/icons/titlebar/ontop_normal_active.png" +theme.titlebar_ontop_button_focus_inactive = theme.dir .. "/icons/titlebar/ontop_focus_inactive.png" +theme.titlebar_ontop_button_normal_inactive = theme.dir .. "/icons/titlebar/ontop_normal_inactive.png" +theme.titlebar_sticky_button_focus_active = theme.dir .. "/icons/titlebar/sticky_focus_active.png" +theme.titlebar_sticky_button_normal_active = theme.dir .. "/icons/titlebar/sticky_normal_active.png" +theme.titlebar_sticky_button_focus_inactive = theme.dir .. "/icons/titlebar/sticky_focus_inactive.png" +theme.titlebar_sticky_button_normal_inactive = theme.dir .. "/icons/titlebar/sticky_normal_inactive.png" +theme.titlebar_floating_button_focus_active = theme.dir .. "/icons/titlebar/floating_focus_active.png" +theme.titlebar_floating_button_normal_active = theme.dir .. "/icons/titlebar/floating_normal_active.png" +theme.titlebar_floating_button_focus_inactive = theme.dir .. "/icons/titlebar/floating_focus_inactive.png" +theme.titlebar_floating_button_normal_inactive = theme.dir .. "/icons/titlebar/floating_normal_inactive.png" +theme.titlebar_maximized_button_focus_active = theme.dir .. "/icons/titlebar/maximized_focus_active.png" +theme.titlebar_maximized_button_normal_active = theme.dir .. "/icons/titlebar/maximized_normal_active.png" +theme.titlebar_maximized_button_focus_inactive = theme.dir .. "/icons/titlebar/maximized_focus_inactive.png" +theme.titlebar_maximized_button_normal_inactive = theme.dir .. "/icons/titlebar/maximized_normal_inactive.png" return theme