From a262a1403e0e3bddbfcc12817c065fbd7e640db1 Mon Sep 17 00:00:00 2001 From: luke bonham Date: Fri, 16 Aug 2013 19:44:55 +0200 Subject: [PATCH] little things --- README.rst | 1 + layouts/init.lua | 1 - rc.lua.rainbow | 87 ++++++++++++++++++++++++++-------------- themes/rainbow/theme.lua | 85 +++++++++++++++++++++------------------ 4 files changed, 102 insertions(+), 72 deletions(-) diff --git a/README.rst b/README.rst index 5af6d7c..29742d7 100644 --- a/README.rst +++ b/README.rst @@ -26,6 +26,7 @@ Notable features: - Powerful volume bar - Custom layouts - Freedesktop menu +- By direction client focus (like in bspwm) They're scattered all over the set, so try each theme and choose the one you enjoy the most. diff --git a/layouts/init.lua b/layouts/init.lua index 9e85b7a..2695fd5 100644 --- a/layouts/init.lua +++ b/layouts/init.lua @@ -1,5 +1,4 @@ require("layouts.fairgaps") require("layouts.spiralgaps") require("layouts.tilegaps") - module("layouts") diff --git a/rc.lua.rainbow b/rc.lua.rainbow index d9146b4..f9691fd 100755 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -8,17 +8,17 @@ -- {{{ Required Libraries -local gears = require("gears") -local awful = require("awful") -awful.rules = require("awful.rules") -awful.autofocus = require("awful.autofocus") -local wibox = require("wibox") -local beautiful = require("beautiful") -local naughty = require("naughty") -local vicious = require("vicious") -local scratch = require("scratch") -local yawn = require("yawn") -local layouts = require("layouts") +local gears = require("gears") +local awful = require("awful") +awful.rules = require("awful.rules") +awful.autofocus = require("awful.autofocus") +local wibox = require("wibox") +local beautiful = require("beautiful") +local naughty = require("naughty") +local vicious = require("vicious") +local scratch = require("scratch") +local yawn = require("yawn") +local layouts = require("layouts") -- }}} @@ -101,11 +101,10 @@ layouts = awful.layout.suit.floating, -- 1 awful.layout.suit.tile, -- 2 awful.layout.suit.fair, -- 3 - awful.layout.suit.tile.bottom, -- 4 - awful.layout.suit.fair.horizontal, -- 5 - layouts.tilegaps, -- 6 - layouts.fairgaps, -- 7 - layouts.spiralgaps, -- 8 + awful.layout.suit.fair.horizontal, -- 4 + layouts.tilegaps, -- 5 + layouts.fairgaps, -- 6 + layouts.spiralgaps, -- 7 } -- }}} @@ -130,7 +129,6 @@ for s = 1, screen.count() do tags[s] = awful.tag(tags.names, s, tags.layout) end - -- }}} -- {{{ Menu @@ -730,21 +728,46 @@ globalkeys = awful.util.table.join( -- Take a screenshot awful.key({ altkey }, "p", function() awful.util.spawn("screenshot",false) end), - awful.key({ modkey, }, "Left", awful.tag.viewprev ), - awful.key({ altkey, "Shift" }, "j", awful.tag.viewprev ), - awful.key({ modkey, }, "Right", awful.tag.viewnext ), - awful.key({ altkey, "Shift" }, "k", awful.tag.viewnext ), - awful.key({ modkey, }, "Escape", awful.tag.history.restore), - awful.key({ modkey, }, "k", + -- Tag browsing + awful.key({ modkey }, "Left", awful.tag.viewprev ), + awful.key({ modkey }, "Right", awful.tag.viewnext ), + awful.key({ modkey }, "Escape", awful.tag.history.restore), + + -- Default client focus + awful.key({ altkey }, "k", function () awful.client.focus.byidx( 1) if client.focus then client.focus:raise() end end), - awful.key({ modkey, }, "j", + awful.key({ altkey }, "j", function () awful.client.focus.byidx(-1) if client.focus then client.focus:raise() end end), + + -- 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), + + -- Show Menu awful.key({ modkey, }, "w", function () mymainmenu:show({keygrabber=true}) end), -- Show/Hide Wibox @@ -765,18 +788,20 @@ globalkeys = awful.util.table.join( 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), -- 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, }, "l", function () awful.tag.incmwfact( 0.05) end), - awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), - awful.key({ modkey, "Control" }, "l", 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), -- Dropdown terminal awful.key({ modkey, }, "z", function () scratch.drop(terminal) end), diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index 4581c48..544cf33 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -6,51 +6,56 @@ --[[ ]]-- -theme = {} +theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/rainbow" -theme.wallpaper = theme.dir .. "/wall.png" +theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/rainbow" +theme.wallpaper = theme.dir .. "/wall.png" -theme.font = "Tamsyn 10" -theme.fg_normal = "#9E9E9E" -theme.fg_focus = "#EBEBFF" -theme.bg_normal = "#242424" -theme.bg_focus = "#242424" -theme.fg_urgent = "#000000" -theme.bg_urgent = "#FFFFFF" -theme.border_width = "1" -theme.border_normal = "#242424" -theme.border_focus = "#999999" -theme.taglist_fg_focus = "#EBEBFF" -theme.taglist_bg_focus = "#3D3D3D" -theme.menu_height = "16" -theme.menu_width = "140" +theme.font = "Tamsyn 10" +theme.fg_normal = "#9E9E9E" +theme.fg_focus = "#EBEBFF" +theme.bg_normal = "#242424" +theme.bg_focus = "#242424" +theme.fg_urgent = "#000000" +theme.bg_urgent = "#FFFFFF" +theme.border_width = "1" +theme.border_normal = "#242424" +theme.border_focus = "#999999" +theme.taglist_fg_focus = "#EBEBFF" +theme.taglist_bg_focus = "#3D3D3D" +theme.menu_height = "16" +theme.menu_width = "140" -theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" -theme.taglist_squares_sel = theme.dir .. "/icons/square_sel2.png" -theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" -theme.widget_mail_notify = theme.dir .. "/icons/mail_notify.png" -theme.widget_no_net_notify = theme.dir .. "/icons/no_net_notify.png" +theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" +theme.taglist_squares_sel = theme.dir .. "/icons/square_sel2.png" +theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" +theme.widget_mail_notify = theme.dir .. "/icons/mail_notify.png" +theme.widget_no_net_notify = theme.dir .. "/icons/no_net_notify.png" -theme.layout_txt_tile = "[t]" -theme.layout_txt_tileleft = "[l]" -theme.layout_txt_tilebottom = "[b]" -theme.layout_txt_tiletop = "[tt]" -theme.layout_txt_fairv = "[fv]" -theme.layout_txt_fairh = "[fh]" -theme.layout_txt_spiral = "[s]" -theme.layout_txt_dwindle = "[d]" -theme.layout_txt_max = "[m]" -theme.layout_txt_fullscreen = "[F]" -theme.layout_txt_magnifier = "[M]" -theme.layout_txt_floating = "[*]" +theme.useless_gap_width = 5 -theme.layout_txt_tilegaps = "[tg]" -theme.layout_txt_fairvgaps = "[fvg]" -theme.layout_txt_spiralgaps = "[sg]" +theme.layout_txt_tile = "[t]" +theme.layout_txt_tileleft = "[l]" +theme.layout_txt_tilebottom = "[b]" +theme.layout_txt_tiletop = "[tt]" +theme.layout_txt_fairv = "[fv]" +theme.layout_txt_fairh = "[fh]" +theme.layout_txt_spiral = "[s]" +theme.layout_txt_dwindle = "[d]" +theme.layout_txt_max = "[m]" +theme.layout_txt_fullscreen = "[F]" +theme.layout_txt_magnifier = "[M]" +theme.layout_txt_floating = "[*]" -theme.tasklist_floating = "" -theme.tasklist_maximized_horizontal = "" -theme.tasklist_maximized_vertical = "" +theme.layout_txt_tilegaps = "[tg]" +theme.layout_txt_fixed = "[fx]" +theme.layout_txt_fixed_alt = "[fx2]" +theme.layout_txt_fairvgaps = "[fvg]" +theme.layout_txt_spiralgaps = "[sg]" +theme.layout_txt_termfair = "[tf]" + +theme.tasklist_floating = "" +theme.tasklist_maximized_horizontal = "" +theme.tasklist_maximized_vertical = "" return theme