From 6d6cd09779f7a747a069d17208c8fe76c014cf70 Mon Sep 17 00:00:00 2001 From: luke bonham Date: Fri, 9 Aug 2013 17:43:28 +0200 Subject: [PATCH] minor changes --- rc.lua.holo | 12 +++---- rc.lua.multicolor | 12 +++---- rc.lua.rainbow | 32 ++++++++--------- themes/blackburn/theme.lua | 58 +++++++++++++++--------------- themes/holo/theme.lua | 12 +++---- themes/multicolor/theme.lua | 12 +++---- themes/powerarrow-darker/theme.lua | 12 +++---- themes/rainbow/theme.lua | 4 +-- themes/steamburn/theme.lua | 12 +++---- 9 files changed, 82 insertions(+), 84 deletions(-) diff --git a/rc.lua.holo b/rc.lua.holo index f1b893c..044b728 100755 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -1,9 +1,9 @@ ---[[ ]]-- --- - --- Holo Awesome WM 3.5.+ config -- --- github.com/copycat-killer -- --- - ---[[ ]]-- +--[[ ]]-- +-- - +-- Holo Awesome WM 3.5.+ config -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- -- {{{ Required Libraries diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 0bdd46e..b9c686d 100755 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -1,9 +1,9 @@ ---[[ ]]-- --- - --- Multicolor Awesome WM 3.5.+ config -- --- github.com/copycat-killer -- --- - ---[[ ]]-- +--[[ ]]-- +-- - +-- Multicolor Awesome WM 3.5.+ config -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- -- {{{ Required Libraries diff --git a/rc.lua.rainbow b/rc.lua.rainbow index 5f739eb..c9b06a6 100755 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -1,7 +1,7 @@ --[[ ]]-- -- - --- Rainbow Awesome WM 3.5.+ config -- --- github.com/copycat-killer -- +-- Rainbow Awesome WM 3.5.+ config -- +-- github.com/copycat-killer -- -- - --[[ ]]-- @@ -103,7 +103,7 @@ layouts = awful.layout.suit.fair, -- 3 awful.layout.suit.tile.bottom, -- 4 awful.layout.suit.fair.horizontal, -- 5 - layouts.tilegaps, -- 6 + layouts.tilegaps, -- 6 layouts.fairgaps, -- 7 layouts.spiralgaps, -- 8 } @@ -130,7 +130,7 @@ for s = 1, screen.count() do tags[s] = awful.tag(tags.names, s, tags.layout) end - + -- }}} -- {{{ Menu @@ -166,7 +166,7 @@ mymainmenu = awful.menu({ items = { mylauncher = awful.widget.launcher({ menu = mymainmenu }) -- if you prefer freedesktop, uncomment the following line -require("freedesktop/freedesktop") +--require("freedesktop/freedesktop") -- }}} @@ -213,17 +213,17 @@ function show_calendar(inc_offset, t_out) local month = tonumber(os.date('%m')) local year = tonumber(os.date('%Y')) - offset = offset + inc_offset + offset = offset + inc_offset month = month + offset if month > 12 then month = 12 - offset = 12 - tonumber(os.date('%m')) + offset = 12 - tonumber(os.date('%m')) elseif month < 1 then month = 1 offset = 1 - tonumber(os.date('%m')) end - + f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year ,"r") c_text = "" .. f:read() .. "\n\n" .. f:read() .. "\n" .. f:read("*all") .. "" f:close() @@ -232,7 +232,7 @@ function show_calendar(inc_offset, t_out) calendar = naughty.notify({ text = c_text, fg = "#D4D4D4", bg = "#242424", - timeout = t_out + timeout = t_out }) end @@ -317,7 +317,7 @@ function(widget, args) end return gray .. args["{Artist}"] .. coldef .. white .. " " .. args["{Title}"] .. " " .. coldef elseif args["{state}"] == "Pause" then - -- 'in pausa' means 'paused' + -- 'in pausa' means 'paused' return gray .. "mpd " .. coldef .. white .. "in pausa " .. coldef else curr_track = nil @@ -460,7 +460,7 @@ local alsawidget = }, mixer = terminal .. " -e alsamixer", -- or whatever your preferred sound mixer is notifications = - { + { font = "Tamsyn 11", bar_size = 18 } @@ -504,7 +504,7 @@ alsawidget._muted = false function alsawidget:notify () local preset = { - -- title = "", text = "", + title = "", text = "", timeout = 3, height = 40, width = 170, @@ -763,9 +763,7 @@ globalkeys = awful.util.table.join( 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, "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), @@ -998,12 +996,12 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n 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 -- Fine grained borders and floaters control 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 - + -- No borders with only one visible client elseif #clients == 1 or layout == "max" then clients[1].border_width = 0 diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index da23754..8f406b6 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -1,16 +1,16 @@ ---[[ ]]-- --- - --- Blackburn Awesome WM 3.5.+ theme -- --- github.com/copycat-killer -- --- - ---[[ ]]-- +--[[ ]]-- +-- - +-- Blackburn Awesome WM 3.5.+ theme -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- theme = {} -themes_dir = os.getenv("HOME") .. "/.config/awesome/themes/blackburn" -theme.wallpaper = themes_dir .. "/wall.png" -theme.topbar_path = "png:" .. themes_dir .. "/icons/topbar/" +theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/blackburn" +theme.wallpaper = theme.dir .. "/wall.png" +theme.topbar_path = "png:" .. theme.dir .. "/icons/topbar/" theme.font = "Tamsyn 10" theme.taglist_font = "Icons 10" @@ -34,31 +34,31 @@ theme.awful_widget_margin_top = 2 theme.menu_height = "16" theme.menu_width = "140" -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.arrl_lr_pre = themes_dir .. "/icons/arrl_lr_pre.png" -theme.arrl_lr_post = themes_dir .. "/icons/arrl_lr_post.png" +theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" +theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" +theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" +theme.arrl_lr_pre = theme.dir .. "/icons/arrl_lr_pre.png" +theme.arrl_lr_post = theme.dir .. "/icons/arrl_lr_post.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.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.tasklist_floating = "" theme.tasklist_maximized_horizontal = "" theme.tasklist_maximized_vertical = "" -theme.widget_mail_notify = themes_dir .. "/icons/mail_notify.png" -theme.widget_no_net_notify = themes_dir .. "/icons/no_net_notify.png" +theme.widget_mail_notify = theme.dir .. "/icons/mail_notify.png" +theme.widget_no_net_notify = theme.dir .. "/icons/no_net_notify.png" return theme diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index 80dc4d8..03a11f6 100644 --- a/themes/holo/theme.lua +++ b/themes/holo/theme.lua @@ -1,9 +1,9 @@ ---[[ j]]-- --- - --- Holo Awesome WM 3.5.+ theme -- --- github.com/copycat-killer -- --- - ---[[ ]]-- +--[[ ]]-- +-- - +-- Holo Awesome WM 3.5.+ theme -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- theme = {} diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index 175bece..3880d38 100644 --- a/themes/multicolor/theme.lua +++ b/themes/multicolor/theme.lua @@ -1,9 +1,9 @@ ---[[ ]]-- --- - --- Multicolor Awesome WM 3.5.+ config -- --- github.com/copycat-killer -- --- - ---[[ ]]-- +--[[ ]]-- +-- - +-- Multicolor Awesome WM 3.5.+ config -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- theme = {} diff --git a/themes/powerarrow-darker/theme.lua b/themes/powerarrow-darker/theme.lua index 9cc0627..8e04646 100644 --- a/themes/powerarrow-darker/theme.lua +++ b/themes/powerarrow-darker/theme.lua @@ -1,9 +1,9 @@ ---[[ ]]-- --- - --- Powearrow Darker Awesome WM 3.5.+ theme -- --- github.com/copycat-killer -- --- - ---[[ ]]-- +--[[ ]]-- +-- - +-- Powearrow Darker Awesome WM 3.5.+ theme -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- theme = {} diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index 85c74a3..7f4c0fc 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -1,7 +1,7 @@ --[[ ]]-- -- - --- Rainbow Awesome WM 3.5.+ theme -- --- github.com/copycat-killer -- +-- Rainbow Awesome WM 3.5.+ theme -- +-- github.com/copycat-killer -- -- - --[[ ]]-- diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 1b1b914..5a5759d 100644 --- a/themes/steamburn/theme.lua +++ b/themes/steamburn/theme.lua @@ -1,9 +1,9 @@ ---[[ ]]-- ----- - ----- Steamburn Awesome WM 3.5.+ theme -- ----- github.com/copycat-killer -- ----- - -----[[ ]]-- +--[[ ]]-- +-- - +-- Steamburn Awesome WM 3.5.+ theme -- +-- github.com/copycat-killer -- +-- - +--[[ ]]-- theme = {}