diff --git a/.gitignore b/.gitignore index 7aecabe..204da06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ rc.lua -yawn -vain diff --git a/README.rst b/README.rst index 7faa95a..99b4536 100644 --- a/README.rst +++ b/README.rst @@ -9,8 +9,7 @@ Power themes for Awesome WM 3.5+ :Author: Luke Bonham :License: BY-NC-SA_ :Version: 1.6.5 -:Status: **Temporarily suspended** -:Reason: I'm focusing my work on vain_, which will play a big role in version 2.0 +:Status: **resuming shortly**, this time powered by lain_ Description ========== @@ -109,7 +108,7 @@ If you happen to get an error involving ``/home fs widget``, replace every occur Also be sure to set your music dir in ``scripts/mpdinfo``, and to have ``imagemagick`` and ``notify-send`` installed. .. _Awesome: http://awesome.naquadah.org/ -.. _vain: https://github.com/copycat-killer/vain +.. _lain: https://github.com/copycat-killer/vain .. _tip: http://theimmortalphoenix.deviantart.com/art/Full-Color-Awesome-340997258 .. _romockee: https://github.com/romockee/powerarrow-dark .. _ok100: http://ok100.deviantart.com/art/DWM-January-2013-348656846 diff --git a/freedesktop/README.md b/freedesktop/README.md index 5858dac..3bc10e5 100644 --- a/freedesktop/README.md +++ b/freedesktop/README.md @@ -1,4 +1,4 @@ -This is [awesome-freedesktop](https://github.com/terceiro/awesome-freedesktop), +This is [awesome-freedesktop](https://github.com/terceiro/awesome-freedesktop), adapted to work within [awesome-copycats](https://github.com/copycat-killer/awesome-copycats). License diff --git a/freedesktop/freedesktop.lua b/freedesktop/freedesktop.lua index ad7c677..8ca2c0a 100644 --- a/freedesktop/freedesktop.lua +++ b/freedesktop/freedesktop.lua @@ -34,5 +34,5 @@ table.insert(menu_items, { "awesome", myawesomemenu, beautiful.awesome_icon }) table.insert(menu_items, { "open terminal", terminal, freedesktop.utils.lookup_icon({icon = 'terminal'}) }) -- table.insert(menu_items, { "Debian", debian.menu.Debian_menu.Debian, freedesktop.utils.lookup_icon({ icon = 'debian-logo' }) }) -mymainmenu = awful.menu.new({ items = menu_items, theme = { width = 150 } }) +mymainmenu = awful.menu.new({ items = menu_items, theme = { width = 150 } }) mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu }) diff --git a/freedesktop/utils.lua b/freedesktop/utils.lua index b20edc2..f25f4c0 100644 --- a/freedesktop/utils.lua +++ b/freedesktop/utils.lua @@ -158,7 +158,7 @@ function load_mime_types() for w in line:gmatch('[^%s]+') do table.insert(parsed, w) end - if #parsed > 1 then + if #parsed > 1 then for i = 2, #parsed do mime_types[parsed[i]] = parsed[1]:gsub('/', '-') end diff --git a/icons/anrxc/awesome14.png b/icons/anrxc/awesome14.png deleted file mode 100644 index 00646df..0000000 Binary files a/icons/anrxc/awesome14.png and /dev/null differ diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 9f728a4..7a454f7 100755 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -184,8 +184,6 @@ calendar_width = 21 local calendar = nil local offset = 0 -local data = nil - local function pop_spaces(s1, s2, maxsize) local sps = "" for i = 1, maxsize - string.len(s1) - string.len(s2) do diff --git a/scratch/drop.lua b/scratch/drop.lua index 4ba6b45..95daeda 100644 --- a/scratch/drop.lua +++ b/scratch/drop.lua @@ -79,8 +79,8 @@ function toggle(prog, vert, horiz, width, height, sticky, screen) if width <= 1 then width = (screengeom.width * width) - 3 end if height <= 1 then height = screengeom.height * height end - if horiz == "left" then x = screengeom.x - elseif horiz == "right" then x = screengeom.width - width + if horiz == "left" then x = screengeom.x + elseif horiz == "right" then x = screengeom.width - width else x = screengeom.x+(screengeom.width-width)/2 - 1 end if vert == "bottom" then y = screengeom.height + screengeom.y - height diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index a75d7af..09de99c 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -24,7 +24,7 @@ theme.border_focus = "#EBEBFF" theme.taglist_fg_focus = "#EDEFFF" theme.taglist_bg_focus = "#242424" theme.menu_height = "16" -theme.menu_width = "140" +theme.menu_width = "150" theme.ocol = "" theme.ccol = "" @@ -39,7 +39,6 @@ theme.awesome_icon = theme.dir .. "/icons/awesome_icon.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.widget_no_net_notify = theme.dir .. "/icons/no_net_notify.png" theme.vol_bg = theme.dir .. "/icons/vol_bg.png" theme.layout_txt_tile = "[t]" @@ -55,16 +54,12 @@ theme.layout_txt_fullscreen = "[F]" theme.layout_txt_magnifier = "[M]" theme.layout_txt_floating = "[*]" --- vain related -theme.border_focus_highprio = "#FF0000" -theme.border_normal_highprio = "#A03333" -theme.border_focus_lowprio = "#3333FF" -theme.border_normal_lowprio = "#333366" +-- lain related theme.useless_gap_width = "6" -theme.layout_txt_uselesstile = "[ut]" -theme.layout_txt_uselessfairv = "[ufv]" -theme.layout_txt_uselessfairh = "[ufh]" theme.layout_txt_termfair = "[termfair]" +theme.layout_txt_uselessfair = "[uf]" +theme.layout_txt_uselessfairh = "[ufh]" theme.layout_txt_uselessdwindle = "[ud]" +theme.layout_txt_uselesstile = "[ut]" return theme