we're doing it man

core/layout.lua

@@ -52,7 +52,7 @@ awful.screen.connect_for_each_screen(function(s)
     s.mywibox = awful.wibar({
         position = "top",
         screen = s,
-        bg = beautiful.topbar_bg
+        bg = beautiful.topbar_bg,
     })
     -- Add screen lock
     require("widgets.lock")({screen = s, obscure = true})
@@ -75,10 +75,25 @@ awful.screen.connect_for_each_screen(function(s)
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
             layout = wibox.layout.fixed.horizontal,
-            require("core.widgets.menu_launcher"),
+            {
+                {
+                    require("core.widgets.menu_launcher"),
+                    widget = wibox.container.place,
+                    halign = "center"
+                },
+                bg = "#26262633",
+                widget = wibox.container.background,
+                forced_width = require("beautiful.xresources").apply_dpi(61),
+            },
             --require("widgets.polylauncher")({vertical = false}),
-            s.mytaglist,
+            --s.mytaglist,
             s.mypromptbox,
+            require("widgets.current_window")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            spacing = 3
         },
         -- Middle widget
         {
@@ -96,19 +111,38 @@ awful.screen.connect_for_each_screen(function(s)
             awful.widget.keyboardlayout(),
             require("widgets.wallpapers")({
                 screen = s,
-                path = os.getenv("HOME").."/Pictures/Wallpapers/"
+                path = os.getenv("HOME").."/Pictures/Wallpapers/",
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
             }),
             require("widgets.mailbox")({
                 screen = s,
                 style = {
-                    rounding = 1
+                    rounding = 1,
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            --wibox.widget.systray(),
+            require("widgets.volume")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            require("widgets.battery")({
+                percentage = true,
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
                 }
             }),
-            wibox.widget.systray(),
-            require("widgets.volume")({}),
-            require("widgets.battery")({percentage = true}),
             wibox.widget.textclock(),
+            require("widgets.username")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
             s.mylayoutbox,
+            spacing = 4
         },
     }
 end)

core/titlebar.lua

@@ -88,21 +88,39 @@ return function(c)
     return awful.titlebar(c) : setup {
         { -- Left 
             c.menu_button,
-            layout  = wibox.layout.fixed.horizontal
-        },
-        { -- Middle
             { -- Title
                 align  = "center",
-                widget = awful.titlebar.widget.titlewidget(c)
+                widget = awful.titlebar.widget.titlewidget(c),
+                buttons = buttons
             },
+            spacing = 10,
+            layout  = wibox.layout.fixed.horizontal
+        },
+        { -- Middle
             buttons = buttons,
             layout  = wibox.layout.flex.horizontal
         },
         { -- Right
-            awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.minimizebutton (c),
-            awful.titlebar.widget.closebutton    (c),
-            layout = wibox.layout.fixed.horizontal()
+            {
+                {
+                    awful.titlebar.widget.maximizedbutton(c),
+                    awful.titlebar.widget.minimizebutton (c),
+                    awful.titlebar.widget.closebutton    (c),
+                    layout = wibox.layout.fixed.horizontal(),
+                    widget = wibox.container.margin,
+                    margins = 3            
+                },
+                widget = wibox.container.background,
+                shape = gears.shape.rounded_bar,
+                bg = {
+                    type = "linear",
+                    from = { 0, 15 },
+                    to = { 0, 0},
+                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
+                },
+            },
+            widget = wibox.container.margin,
+            margins = 2
         },
         layout = wibox.layout.align.horizontal,
     }

core/vars.lua

@@ -5,7 +5,7 @@ global = {}
 global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
 global.config_dir = os.getenv("HOME").."/.awesome/"
 global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/unity2/theme.lua"
+global.theme = global.awesome_dir .. "themes/unity/theme.lua"
 global.terminal = "xterm"
 global.editor = os.getenv("EDITOR") or "vim"
 global.editor_cmd = global.terminal .. " -e ".. global.editor

themes/icons.lua

@@ -13,11 +13,6 @@ end
 global.themes_dir = global.themes_dir or (os.getenv("HOME").."/.config/awesome/themes/")
 beautiful.name = beautiful.name or "default"
 beautiful.icon_dir = beautiful.icon_dir or global.themes_dir..beautiful.name.."/icons/"
-print(beautiful.icon_dir)
--- Recolor icons
-beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_normal,"normal")
-beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_focus,"focus")
-beautiful_assets.recolor_layout(beautiful,beautiful.fg_normal)
 local temp = {}
 -- Powermenu icons
 temp.powercontrol_icon_shutdown = beautiful.icon_dir.."shutdown.svg"
