pre-update stuff

Rakefile

@@ -48,13 +48,10 @@ end
 
 desc "Install extras"
 task "install-extra" do
-  if Process.euid != 0
-    raise Exception, "You need to be root to install extras" 
-  end
   cp "./extra/udev/backlight.rules", "/etc/udev/rules.d"
   mkdir "#{ConfigPath}/autostart"
   begin
-    cp "/usr/share/applications/picom.desktop", "#{ConfigPath}/autostart/"
+    sh "sudo cp /usr/share/applications/picom.desktop #{ConfigPath}/autostart/"
   rescue 
     puts "picom not installed - ignoring"
   else 
@@ -68,14 +65,6 @@ task :clean do
   rm_rf "#{ConfigPath}/awesome"
 end 
 
-desc "Install dependencies for code cleaner"
-task "install-janitor-deps" do
-  if Process.euid != 0
-    raise Exception, "You need to be root to install gems" 
-  end
-  Gem.install "language_server-protocol"
-end
-
 desc "Wipe configuration and reinstall from scratch"
 task reinstall: [:clean,:install]
 

libs/awmtk2.lua

@@ -64,10 +64,10 @@ awmtk.create_template_lib = function(name,parent,overrides)
     )
 end
 
-awmtk.build_templates = function(templates,style)
+awmtk.build_templates = function(templates,style,vertical)
     local new_templates = {}
     for name,template in pairs(awmtk.proto_templates) do
-        new_templates[name] = templates[name](style)
+        new_templates[name] = templates[name](style,vertical)
     end
     return new_templates
 end

libs/builder.lua

@@ -45,16 +45,16 @@ return function(description,opts)
     local buttons = opts.buttons
     -- Build a layout given a JSON description, a style and client 
     -- (if applicable)
-    local layout = {}
     local test,err = json.decode(description)
     if not test then
         error("Builder failure: "..err)
     end
-    local function inner_builder(struct)
+    local function inner_builder(struct,vertical)
         if struct.widget then -- External widget descriptions
             return require(struct.widget)(gears.table.join({
                 layout = (struct.layout and inner_builder(struct.layout)),                         client = (struct.client and c),
-                screen = (struct.screen and s)
+                screen = (struct.screen and s),
+                vertical = vertical
             },struct.options or {},opts.passthrough or {}))
         elseif struct.list then -- List descriptions
             local list = {
@@ -64,11 +64,11 @@ return function(description,opts)
                 )],
                 spacing = style.spacing
             }
-            for k,v in pairs(struct.list) do
+            for _,v in pairs(struct.list) do
                 if v.draggable then
                     list.buttons = buttons
                 else
-                    local new_obj = inner_builder(v)
+                    local new_obj = inner_builder(v,struct.vertical)
                     if new_obj then
                         table.insert(list,new_obj)
                     end
@@ -101,7 +101,7 @@ return function(description,opts)
                     if obj.draggable then
                         list[k].buttons = buttons
                     else
-                        local new_obj = inner_builder(obj)
+                        local new_obj = inner_builder(obj,struct.vertical)
                         if new_obj then
                             table.insert(list[k],new_obj)
                         end
@@ -127,5 +127,5 @@ return function(description,opts)
         gears.debug.dump(struct)
         error("Builder error: invalid object description")
     end
-    return inner_builder(test,layout),test.context_options
+    return inner_builder(test),test.context_options
 end

modules/xdg_data.lua

@@ -6,29 +6,30 @@
 --
 --  You should have received a copy of the GNU General Public License along with Reno desktop. If not, see <https://www.gnu.org/licenses/>. 
 -- Asynchronous XDG data aggregator
+local start_human = os.time()
+local start_computer = os.clock()
 local menu_utils = require("menubar.utils")
 local menu_gen = require("menubar.menu_gen")
 local awful = require("awful")
 local gears = require("gears")
+local json = require("dkjson")
 menu_utils.wm_name = ""
 
 -- Directories to scan for .desktop files
 local desktop_dirs = {}
 local desktop_dirs_complete = 0
