From f926898ac1e08ab9aeb482c6c59185ebfabdd84b Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Fri, 16 May 2014 11:34:10 +0200 Subject: [PATCH] new modular branch --- README.rst | 7 +- freedesktop/init.lua | 5 -- myrc/run_once.lua | 10 --- rc.lua.blackburn | 12 ++-- rc.lua.copland | 43 ++++++------ rc.lua.dremora | 6 +- rc.lua.holo | 6 +- rc.lua.multicolor | 14 ++-- rc.lua.powerarrow-darker | 10 +-- rc.lua.rainbow | 6 +- rc.lua.steamburn | 10 +-- settings/binds.lua | 6 +- settings/rules.lua | 2 +- settings/startup.lua | 15 ++++- settings/tags.lua | 19 +++--- {myrc => stock}/errors.lua | 0 stock/signals.lua | 2 +- stock/taglist.lua | 14 ++-- stock/tasklist.lua | 65 ++++++++++--------- stock/wallpaper.lua | 2 +- themes/blackburn/theme.lua | 2 +- themes/copland/theme.lua | 8 +-- themes/dremora/theme.lua | 2 +- themes/holo/theme.lua | 2 +- themes/multicolor/theme.lua | 2 +- themes/powerarrow-darker/theme.lua | 2 +- themes/rainbow/theme.lua | 2 +- {eminent => third-party/eminent}/init.lua | 0 .../freedesktop}/README.md | 0 .../freedesktop}/desktop.lua | 0 .../freedesktop}/freedesktop.lua | 2 +- third-party/freedesktop/init.lua | 5 ++ .../freedesktop}/menu.lua | 0 .../freedesktop}/utils.lua | 2 +- .../scratchdrop}/README.md | 0 .../scratchdrop}/init.lua | 0 36 files changed, 145 insertions(+), 138 deletions(-) delete mode 100644 freedesktop/init.lua delete mode 100644 myrc/run_once.lua rename {myrc => stock}/errors.lua (100%) rename {eminent => third-party/eminent}/init.lua (100%) rename {freedesktop => third-party/freedesktop}/README.md (100%) rename {freedesktop => third-party/freedesktop}/desktop.lua (100%) rename {freedesktop => third-party/freedesktop}/freedesktop.lua (98%) create mode 100644 third-party/freedesktop/init.lua rename {freedesktop => third-party/freedesktop}/menu.lua (100%) rename {freedesktop => third-party/freedesktop}/utils.lua (99%) rename {scratchdrop => third-party/scratchdrop}/README.md (100%) rename {scratchdrop => third-party/scratchdrop}/init.lua (100%) diff --git a/README.rst b/README.rst index 7bb457a..0f99380 100644 --- a/README.rst +++ b/README.rst @@ -41,6 +41,7 @@ Notable features - Non-empty tag browsing - Dynamic useless gaps - Dynamic tagging +- Modular Gallery ======= @@ -102,7 +103,7 @@ Switch a theme this way: :: Alternatively, you can use `switch-theme.sh`_, which will also update to the latest commit. -Then, eventually customize your ``rc.lua``, and restart Awesome (``Mod4 + ctrl + r``). +Then, eventually customize your settings and restart Awesome (``Mod4 + ctrl + r``). Notes ===== @@ -119,7 +120,7 @@ Blackburn and Dremora use Icons_: be sure to have bitmaps enabled if running und Freedesktop uses ``/etc/mime.types``, so be sure to have MIME support installed. -Eminent, freedesktop and scratchdrop are third-party softwares: **either disable them or rely on their creators if they cause you** slowdowns_ **or** issues_ **.** +If you have issues with `third-party` modules, **either disable them or report to their creators**. Feel free to email me if you have any request. @@ -141,5 +142,3 @@ Feel free to email me if you have any request. .. _Icons: https://github.com/copycat-killer/dots/tree/master/.fonts .. _Debian: http://weiwu.sdf.org/100921.html .. _Ubuntu: https://wiki.ubuntu.com/Fonts#Enabling_Bitmapped_Fonts -.. _slowdowns: https://github.com/copycat-killer/awesome-copycats/issues/24#issuecomment-33289499 -.. _issues: https://github.com/copycat-killer/awesome-copycats/issues/12 diff --git a/freedesktop/init.lua b/freedesktop/init.lua deleted file mode 100644 index 955754e..0000000 --- a/freedesktop/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("freedesktop.utils") -require("freedesktop.menu") -require("freedesktop.desktop") - -module("freedesktop") diff --git a/myrc/run_once.lua b/myrc/run_once.lua deleted file mode 100644 index 26a17ce..0000000 --- a/myrc/run_once.lua +++ /dev/null @@ -1,10 +0,0 @@ -local awful = require("awful") - -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 .. ")") -end diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 7f4c1cd..67e5ba9 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -1,6 +1,6 @@ --[[ - Blackburn Awesome WM config 2.0 + Blackburn Awesome WM config 3.0 github.com/copycat-killer --]] @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -38,7 +38,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox @@ -230,9 +230,9 @@ globalkeys = awful.util.table.join(globalkeys, awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) 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 () yawn.show(7) end), + 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 () yawn.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.copland b/rc.lua.copland index 9b792ac..06ad16b 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -1,6 +1,6 @@ --[[ - Copland Awesome WM config + Copland Awesome WM config 3.0 github.com/copycat-killer --]] @@ -14,11 +14,11 @@ local wibox = require("wibox") local beautiful = require("beautiful") local naughty = require("naughty") local lain = require("lain") -local eminent = require("eminent") +local eminent = require("third-party/eminent") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -45,7 +45,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox @@ -166,23 +166,24 @@ diskwidget:set_bgimage(beautiful.widget_bg) -- ALSA volume bar volicon = wibox.widget.imagebox(beautiful.vol) volume = lain.widgets.alsabar({width = 55, ticks = true, ticks_size = 6, -settings = function() - if volume_now.status == "off" then - volicon:set_image(beautiful.vol_mute) - elseif volume_now.level == 0 then - volicon:set_image(beautiful.vol_no) - elseif volume_now.level <= 50 then - volicon:set_image(beautiful.vol_low) - else - volicon:set_image(beautiful.vol) - end -end, -colors = -{ - background = beautiful.bg_normal, - mute = "#EB8F8F", - unmute = beautiful.fg_normal -}}) + settings = function() + if volume_now.status == "off" then + volicon:set_image(beautiful.vol_mute) + elseif volume_now.level == 0 then + volicon:set_image(beautiful.vol_no) + elseif volume_now.level <= 50 then + volicon:set_image(beautiful.vol_low) + else + volicon:set_image(beautiful.vol) + end + end, + colors = + { + background = beautiful.bg_normal, + mute = "#EB8F8F", + unmute = beautiful.fg_normal + } +}) volmargin = wibox.layout.margin(volume.bar, 2, 7) volmargin:set_top(6) volmargin:set_bottom(6) diff --git a/rc.lua.dremora b/rc.lua.dremora index 08ef791..6148e2e 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -1,6 +1,6 @@ --[[ - Dremora Awesome WM config 2.0 + Dremora Awesome WM config 3.0 github.com/copycat-killer --]] @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -38,7 +38,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox diff --git a/rc.lua.holo b/rc.lua.holo index bfe21bb..53b59e9 100644 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -1,6 +1,6 @@ --[[ - Holo Awesome WM config 2.0 + Holo Awesome WM config 3.0 github.com/copycat-killer --]] @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -40,7 +40,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 22b3ac8..2db3b1f 100644 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -1,6 +1,6 @@ --[[ - Multicolor Awesome WM config 2.0 + Multicolor Awesome WM config 3.0 github.com/copycat-killer --]] @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -38,11 +38,11 @@ require("stock.wallpaper") -- }}} -- {{{ Freedesktop Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox -markup = lain.util.markup +markup = lain.util.markup -- Textclock clockicon = wibox.widget.imagebox(beautiful.widget_clock) @@ -287,9 +287,9 @@ globalkeys = awful.util.table.join(globalkeys, 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, }, "w", function () yawn.show(7) end), + awful.key({ altkey }, "c", function () lain.widgets.calendar:show(7) end), + awful.key({ altkey }, "h", function () fswidget.show(7) end), + awful.key({ altkey }, "w", function () yawn.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 2ee55b6..f5b7d16 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -1,6 +1,6 @@ --[[ - Powerarrow Darker Awesome WM config 2.0 + Powerarrow Darker Awesome WM config 3.0 github.com/copycat-killer --]] @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -41,7 +41,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox @@ -283,8 +283,8 @@ globalkeys = awful.util.table.join(globalkeys, 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 () fswidget.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/rc.lua.rainbow b/rc.lua.rainbow index 9749f21..358c413 100644 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -1,6 +1,6 @@ --[[ - Rainbow Awesome WM config 2.0 + Rainbow Awesome WM config 3.0 github.com/copycat-killer --]] @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -42,7 +42,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox diff --git a/rc.lua.steamburn b/rc.lua.steamburn index 00bdb00..78411bd 100644 --- a/rc.lua.steamburn +++ b/rc.lua.steamburn @@ -17,7 +17,7 @@ local lain = require("lain") -- }}} -- Error handling -require("myrc.errors") +require("stock.errors") -- STARTUP apps require("settings.startup") @@ -42,7 +42,7 @@ require("stock.wallpaper") -- }}} -- {{{ Menu -require("freedesktop/freedesktop") +require("third-party/freedesktop/freedesktop") -- }}} -- {{{ Wibox @@ -237,9 +237,9 @@ globalkeys = awful.util.table.join(globalkeys, end), -- Widgets popups - awful.key({ altkey, }, "c", function () lain.widgets.calendar:show(7) end), - awful.key({ altkey, }, "h", function () fshomeupd.show(7) end), - awful.key({ altkey, }, "w", function () yawn.show(7) end), + awful.key({ altkey }, "c", function () lain.widgets.calendar:show(7) end), + awful.key({ altkey }, "h", function () fshomeupd.show(7) end), + awful.key({ altkey }, "w", function () yawn.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", diff --git a/settings/binds.lua b/settings/binds.lua index 67484d5..634bcd8 100644 --- a/settings/binds.lua +++ b/settings/binds.lua @@ -1,13 +1,15 @@ local awful = require("awful") -local drop = require("scratchdrop") -local lain = require("lain") +local drop = require("third-party/scratchdrop") +local lain = require("lain") -- {{{ 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 diff --git a/settings/rules.lua b/settings/rules.lua index 048c7bf..1fde010 100644 --- a/settings/rules.lua +++ b/settings/rules.lua @@ -1,4 +1,4 @@ -local awful = require("awful") +local awful = require("awful") local beautiful = require("beautiful") -- {{{ Rules diff --git a/settings/startup.lua b/settings/startup.lua index 0849178..fc46458 100644 --- a/settings/startup.lua +++ b/settings/startup.lua @@ -1,4 +1,17 @@ -require("myrc.run_once") +-- {{{ Run once function + +local awful = require("awful") + +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 .. ")") +end + +-- }}} -- {{{ Autostart applications diff --git a/settings/tags.lua b/settings/tags.lua index 898c07a..6e3cb46 100644 --- a/settings/tags.lua +++ b/settings/tags.lua @@ -17,17 +17,18 @@ layouts = { tags = { - names = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, + names = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, -- default + -- names = { "ƀ", "Ƅ", "Ɗ", "ƈ", "ƙ" }, -- blackburn/dremora layout = { layouts[1], - layouts[1], - layouts[1], - layouts[1], - layouts[1], - layouts[1], - layouts[1], - layouts[1], - layouts[1], + layouts[2], + layouts[3], + layouts[4], + layouts[5], + layouts[6], + layouts[7], + layouts[8], + layouts[9], } } diff --git a/myrc/errors.lua b/stock/errors.lua similarity index 100% rename from myrc/errors.lua rename to stock/errors.lua diff --git a/stock/signals.lua b/stock/signals.lua index e851b10..986c1e3 100644 --- a/stock/signals.lua +++ b/stock/signals.lua @@ -1,4 +1,4 @@ -local awful = require("awful") +local awful = require("awful") local beautiful = require("beautiful") -- {{{ Signals diff --git a/stock/taglist.lua b/stock/taglist.lua index 3b80c9d..0a27435 100644 --- a/stock/taglist.lua +++ b/stock/taglist.lua @@ -2,10 +2,10 @@ local awful = require("awful") mytaglist = {} mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), - 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) - ) + awful.button({ }, 1, awful.tag.viewonly), + awful.button({ modkey }, 1, awful.client.movetotag), + 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) +) diff --git a/stock/tasklist.lua b/stock/tasklist.lua index a3bf8cc..01c0aed 100644 --- a/stock/tasklist.lua +++ b/stock/tasklist.lua @@ -2,35 +2,36 @@ local awful = require("awful") mytasklist = {} mytasklist.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() then - awful.tag.viewonly(c:tags()[1]) - end - -- This will also un-minimize - -- the client, if needed - client.focus = c - 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({ }, 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)) + 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() then + awful.tag.viewonly(c:tags()[1]) + end + -- This will also un-minimize + -- the client, if needed + client.focus = c + 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({ }, 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) +) diff --git a/stock/wallpaper.lua b/stock/wallpaper.lua index 2c70a7f..5c30967 100644 --- a/stock/wallpaper.lua +++ b/stock/wallpaper.lua @@ -1,5 +1,5 @@ local beautiful = require("beautiful") -local gears = require("gears") +local gears = require("gears") -- {{{ Wallpaper if beautiful.wallpaper then diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index c92de3a..0c8d084 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -1,6 +1,6 @@ --[[ - Blackburn Awesome WM config 2.0 + Blackburn Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index c89f643..d2131fb 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -1,8 +1,8 @@ --[[ - - Copland Awesome WM config - github.com/copycat-killer - + + Copland Awesome WM config 3.0 + github.com/copycat-killer + --]] theme = {} diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua index fa2c83b..25ed153 100644 --- a/themes/dremora/theme.lua +++ b/themes/dremora/theme.lua @@ -1,6 +1,6 @@ --[[ - Dremora Awesome WM config 2.0 + Dremora Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index def2885..546149d 100644 --- a/themes/holo/theme.lua +++ b/themes/holo/theme.lua @@ -1,6 +1,6 @@ --[[ - Holo Awesome WM config 2.0 + Holo Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index fa774a9..da105d3 100644 --- a/themes/multicolor/theme.lua +++ b/themes/multicolor/theme.lua @@ -1,6 +1,6 @@ --[[ - Multicolor Awesome WM config 2.0 + Multicolor Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/themes/powerarrow-darker/theme.lua b/themes/powerarrow-darker/theme.lua index 7a65c61..811ebeb 100644 --- a/themes/powerarrow-darker/theme.lua +++ b/themes/powerarrow-darker/theme.lua @@ -1,6 +1,6 @@ --[[ - Powerarrow Darker Awesome WM config 2.0 + Powerarrow Darker Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index fa2955d..1c4be28 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -1,6 +1,6 @@ --[[ - Rainbow Awesome WM config 2.0 + Rainbow Awesome WM config 3.0 github.com/copycat-killer --]] diff --git a/eminent/init.lua b/third-party/eminent/init.lua similarity index 100% rename from eminent/init.lua rename to third-party/eminent/init.lua diff --git a/freedesktop/README.md b/third-party/freedesktop/README.md similarity index 100% rename from freedesktop/README.md rename to third-party/freedesktop/README.md diff --git a/freedesktop/desktop.lua b/third-party/freedesktop/desktop.lua similarity index 100% rename from freedesktop/desktop.lua rename to third-party/freedesktop/desktop.lua diff --git a/freedesktop/freedesktop.lua b/third-party/freedesktop/freedesktop.lua similarity index 98% rename from freedesktop/freedesktop.lua rename to third-party/freedesktop/freedesktop.lua index 03fe439..f07376d 100644 --- a/freedesktop/freedesktop.lua +++ b/third-party/freedesktop/freedesktop.lua @@ -7,7 +7,7 @@ local awful = require("awful") local beautiful = require("beautiful") -require('freedesktop') +require('third-party/freedesktop') -- require("debian.menu") freedesktop.utils.terminal = terminal -- defined in rc.lua, otherwise define it here (default: "xterm") diff --git a/third-party/freedesktop/init.lua b/third-party/freedesktop/init.lua new file mode 100644 index 0000000..dd1a22c --- /dev/null +++ b/third-party/freedesktop/init.lua @@ -0,0 +1,5 @@ +require("third-party/freedesktop.utils") +require("third-party/freedesktop.menu") +require("third-party/freedesktop.desktop") + +module("freedesktop") diff --git a/freedesktop/menu.lua b/third-party/freedesktop/menu.lua similarity index 100% rename from freedesktop/menu.lua rename to third-party/freedesktop/menu.lua diff --git a/freedesktop/utils.lua b/third-party/freedesktop/utils.lua similarity index 99% rename from freedesktop/utils.lua rename to third-party/freedesktop/utils.lua index c5247c3..f9358e7 100644 --- a/freedesktop/utils.lua +++ b/third-party/freedesktop/utils.lua @@ -190,7 +190,7 @@ function parse_desktop_file(arg) end end - if program.Exec then + if program.Exec and program.Name then local cmdline = program.Exec:gsub('%%c', program.Name) cmdline = cmdline:gsub('%%[fmuFMU]', '') cmdline = cmdline:gsub('%%k', program.file) diff --git a/scratchdrop/README.md b/third-party/scratchdrop/README.md similarity index 100% rename from scratchdrop/README.md rename to third-party/scratchdrop/README.md diff --git a/scratchdrop/init.lua b/third-party/scratchdrop/init.lua similarity index 100% rename from scratchdrop/init.lua rename to third-party/scratchdrop/init.lua