@@ -51,5 +46,5 @@ beautiful.recolor_icon_group(temp,"^battery_.+",beautiful.fg_normal)
 -- Widget icons
 beautiful.wallpapers_icon = gears.color.recolor_image(beautiful.icon_dir.."wallpaper.svg",beautiful.fg_normal)
 beautiful.mailbox_icon = gears.color.recolor_image(beautiful.icon_dir.."mail.svg",beautiful.fg_normal)
-
+beautiful.username_logout_icon = gears.color.recolor_image(beautiful.icon_dir.."system-log-out-symbolic.svg",beautiful.fg_normal)
 

themes/unity2/icons/README.md → themes/unity/icons/README.md

@@ -1,5 +1,7 @@
 battery status icons, lock/shutdown/suspend icons, volume status icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later)
 
+logout icon is taken from the adwaita project
+
 battery status icons in particular were modified to look somewhat less ugly when recolored to a single color. this was done because the config automatically recolors all icons to the color value of the foreground (text) color.
 
 the author of this config does not claim copyright of any icons present in this folder unless stated otherwise in the icon's license metadata.

themes/unity/icons/system-log-out-symbolic.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16.014" height="16"><g color="#000" fill="#2e3436"><path d="M4 1s-.459-.014-.947.23C2.564 1.475 2 2.167 2 3v10c0 .833.564 1.525 1.053 1.77.488.244.947.23.947.23h8c.833 0 1.525-.564 1.77-1.053.244-.488.23-.947.23-.947v-2a1 1 0 10-2 0v2H4V3h8v2a1 1 0 102 0V3c0-.833-.564-1.525-1.053-1.77C12.46.986 12 1 12 1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" font-weight="400" font-family="sans-serif" overflow="visible" fill-rule="evenodd"/><path d="M8.293 5.293L5.586 8l2.707 2.707 1.414-1.414L8.414 8l1.293-1.293z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" overflow="visible"/><path d="M9 10h1v1H9zm0-5h1v1H9z" style="marker:none" overflow="visible"/><path d="M9 5c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1zm0 4c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1z" style="marker:none" overflow="visible"/><path d="M8 7a1 1 0 100 2h7a1 1 0 100-2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" font-weight="400" font-family="sans-serif" overflow="visible" fill-rule="evenodd"/></g></svg>

themes/unity2/theme.lua → themes/unity/theme.lua

@@ -4,15 +4,17 @@ local dpi = xresources.apply_dpi
 
 local theme = {}
 
-theme.name = "unity2"
+theme.name = "unity"
 
-theme.font          = "Ubuntu Regular 9"
-theme.unitybar_width = dpi(55)
+theme.font          = "Ubuntu Regular 10"
+theme.unitybar_width = dpi(60)
+theme.unitybar_bg = "#0D0D09AA"
 theme.icon_rounding = 5
 theme.tasklist_button_shape_border_width = dpi(1)
 theme.tasklist_button_shape_border_color = "#262626AA"
 theme.launcher_button_shape_border_width = dpi(1)
 theme.launcher_button_shape_border_color = "#262626AA"
+theme.username_container_spacing_horizontal = 3
 theme.launcher_button_size = 44
 theme.tasklist_button_size = 44
 theme.macbar_rounding = 5