-local icon_dirs = {}
+local _ = ((table.concat(gears.filesystem.get_xdg_data_dirs(),":") or
-((table.concat(gears.filesystem.get_xdg_data_dirs(),":") or 
+"/usr/share:/usr/local/share")..":"..os.getenv("HOME").."/.local/share"):gsub("[^:]*",function(path)
- "/usr/share:/usr/local/share")..":"..os.getenv("HOME").."/.local/share"):gsub("[^:]*",function(path)
     if gears.filesystem.dir_readable(path.."/applications") then
         table.insert(desktop_dirs, path.."/applications")
     end
-    if gears.filesystem.dir_readable(path.."/icons") then
-        table.insert(icon_dirs, path.."/icons")
-    end
 end)
 
 
--- Global xdg data cache 
+-- Global xdg data struct
-xdg = {
+_G.xdg = {
+    directory_integrity = {},
+    directory_listings = {},
     apps = {},
     categories = {
         Other = {
@@ -42,7 +43,16 @@ xdg = {
     }
 }
 
-for k,v in pairs(menu_gen.all_categories) do
+-- Load cached applications
+local cache_file = io.open(gears.filesystem.get_xdg_cache_home()..".reno_xdg_cache.json","r")
+local cache
+if cache_file then
+    cache = json.decode(cache_file:read("*a"))
+    cache_file:close()
+end
+
+-- Add missing category entries as defined by awesome
+for _,v in pairs(menu_gen.all_categories) do
     xdg.categories[v.app_type] = {
         name = v.name,
         icon = v.icon_name,
@@ -51,58 +61,83 @@ for k,v in pairs(menu_gen.all_categories) do
 end
 
 -- Asynchronous scanning process
-for k,v in pairs(desktop_dirs) do
+for _,v in pairs(desktop_dirs) do
-    awful.spawn.with_line_callback("find "..tostring(v).." -name *.desktop",{
+        xdg.directory_listings[v] = {}
-        stdout = function(line)
+        awful.spawn.with_line_callback("find "..tostring(v).." -maxdepth 1 -name *.desktop",{
-            local data = menu_utils.parse_desktop_file(line)
+            stdout = function(line)
-            if data.NoDisplay then
+                -- Assume the cache is valid for a listed file
-                return
+                if cache and cache.directory_listings[v][line] then
-            end
+                    xdg.directory_listings[v][line] = true
-            local appdata = {
+                    xdg.apps[line] = cache.apps[line]
-                name = data.Name,
+                    xdg.categories[cache.apps[line].category].apps[line] = cache.apps[line]
-                category = "Other",
+                    return
-                exec = data.Exec,
-                icon = (data.Icon and menu_utils.lookup_icon(data.Icon)),
-                description = data.Comment
-            }
-            -- Match first available cateogry for sorting
-            for k,v in pairs(data.Categories or {"Other"}) do
-                if xdg.categories[v] then
-                    appdata.category = v
-                    break
                 end
-                -- Oh how do I love those Wine applications and their categories
+                local data = menu_utils.parse_desktop_file(line)
-                if v:match("^Wine") then
+                if data.NoDisplay then
+                    return
+                end
+                local appdata = {
+                    name = data.Name,
+                    category = "Other",
+                    exec = data.Exec,
+                    icon = (data.Icon and menu_utils.lookup_icon(data.Icon)),
+                    description = data.Comment
+                }
+                -- Match first available cateogry for sorting
+                for _,vv in pairs(data.Categories or {"Other"}) do
+                    if xdg.categories[vv] then
+                        appdata.category = vv
+                        break
+                    end
+                    -- Oh how do I love those Wine applications and their categories
+                    if vv:match("^Wine") then
+                        appdata.category = "Wine"
+                        break
+                    end
+                end
+                -- Open terminal apps in the terminal (duh)
+                if data.Terminal then
+                    appdata.exec = global.terminal.." -e "..appdata.exec
+                end
+                -- Just for you, Wine - special case because you're being a shit
+                if (appdata.exec and appdata.exec:find("%W?wine ")) then
                     appdata.category = "Wine"
-                    break
                 end
+                xdg.apps[line] = appdata
+                xdg.categories[appdata.category].apps[line] = appdata
+                -- Add the file to the listing of cached ones
+                xdg.directory_listings[v][line] = true
+            end,
+            output_done = function()
+                -- Save directory listing hash
+                desktop_dirs_complete = desktop_dirs_complete + 1
+                -- Call a global signal
+                awesome.emit_signal("xdg::dir_finished",v)
             end
-            -- Open terminal apps in the terminal (duh)
+        })
-            if data.Terminal then
-                appdata.exec = global.terminal.." -e "..appdata.exec
-            end
-            -- Just for you, Wine - special case because you're being a shit
-            if (exec and exec:find("%W?wine ")) then
-                appdata.category = "Wine"
-            end
-            table.insert(xdg.apps,appdata)
-            table.insert(xdg.categories[appdata.category].apps,appdata)
-        end,
-        output_done = function()
-            -- Call a global signal 
-            desktop_dirs_complete = desktop_dirs_complete + 1
-            awesome.emit_signal("xdg::dir_finished",v)
-        end
-    })
 end
+
+local count = function(t)
+    local n = 0
+    for _,_ in pairs(t) do
+        n = n + 1
+    end
+    return n
+end
+
 awesome.connect_signal("xdg::dir_finished",function(dir)
+    -- We only send the all_finished signal when all directories finished processing
     if desktop_dirs_complete == #desktop_dirs then
-        awesome.emit_signal("xdg::all_finished")
         -- Clean up empty categories
         for k,v in pairs(xdg.categories) do
-            if #v.apps == 0 then
+            if count(v.apps) == 0 then
                 xdg.categories[k] = nil
             end
         end
+        -- Save the cache if it doesn't exist yet
+        io.open(gears.filesystem.get_xdg_cache_home()..".reno_xdg_cache.json","w"):write(json.encode(xdg)):close()
+        require("naughty").notify({title = "Human time: "..tostring(os.time()-start_human),text = "Computer time: "..tostring(os.clock()-start_computer)})
+        -- Finally, call the all_finished signal
+        awesome.emit_signal("xdg::all_finished")
     end
 end)

themes/widget_calibration/COPYING.txt

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

themes/widget_calibration/WARNING.txt

@@ -0,0 +1,3 @@
+A compositor (like compton) is ***required*** for this theme to work as intended.
+This is in part due to the fact that it makes the top bar look less bland, and in part due to the fact that your titlebar corners will look weird otherwise (the corners won't be properly cut).
+You may, of course, dismiss using a compositor, but don't tell me about not exactly round corners being a "bug" in this theme afterwards - it's the best you can get with Awesome.

themes/widget_calibration/config/client_menu.json

@@ -0,0 +1,8 @@
+{
+    "list": [
+        {"widget": "widgets.clientvolume"},
+        {"widget": "widgets.clientcontrols"},
+        {"widget": "widgets.clientbuttons"}
+    ],
+    "vertical":true
+}

themes/widget_calibration/config/global.json

@@ -0,0 +1,9 @@
+{
+    "widgets.dismal":{
+        "x":0,
+        "y":26
+    },
+    "widgets.rootmenu":{},
+    "widgets.lockscreen":{},
+    "widgets.base.keypopup":{}
+}

themes/widget_calibration/config/lockpanel.json

@@ -0,0 +1,5 @@
+{
+    "widgets.lock.clock":{
+        "format": "%a %b %d\n %H: %M"
+    }   
+}

themes/widget_calibration/config/root_menu.json

@@ -0,0 +1,22 @@
+{
+    "list": [
+        {"widget": "widgets.base.popuptitle",
+            "options":{
+                "title":"Reno Unity"
+            }
+        },
+        {"widget": "widgets.base.tagswitcher",
+            "screen":true
+        },
+        {"widget": "widgets.rootcontrols"},
+        {"widget": "widgets.xdgmenu",
+            "options": {
+                "exclude_category": [
+                    "Other"
+                ]
+            }
+        },
+        {"widget": "widgets.rootbuttons"}
+    ],
+    "vertical": true
+}

themes/widget_calibration/config/root_menu_test.json

@@ -0,0 +1,32 @@
+{
+    "list": [
+        {
+            "list": [
+                {"widget": "widgets.base.popuptitle",
+                    "options":{
+                        "title":"Reno Unity"
+                    }
+                },
+                {"widget": "widgets.rootcontrols"},
+                {"widget": "widgets.xdgmenu",
+                    "options": {
+                        "exclude_category": [
+                            "Other"
+                        ]
+                    }
+                }
+            ],
+            "vertical": true
+        },
+        {
+            "list":[
+                {"widget": "widgets.base.tagswitcher",
+                    "screen":true
+                },
+                {"widget": "widgets.rootbuttons"}
+            ],
+            "vertical":true
+        }
+    ],
+    "vertical":false
+}

themes/widget_calibration/config/titlebar_top.json

@@ -0,0 +1,42 @@
+{ 
+"align": {
+    "left": [
+        {
+            "widget":"widgets.clientmenu",
+            "client":true
+        }
+    ],
+    "center": [
+        {
+            "draggable": true
+        },
+        {
+            "builtin": "titlewidget",
+            "client" : true,
+            "options": {
+                "align": "left"
+            }
+        }
+    ],
+    "right": [
+        { "widget": "widgets.base.subpanel",
+          "layout": {
+                "list": [
+                    {
+                        "builtin": "minimizebutton",
+                        "client": true
+                    },
+                    {
+                        "builtin": "maximizedbutton",
+                        "client": true
+                    },
+                    {
+                        "builtin": "closebutton",
+                        "client": true
+                    }
+                ]
+          }
+        }
+    ]
+}
+}  

themes/widget_calibration/config/wibar_bottom.json

@@ -0,0 +1,18 @@
+{ 
+    "align": {
+        "left": [
+            {
+                "widget": "widgets.tasklist",
+                "screen": true
+            }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            {
+                "widget": "widgets.launcher"
+            }
+        ]
+    }
+}  

themes/widget_calibration/config/wibar_left.json

@@ -0,0 +1,19 @@
+{ 
+    "align": {
+        "left": [
+            {
+                "widget": "widgets.tasklist",
+                "screen": true
+            }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            {
+                "widget": "widgets.launcher"
+            }
+        ]
+    },
+    "vertical": true
+}  

themes/widget_calibration/config/wibar_right.json

@@ -0,0 +1,26 @@
+{ 
+    "align": {
+        "left": [ 
+            { "widget": "widgets.soundclown" }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            { "widget":"widgets.volume" },
+            { "widget": "widgets.notifications",
+                "screen": true
+            },
+            { "widget": "widgets.wallpapers",
+                "screen": true,
+                "options": {
+                    "path": "$HOME/Pictures/Wallpapers"
+                }
+            },
+            { "widget": "widgets.battery" },
+            { "widget": "widgets.base.systray" },
+            { "widget": "widgets.base.clock" }
+        ]
+    },
+    "vertical":true
+}  

themes/widget_calibration/config/wibar_top.json

@@ -0,0 +1,25 @@
+{ 
+    "align": {
+        "left": [ 
+            { "widget": "widgets.soundclown" }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            { "widget":"widgets.volume" },
+            { "widget": "widgets.notifications",
+                "screen": true
+            },
+            { "widget": "widgets.wallpapers",
+                "screen": true,
+                "options": {
+                    "path": "$HOME/Pictures/Wallpapers"
+                }
+            },
+            { "widget": "widgets.battery" },
+            { "widget": "widgets.base.systray" },
+            { "widget": "widgets.base.clock" }
+        ]
+    }
+}  

themes/widget_calibration/icons/README

@@ -0,0 +1,3 @@
+Licensed under conditions of CC0 (https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt)
+
+To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno98 icons

themes/widget_calibration/theme.lua

@@ -0,0 +1,671 @@
+-- Reno Unity - Unity theme for Reno desktop
+--[[
+    Reno Unity - A theme for Reno desktop
+
+    Written in 2022 by Yessiest (yessiest@memeware.net)
+
+    To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
+
+    You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
+--]]
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+local gears = require("gears")
+local themes_path = root_path.."/themes/"
+
+local theme = {}
+
+theme.font          = "Ubuntu 8"
+
+theme.bg_normal     = "#19191D"
+theme.bg_focus      = "#3E3E3E"
+theme.bg_urgent     = "#2E2E2E"
+theme.bg_minimize   = "#2E2E2E"
+theme.bg_highlight  = "#45433D"
+theme.bg_systray    = theme.bg_normal
+
+theme.fg_normal     = "#e1dec7"
+theme.fg_focus      = "#e1dec7"
+theme.fg_urgent     = "#e1dec7"
+theme.fg_minimize   = "#e1dec7"
+
+theme.window_rounding = 5
+theme.useless_gap   = dpi(0)
+-- technically speaking these are irrelevant since they're not exactly smart
+-- borders
+theme.border_width  = dpi(0)
+theme.border_normal = "#c0c0c0"
+theme.border_focus  = "#c0c0c0"
+theme.border_marked = "#c0c0c0"
+
+local bsize = 50
+
+theme.button_bg_focus = {
+    type = "radial",
+    from = {bsize/2,-0.5*bsize,bsize/10},
+    to = {bsize/2,-0.5*bsize,bsize*2},
+    stops = {
+        { 0 , "#FFFFFFBB"},
+        { 0.45, "#DF744E99"},
+        { 0.55, "#DF744E99"},
+        { 1, "#FFFFFF44"}
+    }
+}
+
+theme.button_bg_normal = {
+    type = "radial",
+    from = {bsize/2,-0.5*bsize,bsize/10},
+    to = {bsize/2,-0.2*bsize,bsize*1.5},
+    stops = {
+        { 0 , "#FFFFFFFF"},
+        { 0.5, "#33333333"},
+        { 1, "#FFFFFF22"}
+    }
+}
+
+theme.button_shape = function(cr,width,height)
+    return require("gears").shape.rounded_rect(cr,width,height,2)
+end
+
+
+theme.bar_bg_focus = {
+    type = "linear",
+    from = { 0, 20 },
+    to = { 0, 0 },
+    stops = { { 0, "#3C3B37"} , { 1 , "#59574E"} }
+}
+
+theme.bar_bg_normal = {
+    type = "linear",
+    from = { 0, 20 },
+    to = { 0, 0 },
+    stops = { { 0, "#3C3B37"} , { 1 , "#41403D"} }
+}
+
+theme.bar_bg_inverted_normal = {
+    type = "linear",
+    from = { 0, 20 },
+    to = { 0, 0 },
+    stops = { { 0 , "#41403D"}, { 1, "#3C3B37"} }
+}
+
+theme.bar_bg_inverted_focus = {
+    type = "linear",
+    from = { 0, 20 },
+    to = { 0, 0 },
+    stops = { { 0 , "#59574E"}, { 1, "#3C3B37"} }
+}
+
+theme.bar_border_color = {
+    type = "radial",
+    from = {bsize/2,bsize/(-3),bsize/8},
+    to = {bsize/2,bsize/(-5),bsize*1},
+    stops = {
+        { 0 , "#FFFFFF66"},
+        { 1, "#43434366"},
+    }
+}
+
+theme.titlebar_bg_focus = theme.bar_bg_focus
+theme.titlebar_bg_normal = theme.bar_bg_normal
+
+local taglist_square_size = dpi(4)
+theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
+    taglist_square_size, theme.fg_normal
+)
+theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
+    taglist_square_size, theme.fg_normal
+)
+theme.menu_height = dpi(15)
+theme.menu_width  = dpi(100)
+theme.systray_icon_spacing = 2
+
+-- Define the image to load
+
+theme.titlebar_ontop_button_normal_inactive = themes_path.."unity/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."unity/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."unity/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."unity/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = themes_path.."unity/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."unity/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."unity/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."unity/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = themes_path.."unity/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."unity/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."unity/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."unity/titlebar/floating_focus_active.png"
+
+theme = theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal")
+theme = theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus")
+
+theme.titlebar_close_button_normal = themes_path.."unity/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."unity/titlebar/close_focus.png"
+
+theme.titlebar_minimize_button_normal = themes_path.."unity/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."unity/titlebar/minimize_focus.png"
+
+theme.titlebar_maximized_button_normal_inactive = themes_path.."unity/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."unity/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."unity/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."unity/titlebar/maximized_focus_active.png"
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = themes_path.."unity/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."unity/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."unity/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."unity/layouts/magnifierw.png"
+theme.layout_max = themes_path.."unity/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."unity/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."unity/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."unity/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."unity/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."unity/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."unity/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."unity/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."unity/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."unity/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."unity/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."unity/layouts/cornersew.png"
+
+-- Generate Awesome icon:
+theme.awesome_icon = theme_assets.awesome_icon(
+    theme.menu_height, theme.bg_focus, theme.fg_focus
+)
+
+theme.hotkeys_border_width = 3
+theme.hotkeys_border_color = theme.bg_focus
+theme.hotkeys_modifiers_fg = theme.fg_normal
+theme.hotkeys_label_fg = theme.fg_normal
+
+---theme.bgimage_outset
+-- Define the icon theme for application icons. If not set then the icons
+-- from /usr/share/icons and /usr/share/icons/hicolor will be used.
+theme.icon_theme = "Humanity"
+
+-- Icons
+local icons = {
+    "battery-caution-charging-symbolic",
+    "battery-empty-charging-symbolic",
+    "battery-full-charging-symbolic",
+    "battery-good-charging-symbolic",
+    "battery-low-charging-symbolic"
+}
+for k,v in pairs(icons) do
+    theme[v] = themes_path.."unity/icons/"..v..".png"
+    theme[v:gsub("-charging","")] = themes_path.."unity/icons/"..v:gsub("-charging","")..".png"
+end
+theme["battery-full-charged-symbolic"] = themes_path.."unity/icons/battery-full-charged-symbolic.png"
+theme["battery-missing-symbolic"] = themes_path.."unity/icons/battery-missing-symbolic.png"
+theme["ac-adapter-symbolic"] = themes_path.."unity/icons/ac-adapter-symbolic.png"
+theme["backlight-symbolic"] = themes_path.."unity/icons/backlight-symbolic.png"
+theme["notifications-area-symbolic"] = themes_path.."unity/icons/notifications-area-symbolic.png"
+
+theme["mpc-previous-symbolic"] = themes_path.."unity/icons/mpc-previous-symbolic.png"
+
+theme["mpc-play-symbolic"] = themes_path.."unity/icons/mpc-play-symbolic.png"
+theme["mpc-pause-symbolic"] = themes_path.."unity/icons/mpc-pause-symbolic.png"
+theme["mpc-next-symbolic"] = themes_path.."unity/icons/mpc-next-symbolic.png"
+
+theme["action-poweroff-symbolic"] = themes_path.."unity/icons/action-poweroff-symbolic.png"
+theme["action-lock-screen-symbolic"] = themes_path.."unity/icons/action-lock-screen-symbolic.png"
+theme["action-suspend-symbolic"] = themes_path.."unity/icons/action-suspend-symbolic.png"
+theme["volume-high-symbolic"] = themes_path.."unity/icons/volume-high-symbolic.png"
+theme["volume-medium-symbolic"] = themes_path.."unity/icons/volume-medium-symbolic.png"
+theme["volume-low-symbolic"] = themes_path.."unity/icons/volume-low-symbolic.png"
+theme["volume-muted-symbolic"] = themes_path.."unity/icons/volume-muted-symbolic.png"
+
+
+theme.wallpaper = themes_path.."unity/background.png"
+theme.wallpapers_icon = themes_path.."unity/icons/wallpapers.png"
+-- Default icon for clients
+-- This one has to be baked as a surface to avoid memory leaks
+theme.icon_default = themes_path.."unity/icons/unknown-app.png"
+
+for k,v in pairs({
+    "battery-caution-symbolic",
+    "battery-empty-symbolic",
+    "battery-full-symbolic",
+    "battery-good-symbolic",
+    "battery-low-symbolic",
+    "battery-caution-charging-symbolic",
+    "battery-empty-charging-symbolic",
+    "battery-full-charging-symbolic",
+    "battery-good-charging-symbolic",
+    "battery-low-charging-symbolic",
+    "battery-full-charged-symbolic",
+    "battery-missing-symbolic",
+    "ac-adapter-symbolic",
+    "backlight-symbolic",
+    "notifications-area-symbolic",
+    "mpc-previous-symbolic",
+    "mpc-play-symbolic",
+    "mpc-pause-symbolic",
+    "mpc-next-symbolic",
+    "action-poweroff-symbolic",
+    "action-lock-screen-symbolic",
+    "action-suspend-symbolic",
+    "wallpapers_icon",
+    "icon_default",
+    "volume-high-symbolic",
+    "volume-medium-symbolic",
+    "volume-low-symbolic",
+    "volume-muted-symbolic"}) do
+    if theme[v] and gears.filesystem.file_readable(theme[v]) then
+        theme[v] = gears.color.recolor_image(theme[v],theme.fg_normal)
+    end
+end
+-- Notification popups settings
+theme.notification_width = 240
+theme.notification_height = 60
+
+
+theme.widgets = {
+    -- {{{ Widget base
+    default = {
+        container = {
+            shape = function(cr,width,height)
+                return require("gears").shape.rounded_rect(cr,width,height,2)
+            end,
+            bgimage_highlight = theme.bgimage_inset
+        },
+        button = {
+            shape = theme.button_shape,
+            onpress = function(widget)
+                widget:set_bg(theme.bg_focus)
+            end,
+            onrelease = function(widget)
+                widget:set_bg(theme.bg_normal)
+            end
+        },
+        popup = {
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,4)
+            end,
+            root_shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,6)
+            end,
+        },
+        titlebar = {
+            hidden_size = 2,
+            root_shape = function(cr,width,height)
+                    return gears.shape.partially_rounded_rect(cr,width,height,
+                    true,true,false,false,6) end,
+            root_bg_focus = theme.titlebar_bg_focus,
+            root_bg_normal = theme.titlebar_bg_normal,
+            top = 2,
+            bottom = 2,
+            left = 3,
+            right = 3
+        },
+        wibar = {
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,0)
+            end,
+            height = 26,
+            width = 60,
+            margins = 3,
+            stretch = true
+        },
+        slider = {
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,0)
+            end,
+            height = 20,
+            width = 140,
+            bg_focus = theme.bg_normal,
+            bg_normal = theme.bg_focus,
+            handle_width = 8,
+            handle_border_color = theme.bg_normal,
+            handle_border_width = 2,
+            bar_height = 6,
+            bar_border_color = theme.bg_focus,
+            bar_border_width = 2
+        },
+        checkbox = {
+            width = 15,
+            height = 15,
+            shape = gears.shape.circle,
+            border_width = 3,
+            border_color = theme.bg_normal,
+            paddings = {2,2,2,2}
+        },
+    },
+    -- }}}
+    -- {{{ Menus
+    generic_menu = {
+        base = {
+            spacing = 2,
+            menu_slide = true
+        },
+        button = {
+            bg_normal = theme.bg_highlight,
+            onpress = function(widget)
+                widget:set_bg(theme.bg_focus)
+            end,
+            onrelease = function(widget)
+                widget:set_bg(theme.bg_highlight)
+            end,
+            forced_height = 20,
+            forced_width = 160
+        },
+    },
+    -- }}}
+    -- {{{ Popup activating icons
+    generic_iconified_widget = {
+        button = {
+            margins = 1,
+            bg_normal = "#00000000",
+            onpress = function(widget)
+                widget:set_bg(theme.bg_normal)
+            end,
+            onrelease = function(widget)
+                widget:set_bg("#00000000")
+            end
+        }
+    },
+    -- }}}
+    -- {{{ Bars/Panels/Menu popups
+    generic_composite_widget = {
+        base = {
+            spacing = 2
+        }
+    },
+    -- }}}
+    -- {{{ Status panel widgets
+    generic_status_widget = {
+        container = {
+            margins = 2,
+            bg_normal = "#00000000",
+        },
+        button = {
+            margins = 1,
+            bg_normal = "#00000000",
+            onpress = function() end,
+            onrelease = function() end,
+        }
+    },
+    -- }}}
+    -- {{{ Various button lists
+    generic_button_list = {
+        button = {
+            bg_normal = theme.bg_highlight,
+            onpress = function(widget)
+                widget:set_bg(theme.bg_focus)
+            end,
+            onrelease = function(widget)
+                widget:set_bg(theme.bg_highlight)
+            end,
+            forced_width = 20,
+            forced_height = 20
+        },
+        base = {
+            spacing = 2
+        }
+    },
+    -- }}}
+    -- {{{ All widgets that fit into a single line
+    generic_oneline_widget = {
+        container = {
+            bgimage_normal = theme.bgimage_inset
+        },
+        button = {
+            margins = 2,
+            onpress = function(widget)
+                widget:set_bg(theme.bg_normal)
+            end,
+            onrelease = function(widget)
+                widget:set_bg("#00000000")
+            end,
+            bg_normal = "#00000000"
+        }
+    },
+    -- }}}
+    -- {{{ All kinds of widget popups
+    generic_popup = {
+        button = {
+            width = 180,
+            height = 40
+        },
+        article = {
+            icon_size = 30
+        },
+    },
+    -- }}}
+    soundclown = {
+        --[[ --Uncomment to leetify that MPC
+        container = {
+            bg_normal = "#0c0c0c",
+            fg_normal = "#00FF00"
+        },
+        ]]
+        base = {
+            width = 140
+        },
+    },
+    subpanel = {
+        container = {
+            bgimage_normal = theme.bgimage_inset,
+            bg_normal = theme.bar_bg_inverted_normal,
+            margins = 0,
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,8)
+            end
+        }
+    },
+    taglist = {
+        base = {
+            spacing = 2,
+            layout = require("wibox").layout.flex.horizontal
+        },
+        button = {
+            bgimage_focus = theme.bgimage_inset,
+            bgimage_normal = theme.bgimage_outset,
+        },
+        container = {
+            margins = 3
+        }
+    },
+    tasklist = {
+        button = {
+            width = 160,
+            height = 44,
+            margins = 5,
+            shape_focus = theme.button_shape,
+            shape_normal = theme.button_shape,
+            shape_urgent = theme.button_shape,
+            shape_minimize = theme.button_shape,
+            bg_normal = theme.button_bg_normal,
+            bg_focus = theme.button_bg_focus,
+            bg_urgent = theme.bg_urgent,
+            bg_minimize = theme.bg_minimize,
+            shape_border_color_normal = theme.bar_border_color,
+            shape_border_color_focus = theme.bar_border_color,
+            shape_border_color_urgent = theme.bar_border_color,
+            shape_border_color_minimize = theme.bar_border_color,
+            shape_border_width_normal = dpi(1),
+            shape_border_width_focus = dpi(1),
+            shape_border_width_urgent = dpi(1),
+            shape_border_width_minimize = dpi(1),
+        }
+    },
+    launcher = {
+        button = {
+            margins = 5,
+            bg_normal = theme.button_bg_normal,
+            bg_focus = theme.button_bg_focus,
+            shape_border_width = dpi(1),
+            shape_border_color = theme.bar_border_color,
+            onpress = function(widget)
+                widget:set_bg(theme.button_bg_focus)
+            end,
+            onrelease = function(widget)
+                widget:set_bg(theme.button_bg_normal)
+            end
+        }
+    },
+    lockscreen = {
+        popup = {
+            margins = 0
+        }
+    },
+    lockbar = {
+        base = {
+            height = 22
+        }
+    },
+    lockpanel = {
+        base = {
+            icon_height = 60,
+            icon_width = 60,
+            panel_height = 300,
+            panel_width = 200,
+            panel_bgimage = theme.bgimage_outset
+        },
+        container = {
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,8)
+            end,
+            shape_border_color = theme.bg_highlight,
+            shape_border_width = dpi(2)
+        }
+    },
+    systray = {
+        container = {
+            margins = 2,
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,4)
+            end,
+            shape_border_color = theme.bg_normal,
+            shape_border_width = dpi(2)
+        }
+    },
+    lock_clock = {
+        textbox = {
+            font = "Ubuntu Mono 20"
+        }
+    },
+    titlebar = {
+        titlebar_top = {
+            onfocus = function(titlebar)
+                local root = titlebar:get_children_by_id("titlebar_root")[1]
+                root:set_bg(theme.titlebar_bg_focus)
+                root:set_shape(function(cr,width,height)
+                    return gears.shape.partially_rounded_rect(
+                    cr,width,height,
+                    true,true,false,false,6) end)
+            end,
+            onunfocus = function(titlebar)
+                local root = titlebar:get_children_by_id("titlebar_root")[1]
+                root:set_bg(theme.titlebar_bg_normal)
+                root:set_shape(function(cr,width,height)
+                    return gears.shape.partially_rounded_rect(
+                    cr,width,height,
+                    true,true,false,false,6) end)
+            end,
+            bg_focus = "#00000000",
+            bg_normal = "#00000000",
+            fg_focus = "#FAFAFA",
+            fg_normal = theme.fg_normal,
+            size = 22,
+            spacing = 1
+        },
+        titlebar_left = {
+            size = 2,
+            bg_focus = "#3C3B37",
+            bg_normal = "#3C3B37",
+        },
+        titlebar_right = {
+            size = 2,
+            bg_focus = "#3C3B37",
+            bg_normal = "#3C3B37",
+        },
+        titlebar_bottom = {
+            size = 2,
+            bg_focus = "#3C3B37",
+            bg_normal = "#3C3B37",
+        }
+    },
+    wibar = {
+        wibar_top = {
+            bg_normal = theme.bar_bg_normal,
+            fg_normal = theme.fg_normal,
+            size = 22,
+        },
+        wibar_left = {
+            bg_normal = "#0D0D0966",
+            border_width = dpi(1),
+            border_color = "#26262666"
+        }
+    }
+}
+
+local wibox = require("wibox")
+
+theme.templates = {
+    templates = {
+        titlebar = function(style)
+            return function(layout,options)
+                local margins = style.titlebar.margins
+                if (style.titlebar.left or
+                    style.titlebar.right or
+                    style.titlebar.bottom or
+                    style.titlebar.top) then
+                    margins = nil
+                end
+                return {
+                    {
+                        gears.table.join({
+                            layout,
+                            margins = margins,
+                            layout = wibox.container.margin,
+                            left = style.titlebar.left,
+                            right = style.titlebar.right,
+                            bottom = style.titlebar.bottom,
+                            top = style.titlebar.top
+                        },options or {}),
+                        bgimage = style.titlebar.root_bgimage_normal,
+                        bg = style.titlebar.root_bg_normal,
+                        fg = style.titlebar.root_fg_normal,
+                        shape = style.titlebar.root_shape,
+                        shape_border_color = style.titlebar.root_shape_border_color,
+                        shape_border_width = style.titlebar.root_shape_border_width,
+                        widget = wibox.container.background,
+                        id = "titlebar_root"
+                    },
+                    layout = wibox.container.margin,
+                    left = style.titlebar.root_margin_left,
+                    right = style.titlebar.root_margin_right,
+                    top = style.titlebar.root_margin_top,
+                    bottom = style.titlebar.root_margin_bottom
+                }
+            end
+        end,
+        popup = function(style)
+            return function(widget,options)
+                 return gears.table.join({
+                    widget = {
+                        {
+                            widget,
+                            margins = style.popup.margins,
+                            layout = wibox.container.margin
+                        },
+                        bg = style.popup.bg_normal,
+                        shape = style.popup.root_shape,
+                        widget = wibox.container.background
+                    },
+                    bg = "#00000000",
+                    shape = style.popup.shape,
+                    visible = false,
+                    ontop = true
+                },options or {})
+            end
+        end
+    }
+}
+
+return theme
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80