@@ -20,7 +22,7 @@ theme.macbar_height = 45
 theme.menu_button_inner_margin = 2
 theme.container_rounding = 4
 theme.button_rounding = 4
-theme.bg_normal     = "#181819"
+theme.bg_normal     = "#19191D"
 theme.bg_focus      = "#3E3E3E"
 theme.bg_urgent     = "#2E2E2E" 
 theme.bg_minimize   = "#2E2E2E" 
@@ -33,11 +35,54 @@ theme.fg_minimize   = "#e1dec7"
 
 theme.useless_gap   = dpi(10)
 theme.border_width  = dpi(1)
-theme.border_normal = theme.bg_normal
+theme.border_normal = theme.bg_focus
 theme.border_focus  = theme.bg_focus
 theme.border_marked = theme.bg_marked
 
+theme.tasklist_bg_focus = {
+    type = "radial",
+    from = {25,-20,7},
+    to = {25,5,55},
+    stops = { 
+        { 0 , "#8c8c8cBB"},
+        { 0.5, "#414141AA"},
+        { 1, "#535353FF"}
+    }    
+}
+
+theme.tasklist_bg_normal = {
+    type = "radial",
+    from = {25,-20,7},
+    to = {25,5,55},
+    stops = { 
+        { 0 , "#8c8c8cBB"},
+        { 0.5, "#232323AA"},
+        { 1, "#313131FF"}
+    }    
+}
 -- There are other variable sets
+
+theme.launcher_button_bg_focus = {
+    type = "radial",
+    from = {25,-20,7},
+    to = {25,5,55},
+    stops = { 
+        { 0 , "#8c8c8cBB"},
+        { 0.5, "#414141AA"},
+        { 1, "#535353FF"}
+    }    
+}
+
+theme.launcher_button_bg_normal = {
+    type = "radial",
+    from = {25,-20,7},
+    to = {25,5,55},
+    stops = { 
+        { 0 , "#8c8c8cBB"},
+        { 0.5, "#232323AA"},
+        { 1, "#313131FF"}
+    }    
+}
 -- overriding the default one when
 -- defined, the sets are:
 -- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
@@ -56,19 +101,20 @@ theme.titlebar_bg_focus = {
     type = "linear",
     from = { 0, 15 },
     to = { 0, 0 },
-    stops = { { 0, "#3C3C3C"} , { 1 , "#424242"} }
+    stops = { { 0, "#3C3B37"} , { 1 , "#5C5B56"} }
 }
 
 theme.titlebar_bg_normal = {
     type = "linear",
     from = { 0, 15 },
     to = { 0, 0 },
-    stops = { { 0, "#161617"} , { 1 , "#222223"} }
+    stops = { { 0, "#3A3A36"} , { 1 , "#454440"} }
 
 }
-theme.topbar_bg = theme.titlebar_bg_normal
+theme.topbar_bg = "#3C3B37"
 theme.titlebar_rounding = 6
-
+theme.bg_systray = "#3A3A36"
+theme.prompt_bg = theme.titlebar_bg_normal
 -- Generate taglist squares:
 local taglist_square_size = dpi(4)
 theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
@@ -143,12 +189,12 @@ theme.layout_cornernw = global.themes_dir..theme.name.."/layouts/cornernww.png"
 theme.layout_cornerne = global.themes_dir..theme.name.."/layouts/cornernew.png"
 theme.layout_cornersw = global.themes_dir..theme.name.."/layouts/cornersww.png"
 theme.layout_cornerse = global.themes_dir..theme.name.."/layouts/cornersew.png"
+theme_assets.recolor_layout(theme, theme.fg_normal)
 
 -- Generate Awesome icon:
 theme.awesome_icon = theme_assets.awesome_icon(
     theme.menu_height, theme.bg_focus, theme.fg_focus
 )
-
 -- 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 = "Adwaita"