From a3e6078586ec0eb9584f575484175ff1aae02f75 Mon Sep 17 00:00:00 2001 From: Yessiest Date: Sun, 21 Nov 2021 01:33:18 +0400 Subject: [PATCH] we're doing it man --- core/layout.lua | 50 ++++++++++--- core/titlebar.lua | 34 ++++++--- core/vars.lua | 2 +- themes/icons.lua | 7 +- .../Focal Fossa_orange_RGB.svg | 0 .../Focal Fossa_white_RGB.svg | 0 .../Focal_Fossa_Wallpapers/JPG/.DS_Store | Bin .../JPG/Focal-Fossa_Plain_WP_1920x1080.jpg | Bin .../Focal-Fossa_Plain_WP_1920x1080_GREY.jpg | Bin .../JPG/Focal-Fossa_Plain_WP_2560x1440.jpg | Bin .../Focal-Fossa_Plain_WP_2560x1440_GREY.jpg | Bin .../JPG/Focal-Fossa_Plain_WP_4096x2304.jpg | Bin .../Focal-Fossa_Plain_WP_4096x2304_GREY.jpg | Bin .../JPG/Focal-Fossa_Plain_WP_8192x4608.jpg | Bin .../Focal-Fossa_Plain_WP_8192x4608_GREY.jpg | Bin .../JPG/Focal-Fossa_WP_1920x1080.jpg | Bin .../JPG/Focal-Fossa_WP_1920x1080_GREY.jpg | Bin .../JPG/Focal-Fossa_WP_2560x1440.jpg | Bin .../JPG/Focal-Fossa_WP_2560x1440_GREY.jpg | Bin .../JPG/Focal-Fossa_WP_4096x2304.jpg | Bin .../JPG/Focal-Fossa_WP_4096x2304_GREY.jpg | Bin .../JPG/Focal-Fossa_WP_8192x4608.jpg | Bin .../JPG/Focal-Fossa_WP_8192x4608_GREY.jpg | Bin .../PNG/Focal-Fossa_Plain_WP_1920x1080.png | Bin .../Focal-Fossa_Plain_WP_1920x1080_GREY.png | Bin .../PNG/Focal-Fossa_Plain_WP_2560x1440.png | Bin .../Focal-Fossa_Plain_WP_2560x1440_GREY.png | Bin .../PNG/Focal-Fossa_Plain_WP_4096x2304.png | Bin .../Focal-Fossa_Plain_WP_4096x2304_GREY.png | Bin .../PNG/Focal-Fossa_WP_1920x1080.png | Bin .../PNG/Focal-Fossa_WP_1920x1080_GREY.png | Bin .../PNG/Focal-Fossa_WP_2560x1440.png | Bin .../PNG/Focal-Fossa_WP_2560x1440_GREY.png | Bin .../PNG/Focal-Fossa_WP_4096x2304.png | Bin .../PNG/Focal-Fossa_WP_4096x2304_GREY.png | Bin themes/{unity2 => unity}/background.png | Bin themes/{unity2 => unity}/icons/README.md | 2 + .../battery-caution-charging-symbolic.svg | 0 .../icons/battery-caution-symbolic.svg | 0 .../icons/battery-empty-charging-symbolic.svg | 0 .../icons/battery-empty-symbolic.svg | 0 .../icons/battery-full-charged-symbolic.svg | 0 .../icons/battery-full-charging-symbolic.svg | 0 .../icons/battery-full-symbolic.svg | 0 .../icons/battery-good-charging-symbolic.svg | 0 .../icons/battery-good-symbolic.svg | 0 .../icons/battery-low-charging-symbolic.svg | 0 .../icons/battery-low-symbolic.svg | 0 .../icons/battery-missing-symbolic.svg | 0 themes/{unity2 => unity}/icons/lock.svg | 0 themes/{unity2 => unity}/icons/mail.svg | 0 themes/{unity2 => unity}/icons/shutdown.svg | 0 themes/{unity2 => unity}/icons/suspend.svg | 0 .../unity/icons/system-log-out-symbolic.svg | 1 + .../{unity2 => unity}/icons/volume-high.svg | 0 themes/{unity2 => unity}/icons/volume-low.svg | 0 .../{unity2 => unity}/icons/volume-medium.svg | 0 .../{unity2 => unity}/icons/volume-muted.svg | 0 themes/{unity2 => unity}/icons/wallpaper.svg | 0 themes/{unity2 => unity}/layouts/cornerne.png | Bin .../{unity2 => unity}/layouts/cornernew.png | Bin themes/{unity2 => unity}/layouts/cornernw.png | Bin .../{unity2 => unity}/layouts/cornernww.png | Bin themes/{unity2 => unity}/layouts/cornerse.png | Bin .../{unity2 => unity}/layouts/cornersew.png | Bin themes/{unity2 => unity}/layouts/cornersw.png | Bin .../{unity2 => unity}/layouts/cornersww.png | Bin themes/{unity2 => unity}/layouts/dwindle.png | Bin themes/{unity2 => unity}/layouts/dwindlew.png | Bin themes/{unity2 => unity}/layouts/fairh.png | Bin themes/{unity2 => unity}/layouts/fairhw.png | Bin themes/{unity2 => unity}/layouts/fairv.png | Bin themes/{unity2 => unity}/layouts/fairvw.png | Bin themes/{unity2 => unity}/layouts/floating.png | Bin .../{unity2 => unity}/layouts/floatingw.png | Bin .../{unity2 => unity}/layouts/fullscreen.png | Bin .../{unity2 => unity}/layouts/fullscreenw.png | Bin .../{unity2 => unity}/layouts/magnifier.png | Bin .../{unity2 => unity}/layouts/magnifierw.png | Bin themes/{unity2 => unity}/layouts/max.png | Bin themes/{unity2 => unity}/layouts/maxw.png | Bin themes/{unity2 => unity}/layouts/spiral.png | Bin themes/{unity2 => unity}/layouts/spiralw.png | Bin themes/{unity2 => unity}/layouts/tile.png | Bin .../{unity2 => unity}/layouts/tilebottom.png | Bin .../{unity2 => unity}/layouts/tilebottomw.png | Bin themes/{unity2 => unity}/layouts/tileleft.png | Bin .../{unity2 => unity}/layouts/tileleftw.png | Bin themes/{unity2 => unity}/layouts/tiletop.png | Bin themes/{unity2 => unity}/layouts/tiletopw.png | Bin themes/{unity2 => unity}/layouts/tilew.png | Bin themes/{unity2 => unity}/menu.lua | 0 themes/{unity2 => unity}/submenu.png | Bin themes/{unity2 => unity}/taglist/squarefw.png | Bin themes/{unity2 => unity}/taglist/squarew.png | Bin themes/{unity2 => unity}/theme.lua | 66 +++++++++++++++--- themes/unity/titlebar/close_focus.png | Bin 0 -> 938 bytes themes/unity/titlebar/close_normal.png | Bin 0 -> 683 bytes .../titlebar/floating_focus_active.png | Bin .../titlebar/floating_focus_inactive.png | Bin .../titlebar/floating_normal_active.png | Bin .../titlebar/floating_normal_inactive.png | Bin .../unity/titlebar/maximized_focus_active.png | Bin 0 -> 934 bytes .../titlebar/maximized_focus_inactive.png | Bin 0 -> 914 bytes .../titlebar/maximized_normal_active.png | Bin 0 -> 625 bytes .../titlebar/maximized_normal_inactive.png | Bin 0 -> 625 bytes themes/unity/titlebar/minimize_focus.png | Bin 0 -> 864 bytes themes/unity/titlebar/minimize_normal.png | Bin 0 -> 580 bytes .../titlebar/ontop_focus_active.png | Bin .../titlebar/ontop_focus_inactive.png | Bin .../titlebar/ontop_normal_active.png | Bin .../titlebar/ontop_normal_inactive.png | Bin .../titlebar/sticky_focus_active.png | Bin .../titlebar/sticky_focus_inactive.png | Bin .../titlebar/sticky_normal_active.png | Bin .../titlebar/sticky_normal_inactive.png | Bin .../titlebar_normal}/close_focus.png | Bin .../titlebar_normal}/close_normal.png | Bin .../titlebar_normal/floating_focus_active.png | Bin 0 -> 386 bytes .../floating_focus_inactive.png | Bin 0 -> 237 bytes .../floating_normal_active.png | Bin 0 -> 386 bytes .../floating_normal_inactive.png | Bin 0 -> 237 bytes .../maximized_focus_active.png | Bin .../maximized_focus_inactive.png | Bin .../maximized_normal_active.png | Bin .../maximized_normal_inactive.png | Bin .../titlebar_normal}/minimize_focus.png | Bin .../titlebar_normal}/minimize_normal.png | Bin .../titlebar_normal/ontop_focus_active.png | Bin 0 -> 467 bytes .../titlebar_normal/ontop_focus_inactive.png | Bin 0 -> 604 bytes .../titlebar_normal/ontop_normal_active.png | Bin 0 -> 467 bytes .../titlebar_normal/ontop_normal_inactive.png | Bin 0 -> 604 bytes .../titlebar_normal/sticky_focus_active.png | Bin 0 -> 654 bytes .../titlebar_normal/sticky_focus_inactive.png | Bin 0 -> 758 bytes .../titlebar_normal/sticky_normal_active.png | Bin 0 -> 654 bytes .../sticky_normal_inactive.png | Bin 0 -> 758 bytes widgets/current_window.lua | 22 ++++++ widgets/polytasklist.lua | 2 - widgets/unitybar.lua | 5 +- widgets/username.lua | 27 +++++++ 140 files changed, 182 insertions(+), 36 deletions(-) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/.DS_Store (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png (100%) rename themes/{unity2 => unity}/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png (100%) rename themes/{unity2 => unity}/background.png (100%) rename themes/{unity2 => unity}/icons/README.md (92%) rename themes/{unity2 => unity}/icons/battery-caution-charging-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-caution-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-empty-charging-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-empty-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-full-charged-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-full-charging-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-full-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-good-charging-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-good-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-low-charging-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-low-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/battery-missing-symbolic.svg (100%) rename themes/{unity2 => unity}/icons/lock.svg (100%) rename themes/{unity2 => unity}/icons/mail.svg (100%) rename themes/{unity2 => unity}/icons/shutdown.svg (100%) rename themes/{unity2 => unity}/icons/suspend.svg (100%) create mode 100644 themes/unity/icons/system-log-out-symbolic.svg rename themes/{unity2 => unity}/icons/volume-high.svg (100%) rename themes/{unity2 => unity}/icons/volume-low.svg (100%) rename themes/{unity2 => unity}/icons/volume-medium.svg (100%) rename themes/{unity2 => unity}/icons/volume-muted.svg (100%) rename themes/{unity2 => unity}/icons/wallpaper.svg (100%) rename themes/{unity2 => unity}/layouts/cornerne.png (100%) rename themes/{unity2 => unity}/layouts/cornernew.png (100%) rename themes/{unity2 => unity}/layouts/cornernw.png (100%) rename themes/{unity2 => unity}/layouts/cornernww.png (100%) rename themes/{unity2 => unity}/layouts/cornerse.png (100%) rename themes/{unity2 => unity}/layouts/cornersew.png (100%) rename themes/{unity2 => unity}/layouts/cornersw.png (100%) rename themes/{unity2 => unity}/layouts/cornersww.png (100%) rename themes/{unity2 => unity}/layouts/dwindle.png (100%) rename themes/{unity2 => unity}/layouts/dwindlew.png (100%) rename themes/{unity2 => unity}/layouts/fairh.png (100%) rename themes/{unity2 => unity}/layouts/fairhw.png (100%) rename themes/{unity2 => unity}/layouts/fairv.png (100%) rename themes/{unity2 => unity}/layouts/fairvw.png (100%) rename themes/{unity2 => unity}/layouts/floating.png (100%) rename themes/{unity2 => unity}/layouts/floatingw.png (100%) rename themes/{unity2 => unity}/layouts/fullscreen.png (100%) rename themes/{unity2 => unity}/layouts/fullscreenw.png (100%) rename themes/{unity2 => unity}/layouts/magnifier.png (100%) rename themes/{unity2 => unity}/layouts/magnifierw.png (100%) rename themes/{unity2 => unity}/layouts/max.png (100%) rename themes/{unity2 => unity}/layouts/maxw.png (100%) rename themes/{unity2 => unity}/layouts/spiral.png (100%) rename themes/{unity2 => unity}/layouts/spiralw.png (100%) rename themes/{unity2 => unity}/layouts/tile.png (100%) rename themes/{unity2 => unity}/layouts/tilebottom.png (100%) rename themes/{unity2 => unity}/layouts/tilebottomw.png (100%) rename themes/{unity2 => unity}/layouts/tileleft.png (100%) rename themes/{unity2 => unity}/layouts/tileleftw.png (100%) rename themes/{unity2 => unity}/layouts/tiletop.png (100%) rename themes/{unity2 => unity}/layouts/tiletopw.png (100%) rename themes/{unity2 => unity}/layouts/tilew.png (100%) rename themes/{unity2 => unity}/menu.lua (100%) rename themes/{unity2 => unity}/submenu.png (100%) rename themes/{unity2 => unity}/taglist/squarefw.png (100%) rename themes/{unity2 => unity}/taglist/squarew.png (100%) rename themes/{unity2 => unity}/theme.lua (83%) create mode 100644 themes/unity/titlebar/close_focus.png create mode 100644 themes/unity/titlebar/close_normal.png rename themes/{unity2 => unity}/titlebar/floating_focus_active.png (100%) rename themes/{unity2 => unity}/titlebar/floating_focus_inactive.png (100%) rename themes/{unity2 => unity}/titlebar/floating_normal_active.png (100%) rename themes/{unity2 => unity}/titlebar/floating_normal_inactive.png (100%) create mode 100644 themes/unity/titlebar/maximized_focus_active.png create mode 100644 themes/unity/titlebar/maximized_focus_inactive.png create mode 100644 themes/unity/titlebar/maximized_normal_active.png create mode 100644 themes/unity/titlebar/maximized_normal_inactive.png create mode 100644 themes/unity/titlebar/minimize_focus.png create mode 100644 themes/unity/titlebar/minimize_normal.png rename themes/{unity2 => unity}/titlebar/ontop_focus_active.png (100%) rename themes/{unity2 => unity}/titlebar/ontop_focus_inactive.png (100%) rename themes/{unity2 => unity}/titlebar/ontop_normal_active.png (100%) rename themes/{unity2 => unity}/titlebar/ontop_normal_inactive.png (100%) rename themes/{unity2 => unity}/titlebar/sticky_focus_active.png (100%) rename themes/{unity2 => unity}/titlebar/sticky_focus_inactive.png (100%) rename themes/{unity2 => unity}/titlebar/sticky_normal_active.png (100%) rename themes/{unity2 => unity}/titlebar/sticky_normal_inactive.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/close_focus.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/close_normal.png (100%) create mode 100644 themes/unity/titlebar_normal/floating_focus_active.png create mode 100644 themes/unity/titlebar_normal/floating_focus_inactive.png create mode 100644 themes/unity/titlebar_normal/floating_normal_active.png create mode 100644 themes/unity/titlebar_normal/floating_normal_inactive.png rename themes/{unity2/titlebar => unity/titlebar_normal}/maximized_focus_active.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/maximized_focus_inactive.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/maximized_normal_active.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/maximized_normal_inactive.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/minimize_focus.png (100%) rename themes/{unity2/titlebar => unity/titlebar_normal}/minimize_normal.png (100%) create mode 100644 themes/unity/titlebar_normal/ontop_focus_active.png create mode 100644 themes/unity/titlebar_normal/ontop_focus_inactive.png create mode 100644 themes/unity/titlebar_normal/ontop_normal_active.png create mode 100644 themes/unity/titlebar_normal/ontop_normal_inactive.png create mode 100644 themes/unity/titlebar_normal/sticky_focus_active.png create mode 100644 themes/unity/titlebar_normal/sticky_focus_inactive.png create mode 100644 themes/unity/titlebar_normal/sticky_normal_active.png create mode 100644 themes/unity/titlebar_normal/sticky_normal_inactive.png create mode 100644 widgets/current_window.lua create mode 100644 widgets/username.lua diff --git a/core/layout.lua b/core/layout.lua index 9cc1de1..191e1a0 100644 --- a/core/layout.lua +++ b/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) diff --git a/core/titlebar.lua b/core/titlebar.lua index 987c25b..d7d7f2d 100644 --- a/core/titlebar.lua +++ b/core/titlebar.lua @@ -88,21 +88,39 @@ return function(c) return awful.titlebar(c) : setup { { -- Left c.menu_button, + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c), + buttons = buttons + }, + spacing = 10, layout = wibox.layout.fixed.horizontal }, { -- Middle - { -- Title - align = "center", - widget = awful.titlebar.widget.titlewidget(c) - }, 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, } diff --git a/core/vars.lua b/core/vars.lua index d7bc1cb..9c6ef06 100644 --- a/core/vars.lua +++ b/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 diff --git a/themes/icons.lua b/themes/icons.lua index e1b1a74..30cbc9c 100644 --- a/themes/icons.lua +++ b/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) diff --git a/themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg b/themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg rename to themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg b/themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg rename to themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/.DS_Store b/themes/unity/Focal_Fossa_Wallpapers/JPG/.DS_Store similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/.DS_Store rename to themes/unity/Focal_Fossa_Wallpapers/JPG/.DS_Store diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png diff --git a/themes/unity2/background.png b/themes/unity/background.png similarity index 100% rename from themes/unity2/background.png rename to themes/unity/background.png diff --git a/themes/unity2/icons/README.md b/themes/unity/icons/README.md similarity index 92% rename from themes/unity2/icons/README.md rename to themes/unity/icons/README.md index b43f74a..d9f2e1b 100644 --- a/themes/unity2/icons/README.md +++ b/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. diff --git a/themes/unity2/icons/battery-caution-charging-symbolic.svg b/themes/unity/icons/battery-caution-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-caution-charging-symbolic.svg rename to themes/unity/icons/battery-caution-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-caution-symbolic.svg b/themes/unity/icons/battery-caution-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-caution-symbolic.svg rename to themes/unity/icons/battery-caution-symbolic.svg diff --git a/themes/unity2/icons/battery-empty-charging-symbolic.svg b/themes/unity/icons/battery-empty-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-empty-charging-symbolic.svg rename to themes/unity/icons/battery-empty-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-empty-symbolic.svg b/themes/unity/icons/battery-empty-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-empty-symbolic.svg rename to themes/unity/icons/battery-empty-symbolic.svg diff --git a/themes/unity2/icons/battery-full-charged-symbolic.svg b/themes/unity/icons/battery-full-charged-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-full-charged-symbolic.svg rename to themes/unity/icons/battery-full-charged-symbolic.svg diff --git a/themes/unity2/icons/battery-full-charging-symbolic.svg b/themes/unity/icons/battery-full-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-full-charging-symbolic.svg rename to themes/unity/icons/battery-full-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-full-symbolic.svg b/themes/unity/icons/battery-full-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-full-symbolic.svg rename to themes/unity/icons/battery-full-symbolic.svg diff --git a/themes/unity2/icons/battery-good-charging-symbolic.svg b/themes/unity/icons/battery-good-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-good-charging-symbolic.svg rename to themes/unity/icons/battery-good-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-good-symbolic.svg b/themes/unity/icons/battery-good-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-good-symbolic.svg rename to themes/unity/icons/battery-good-symbolic.svg diff --git a/themes/unity2/icons/battery-low-charging-symbolic.svg b/themes/unity/icons/battery-low-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-low-charging-symbolic.svg rename to themes/unity/icons/battery-low-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-low-symbolic.svg b/themes/unity/icons/battery-low-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-low-symbolic.svg rename to themes/unity/icons/battery-low-symbolic.svg diff --git a/themes/unity2/icons/battery-missing-symbolic.svg b/themes/unity/icons/battery-missing-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-missing-symbolic.svg rename to themes/unity/icons/battery-missing-symbolic.svg diff --git a/themes/unity2/icons/lock.svg b/themes/unity/icons/lock.svg similarity index 100% rename from themes/unity2/icons/lock.svg rename to themes/unity/icons/lock.svg diff --git a/themes/unity2/icons/mail.svg b/themes/unity/icons/mail.svg similarity index 100% rename from themes/unity2/icons/mail.svg rename to themes/unity/icons/mail.svg diff --git a/themes/unity2/icons/shutdown.svg b/themes/unity/icons/shutdown.svg similarity index 100% rename from themes/unity2/icons/shutdown.svg rename to themes/unity/icons/shutdown.svg diff --git a/themes/unity2/icons/suspend.svg b/themes/unity/icons/suspend.svg similarity index 100% rename from themes/unity2/icons/suspend.svg rename to themes/unity/icons/suspend.svg diff --git a/themes/unity/icons/system-log-out-symbolic.svg b/themes/unity/icons/system-log-out-symbolic.svg new file mode 100644 index 0000000..9f1676e --- /dev/null +++ b/themes/unity/icons/system-log-out-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/unity2/icons/volume-high.svg b/themes/unity/icons/volume-high.svg similarity index 100% rename from themes/unity2/icons/volume-high.svg rename to themes/unity/icons/volume-high.svg diff --git a/themes/unity2/icons/volume-low.svg b/themes/unity/icons/volume-low.svg similarity index 100% rename from themes/unity2/icons/volume-low.svg rename to themes/unity/icons/volume-low.svg diff --git a/themes/unity2/icons/volume-medium.svg b/themes/unity/icons/volume-medium.svg similarity index 100% rename from themes/unity2/icons/volume-medium.svg rename to themes/unity/icons/volume-medium.svg diff --git a/themes/unity2/icons/volume-muted.svg b/themes/unity/icons/volume-muted.svg similarity index 100% rename from themes/unity2/icons/volume-muted.svg rename to themes/unity/icons/volume-muted.svg diff --git a/themes/unity2/icons/wallpaper.svg b/themes/unity/icons/wallpaper.svg similarity index 100% rename from themes/unity2/icons/wallpaper.svg rename to themes/unity/icons/wallpaper.svg diff --git a/themes/unity2/layouts/cornerne.png b/themes/unity/layouts/cornerne.png similarity index 100% rename from themes/unity2/layouts/cornerne.png rename to themes/unity/layouts/cornerne.png diff --git a/themes/unity2/layouts/cornernew.png b/themes/unity/layouts/cornernew.png similarity index 100% rename from themes/unity2/layouts/cornernew.png rename to themes/unity/layouts/cornernew.png diff --git a/themes/unity2/layouts/cornernw.png b/themes/unity/layouts/cornernw.png similarity index 100% rename from themes/unity2/layouts/cornernw.png rename to themes/unity/layouts/cornernw.png diff --git a/themes/unity2/layouts/cornernww.png b/themes/unity/layouts/cornernww.png similarity index 100% rename from themes/unity2/layouts/cornernww.png rename to themes/unity/layouts/cornernww.png diff --git a/themes/unity2/layouts/cornerse.png b/themes/unity/layouts/cornerse.png similarity index 100% rename from themes/unity2/layouts/cornerse.png rename to themes/unity/layouts/cornerse.png diff --git a/themes/unity2/layouts/cornersew.png b/themes/unity/layouts/cornersew.png similarity index 100% rename from themes/unity2/layouts/cornersew.png rename to themes/unity/layouts/cornersew.png diff --git a/themes/unity2/layouts/cornersw.png b/themes/unity/layouts/cornersw.png similarity index 100% rename from themes/unity2/layouts/cornersw.png rename to themes/unity/layouts/cornersw.png diff --git a/themes/unity2/layouts/cornersww.png b/themes/unity/layouts/cornersww.png similarity index 100% rename from themes/unity2/layouts/cornersww.png rename to themes/unity/layouts/cornersww.png diff --git a/themes/unity2/layouts/dwindle.png b/themes/unity/layouts/dwindle.png similarity index 100% rename from themes/unity2/layouts/dwindle.png rename to themes/unity/layouts/dwindle.png diff --git a/themes/unity2/layouts/dwindlew.png b/themes/unity/layouts/dwindlew.png similarity index 100% rename from themes/unity2/layouts/dwindlew.png rename to themes/unity/layouts/dwindlew.png diff --git a/themes/unity2/layouts/fairh.png b/themes/unity/layouts/fairh.png similarity index 100% rename from themes/unity2/layouts/fairh.png rename to themes/unity/layouts/fairh.png diff --git a/themes/unity2/layouts/fairhw.png b/themes/unity/layouts/fairhw.png similarity index 100% rename from themes/unity2/layouts/fairhw.png rename to themes/unity/layouts/fairhw.png diff --git a/themes/unity2/layouts/fairv.png b/themes/unity/layouts/fairv.png similarity index 100% rename from themes/unity2/layouts/fairv.png rename to themes/unity/layouts/fairv.png diff --git a/themes/unity2/layouts/fairvw.png b/themes/unity/layouts/fairvw.png similarity index 100% rename from themes/unity2/layouts/fairvw.png rename to themes/unity/layouts/fairvw.png diff --git a/themes/unity2/layouts/floating.png b/themes/unity/layouts/floating.png similarity index 100% rename from themes/unity2/layouts/floating.png rename to themes/unity/layouts/floating.png diff --git a/themes/unity2/layouts/floatingw.png b/themes/unity/layouts/floatingw.png similarity index 100% rename from themes/unity2/layouts/floatingw.png rename to themes/unity/layouts/floatingw.png diff --git a/themes/unity2/layouts/fullscreen.png b/themes/unity/layouts/fullscreen.png similarity index 100% rename from themes/unity2/layouts/fullscreen.png rename to themes/unity/layouts/fullscreen.png diff --git a/themes/unity2/layouts/fullscreenw.png b/themes/unity/layouts/fullscreenw.png similarity index 100% rename from themes/unity2/layouts/fullscreenw.png rename to themes/unity/layouts/fullscreenw.png diff --git a/themes/unity2/layouts/magnifier.png b/themes/unity/layouts/magnifier.png similarity index 100% rename from themes/unity2/layouts/magnifier.png rename to themes/unity/layouts/magnifier.png diff --git a/themes/unity2/layouts/magnifierw.png b/themes/unity/layouts/magnifierw.png similarity index 100% rename from themes/unity2/layouts/magnifierw.png rename to themes/unity/layouts/magnifierw.png diff --git a/themes/unity2/layouts/max.png b/themes/unity/layouts/max.png similarity index 100% rename from themes/unity2/layouts/max.png rename to themes/unity/layouts/max.png diff --git a/themes/unity2/layouts/maxw.png b/themes/unity/layouts/maxw.png similarity index 100% rename from themes/unity2/layouts/maxw.png rename to themes/unity/layouts/maxw.png diff --git a/themes/unity2/layouts/spiral.png b/themes/unity/layouts/spiral.png similarity index 100% rename from themes/unity2/layouts/spiral.png rename to themes/unity/layouts/spiral.png diff --git a/themes/unity2/layouts/spiralw.png b/themes/unity/layouts/spiralw.png similarity index 100% rename from themes/unity2/layouts/spiralw.png rename to themes/unity/layouts/spiralw.png diff --git a/themes/unity2/layouts/tile.png b/themes/unity/layouts/tile.png similarity index 100% rename from themes/unity2/layouts/tile.png rename to themes/unity/layouts/tile.png diff --git a/themes/unity2/layouts/tilebottom.png b/themes/unity/layouts/tilebottom.png similarity index 100% rename from themes/unity2/layouts/tilebottom.png rename to themes/unity/layouts/tilebottom.png diff --git a/themes/unity2/layouts/tilebottomw.png b/themes/unity/layouts/tilebottomw.png similarity index 100% rename from themes/unity2/layouts/tilebottomw.png rename to themes/unity/layouts/tilebottomw.png diff --git a/themes/unity2/layouts/tileleft.png b/themes/unity/layouts/tileleft.png similarity index 100% rename from themes/unity2/layouts/tileleft.png rename to themes/unity/layouts/tileleft.png diff --git a/themes/unity2/layouts/tileleftw.png b/themes/unity/layouts/tileleftw.png similarity index 100% rename from themes/unity2/layouts/tileleftw.png rename to themes/unity/layouts/tileleftw.png diff --git a/themes/unity2/layouts/tiletop.png b/themes/unity/layouts/tiletop.png similarity index 100% rename from themes/unity2/layouts/tiletop.png rename to themes/unity/layouts/tiletop.png diff --git a/themes/unity2/layouts/tiletopw.png b/themes/unity/layouts/tiletopw.png similarity index 100% rename from themes/unity2/layouts/tiletopw.png rename to themes/unity/layouts/tiletopw.png diff --git a/themes/unity2/layouts/tilew.png b/themes/unity/layouts/tilew.png similarity index 100% rename from themes/unity2/layouts/tilew.png rename to themes/unity/layouts/tilew.png diff --git a/themes/unity2/menu.lua b/themes/unity/menu.lua similarity index 100% rename from themes/unity2/menu.lua rename to themes/unity/menu.lua diff --git a/themes/unity2/submenu.png b/themes/unity/submenu.png similarity index 100% rename from themes/unity2/submenu.png rename to themes/unity/submenu.png diff --git a/themes/unity2/taglist/squarefw.png b/themes/unity/taglist/squarefw.png similarity index 100% rename from themes/unity2/taglist/squarefw.png rename to themes/unity/taglist/squarefw.png diff --git a/themes/unity2/taglist/squarew.png b/themes/unity/taglist/squarew.png similarity index 100% rename from themes/unity2/taglist/squarew.png rename to themes/unity/taglist/squarew.png diff --git a/themes/unity2/theme.lua b/themes/unity/theme.lua similarity index 83% rename from themes/unity2/theme.lua rename to themes/unity/theme.lua index fc21716..60ddd24 100644 --- a/themes/unity2/theme.lua +++ b/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" diff --git a/themes/unity/titlebar/close_focus.png b/themes/unity/titlebar/close_focus.png new file mode 100644 index 0000000000000000000000000000000000000000..51b1a80664d533c5316103e71478ab638ba9a540 GIT binary patch literal 938 zcmV;b16BNqP)DSLG!Y0s^U3BvYZZo3;z2!mhNc8q_64RTlw-V1;;8A`4cCXMOl+>O$L6a5pPjiH zF->z14HHsg9rYiQr5Hn!`f<U+Rv#Ii!rIzael4XuvAd@;zM*pkx>}=X zkA#pZJ9uo__+%ab#6jIkfG+1v%9$(NihIU4DVG#wt@+K-M%Bc$Mf5Y!7W!vM&b z5kR_J#jm#>V5YoykR1NL?9f>D8jGzQUK22%E6m2!Yh}+E4J>{T&=5p zgAY8Y7=?LL?maF^~+`bDrW~^qmPI&R(B4 ztW;GwHXyl&jvz;GB@M5T(Q{5>?Y2``9Ta-5u6VyJalRM3WBkpkItGX z3FVN1E9FzN6>-@(JqouiySp<^N*3)DDFC@u0wTil^0c` z&mKnVb+xZ>MPVEw-uXBE8sCx#k8cbvd@vYt&~3Vi8UnU3Fy%GirW3+nwQ!aq+W*>L zqrRzHRVAV-gRp(H6epV{_yjq*rgC(9Z=&>0pW_nn#FD*p`%i!Y0AIuBF-+6UHUIzs M07*qoM6N<$g0P~!8vpqOXD=2%?XBQhf6V30{Lvr6WqFa-NI0VSK(*jKKwKMBm5ow^~+bA zL(iPWf=gZ4W7s_SFUtK-LXryjHioCA(n+T4xg!;x zbfkxE0BEb3)oeTO(HCd48J~!vnDzUE6kss;$ws3Qe;qJMOG{p*!r5!fu8HIRy$;YUtx=jMXC9n-7zMPkIZbz zFtW8GpbJoQ?+bHEr4&f59mT7#-efY(2x)6=WaN1+Ylodo4aufc9@kT0pW--Tnx>^d zR3qA&TXxu)^&nM4en_FGGbcJj!roGFE|*i%*V$U&%dJtN31}GlpZ0-Xz~88_7yJAD z-grEgK+9U-HT(O|S(YV0IvWm$1PiHGB@9jb1HThGu~3LyJ)FFs+|Db zjN|cxW^<2!5v?M!JgB3_-)WxKNr&FN575@!TLZv{NiwjpSjN<*g~(qM=fe_y3fwRJ@{An2jxD?oRhhiqYyq5eq{S4zyOW%_jx@x RQnQ?grwu zZWwwYlgZpsRb>wA)36cPHta_jMjtH8dgVB79cw4KK!PgcW1}553}p8873Nh{eKb5g ze0+R-j0(jf<+537Hk(wd)rljiR4UaV2p=9C)ZW6U)nTdi^%Xlnss8@rLMD@bQZARX z6BFks3lLS+$n#thLZ{x|9F2~iq*AGr-re23DTJo9TJ4pDnFQnf7{y{?9-%#*ot>p@ zE=}!rn>^p8!1pN#0`h&2{JrilSUAm4*P+l8zAyy|lC}!Hyc`@-!(Z8v~CFmuS1P zeFNLi7)-;5v&a{@u8RZFq0`JvS1WKtuKL7v# literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar/maximized_focus_inactive.png b/themes/unity/titlebar/maximized_focus_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..199b8533f3f2f7a79c81eb9b584a125f15c271bf GIT binary patch literal 914 zcmV;D18w|?P)$qN1iE926b7)QR5l>+5*6Xg3o z!3n)fvaC=nCJU=pYqYcTg)ewgtJNQefKDu%&2WAanM`^ep*<@WiyYa?Rn;-v_-Ogs5*Xl`PL~`faI|e( zSTyIJ_c=|4!V;Lq9-aCizr+nAi3%q0zjI^rPF_Vy>RacNjvUA-YdHBG1dbbh>a zT;4<^&jpwyNw=n^E+Mq82&vbLoUUWs>x1ANF8M5gFvOlu)A=bnDWBZI_6r7!VdE10|dIB3_9m*(bEE$MbxLOwLmRP_&IaKdqvw1Ew#YuNvPaI??28@j7yw3Zskc?04 zhppd?!^~XV^1fRAvuGHa2!WY#6uZ0MhQ20ij+rSCL#0yThj_=L2_%$9MDV?8REJI5gM~4a`SojdAX_?fhH|X^AtcF+I0?;e? zb;7FAlenaW^(?9$afCb$F>XK>Ye>xk)+S&Tq;en0{s=~IkfT~y&zyce8&YXwA*d2o o+gSev{#RNj?7hKC`%i!Y07d!kc)KpZVE_OC07*qoM6N<$f>~0j1^@s6 literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar/maximized_normal_active.png b/themes/unity/titlebar/maximized_normal_active.png new file mode 100644 index 0000000000000000000000000000000000000000..f3832ad02fc1c75ad9c0b6e87db6b960bf93083b GIT binary patch literal 625 zcmV-%0*?KOP)t_qz@VUridg*xvR4IhAc#Kh$+0(`Fc1X6zaj`Ct)+C(>RPC2a81(G@5C(J zxV9_v!pAvHzx&;D&OPTU^?IHDXH_bd%-5z79zM8d!qk8&a0OTgz5`!?Pr$pkd;7nc zTf2Wd+b5<7-GKRK7{;#SEN_%b?)uu=C1Sg>vbiuoP0nto*I=9f_&d+_k*0~8_)ClVHhTa zMV1gMCSXj1!LKgQY9@xE9l$*5bbchEb3>liutF%*>2$d)o5*6A8z%_v2SKpaYPD%J z3X)0q8>Mnwq2xDz=c2dU2jGpKLg@X}R|A62k?LI#fAS!QQG`A^m-G@_POI1JbFXzV z>^H%GG4s`shTf9iv#Y==Z~%Ok-m@gNt!IztKaMGJC&j|+j{pMzWs%DalOr{Y00000 LNkvXXu0mjfA_XT+ literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar/maximized_normal_inactive.png b/themes/unity/titlebar/maximized_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..7af085e9976f8d98a686c036ed4c1bb8a48b58bb GIT binary patch literal 625 zcmV-%0*?KOP)xIL;y*>Hd^IK^)oAf`cR;#6FnWymh(E|fp15$_FfLw4yRcgk7I0J?+ijjrnz)4WWYc8OF~(rgxx@B1_wxilV6Z0I}zaDRL2Sw0M)O;r^; z#bS{RLqFHG$z)0=Cw&Tn;CZ!r?e!lpfa(B!Szo^jOVow23d4}P-Jh^{wgKR0z7sLX z#P+sSDv^}(LV@Q8%jFUucUrBsnN2`rb=9co`U=hG^XLK!(d+pctVVj8rV-*=MjSa= z?-E$uvdr9%&Mtl=yDZD%q}*eei0^J`nx0y9(Un*imk%Ydf|O#ZqLngARv`-;gyDQC zSRB_u7WTvUJyI0qpFphdc|OIRk!Ew>aopR6VQ}4~$_EFnzrutNF_Jbgr8eB`fvs?ZC zfD5;WX1@#lSEmw^Hyq<$P3GB6NCnb`e9O$U$hC7v&@w9v`z^o#dyL`K%LUw$00000 LNkvXXu0mjfw6P{x literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar/minimize_focus.png b/themes/unity/titlebar/minimize_focus.png new file mode 100644 index 0000000000000000000000000000000000000000..8ec8e4c11f675b85aece8fb419184881e02d2c24 GIT binary patch literal 864 zcmV-m1E2hfP)K@@+xoA0!wO#`J( zF0mECKR{^^+k-SGPu}eRARax4f*>jgo&@jG-n+j9(#`U8P{C0NUy!U%=-n=))!NCFXsBhjdFfmLZ5rY-VeZT``3@Vf}v~olgk)+b; zR3V?wZ<(f1$NC~r0gixurTq7!(P(=zaR*qtaZ+P-r5X_>fz15;+%3y8A6Ki@#d3L> z78Xhb8TI?8)a`cY`1m_D8jX(Use6#UfsF$QCSPk->Ck3M29m))vV%8L-vSQEJ#t~&|w>p$2N&>K@Wo1=22T!Q^==FyQE zhOxP{yhOGgMkJ)3rIZ?;C#V1Meb!%w9d7+5^XNJ<47xm%&uh;-d|#K%bnqGuV{%Wg z*-1W^W5Fu(B*KC$@RvRFV8y+?Pjuc0a_eiPGkkxrhgl-5-hn-KN}SYy%%qKt>zD)L zc!V4rA5Zy8M*%zD;sW*)VT&B1086v8c_=I7z|;vwE;LzmM21po3U+#ScE)7;QE5oD z$h%JGL@P+?{dECx1bYEkzuj(Q_TO^RGMR83=XJN+8w^Kdt)Od5mxc%t`wvTlqwJx@ zdc9r;<+Q^=F`0)&8&!V4arjLu>ImUEAaP@au9hnhxvr$6R*Q8XAeb(baXabcq9wkh zQpr@mKUl-7fuc!jQf{RHYFZkj;fR{eCOdwPK7AQByBCqMmIC2kI-P7HscVQLONLJ- z8e4BFPhSesK_@4j4svz}M6V(u{RHvj_~(1Zy~ZuZoq>zI1lc0+1A%=-bRUqG?eJ)m qkVs9*&UtB*|9NS}zh2s(0t^6n{63O;$48g|00007AnLKFqPH#}1VIq=B|#9OdBK=8gmgk19c^u!hM7{EYQtim z%i3%9IkWfS;_*29k8N$PnPagPVQF!p7cL4!fN>xMJOH=A6>xTP8Y_Q|<68(#!`-`F zeMbWW?kT_D7aAKIVdQB}>)1~iJezUWV}h_EisHVM|{NjjGtwSMf&^YKb3|NH)|D}l%yWVS=qDeW=8p#b>X^i*nln1X6uVT_SH|=Fuf&L7DycNQ zu!Evln z>)2Pon*o2v8vpG*1K}LKdW}1b0`#6u0K-5QxUsxv>etwokE206G~n3Y1sDJoe7#6+ SbH4Zh0000y|P~P?KEYN6~k|4ie24+PQQ!^V+-^{G+ zh09lN+qwI|xm$Pdzxwp!*WWnt!uLRRrJgR1ArXh)UN`4!aNuzXEIL=%xbwedX66Rn zT;@xE>f#=say)Qj@h!*PZq@@E*sT~hytyc>;LyO(*w4t#u;Y|)!)MkHjtSctdKpAM zuQGFCN;oHd!=~}eCWezgu9X~Mdh*MWL*NJVgq79m%!$=nzbEkvRhKbuc(fzzzhWgQ P3>Z9J{an^LB{Ts5w(z^i literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/floating_focus_inactive.png b/themes/unity/titlebar_normal/floating_focus_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..c19ba8005593d7583ec3dc84785ef4ad0763d197 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>u0G|+7 zApIN$o`HeG-IvZlQPz?mzhH*Utn5!B`!7xc3fOqMIEHu}Pfn0vEl3dJV)o0B(I{x` zZe38gKtY7@g2iGkH_-`;8xkf3H+EYtDs(HpwxTJJ^{`DkuK@!?wUIr~`8_{-faWlG My85}Sb4q9e0L<`Cxc~qF literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/floating_normal_active.png b/themes/unity/titlebar_normal/floating_normal_active.png new file mode 100644 index 0000000000000000000000000000000000000000..62342d19e7a9fad2384d3ebb68e065de18a05400 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UT1AIbU zf%K|Xt2S-gv~lA`Ah{U~AdD?rw!lSz!ay!W7LCLzKJP(u8_;N(k|4ie24+PQQ!^V+ z-^{G+h09lN+qwI|xm$Pdzxwp!*WWnt!uLRRrJgR1ArXh)UN`4!aNuzXEIL=%xbwed zX66RnT;@xE>f#=say)Qj@h!*PZq@@E*sT~hytyc>;LyO(*w4t#u;Y|)!)MkHjtSct zdKpAMuQGFCN;oHd!=~}eCWezgu9X~Mdh*MWL*NJVgq79m%!$=nzbEkvRhKbuc(fzz TzhWgQ3>Z9J{an^LB{Ts5C|s&j literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/floating_normal_inactive.png b/themes/unity/titlebar_normal/floating_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..e2bbdfa1793b1bff74d7a745e952778a672eaf3c GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>u0G|+7 zAiZVFmQ9;BZH58fK2>X=C~HZOUob;vR`w^6{TC+z1#CQB978;gCnrd-79g{GOjZ QKyw&8UHx3vIVCg!0PqV+WdHyG literal 0 HcmV?d00001 diff --git a/themes/unity2/titlebar/maximized_focus_active.png b/themes/unity/titlebar_normal/maximized_focus_active.png similarity index 100% rename from themes/unity2/titlebar/maximized_focus_active.png rename to themes/unity/titlebar_normal/maximized_focus_active.png diff --git a/themes/unity2/titlebar/maximized_focus_inactive.png b/themes/unity/titlebar_normal/maximized_focus_inactive.png similarity index 100% rename from themes/unity2/titlebar/maximized_focus_inactive.png rename to themes/unity/titlebar_normal/maximized_focus_inactive.png diff --git a/themes/unity2/titlebar/maximized_normal_active.png b/themes/unity/titlebar_normal/maximized_normal_active.png similarity index 100% rename from themes/unity2/titlebar/maximized_normal_active.png rename to themes/unity/titlebar_normal/maximized_normal_active.png diff --git a/themes/unity2/titlebar/maximized_normal_inactive.png b/themes/unity/titlebar_normal/maximized_normal_inactive.png similarity index 100% rename from themes/unity2/titlebar/maximized_normal_inactive.png rename to themes/unity/titlebar_normal/maximized_normal_inactive.png diff --git a/themes/unity2/titlebar/minimize_focus.png b/themes/unity/titlebar_normal/minimize_focus.png similarity index 100% rename from themes/unity2/titlebar/minimize_focus.png rename to themes/unity/titlebar_normal/minimize_focus.png diff --git a/themes/unity2/titlebar/minimize_normal.png b/themes/unity/titlebar_normal/minimize_normal.png similarity index 100% rename from themes/unity2/titlebar/minimize_normal.png rename to themes/unity/titlebar_normal/minimize_normal.png diff --git a/themes/unity/titlebar_normal/ontop_focus_active.png b/themes/unity/titlebar_normal/ontop_focus_active.png new file mode 100644 index 0000000000000000000000000000000000000000..312c00ba8246608404568b1338cba9b264847bdc GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S_1AIbU zf%O0X|F2%X`r^flmoHxeNg#Ok?Adb|fUuuFeF_l(G9YXq36vragzcG{3ba_QB*-tA zft5{6Tu0Z#)5|+HuDqkOt9!-DRa>@h+kf!PrOQ_yJbd){$&WvO6_zS{0d>stba4!c zIQ;hdNxmink=Dd55eGTv1URI=`)#ijJ!!L*rdsTr`t#GDOZNP-rEi5d;|rNk z?gnLH1&0O(#{VpA?|w2iShL?@xH0dX%W>a^>DiYIlz+Uf)xXZxFp=4f!HchgSs-5C zWhZBWbZ(%aZ8<~D4#jH>J~9T3AHK#m)*2dX@XU5m_P2V%W{JY_&xzP7Z c^O9+2*)B-3tX(;y7U)t2Pgg&ebxsLQ0C;ZdcK`qY literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/ontop_focus_inactive.png b/themes/unity/titlebar_normal/ontop_focus_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..a48e1c5c7a4b20a783fb8afe704616531d367039 GIT binary patch literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UH2l#}z z0_p!SaP{id`}glZe*F0L>(@ZWvuDqqKY#x6A@jx=l%tUoZnBGYcCBC$E5rsJOI@yt=Wu zjkBkhcVKvWUU5lfReSfO8FLn`TD@`SzWt{!T)TDu(c>rYKYafB&{yph(aa1vpBB}n zeXRMsX2$$kdzYon6Z`nI(4bs6Qo(@7|6RvB{(I^B{lDIxfBW*npT1k}eiu8sKK>)q z{hl9nUu8;}^tSHUm*g(b82$4*zw=5bhr@N}m&>H??`BfJ6=}bSLEs?+yTyS{ literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/ontop_normal_active.png b/themes/unity/titlebar_normal/ontop_normal_active.png new file mode 100644 index 0000000000000000000000000000000000000000..117a203c65f0de56854c427b6125a147c8c0aeba GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S_1AIbU zf%KU(XI8CRwQk+IjT<*^*|KFT7;M_KY4hgIKrR{sA_yme3^;(OgmdvQzOkO|23o9E z666=mz{(~juA}SW>E#_8SKiUt)xBcnsx4c$?LTR)GTn8@tL;Kf(L zED$g6vXiqwIyX?zww$46hvGE`9~lG24_{*&YYmMxavE-D7(MgdGvn*|rtg_w{@w7? gTmdKI;Vst0GABY_5c6? literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/ontop_normal_inactive.png b/themes/unity/titlebar_normal/ontop_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..d3a10c8a7d1f94a8f99dfbcda0e8338beef56657 GIT binary patch literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UH2l#}z z0_p$%|F2rLYXAQIaB}0ujqBI1-@JMAwr$&hYzSlP)~!JHmMvR=44?=QY}&L5NCHK` zJOme694HIq0!bi%C_^J5iXnoy)Szhra;Ido{{%YSrX(AeR0yWdN z0?j$^>Eaj?aro^tcd@1b9)^QWT^eE=w7d2;%bxsu{;8XMM#O~kZnZQ2o_VIu=$SM_ zpqE*oz*nT8v89+k zi|W!o)_h(wWB#nY%hKkFeSBJIP%a#)V8G-5uHzm5z4ZP5UvJO9eR<(e-z|5)iyd7b z|B>l_&yTvVGNnv&8?HB&zv)F;j$I0*KXLdZTpVB`;VQua{b|>XYbyB`ttSr zk6*w4{QdXQ>-P_!aZf#6977@wzrAvt?~s82OTgvo_X1V#_ik_b`@dd^Nz>xllUPQl zPjiZ9s(Z_|8;XifJ)dT^JzatO&4GDWuQzUG&`D{W!;q4~c>KsU`BU-EPtJVpcRb=c z&2m9UWYhPwul#yfrtxs!Fl7D1(Xl_RfH$Fm&wPp1qWK0E4}>PM@7i|!$^u!2;+A@&Q+O>Sd&5oo!9KPjrH;U8PhMs1gM6M3d=aetMz`PUzv1^1lKu>9!}IM3_H$92GL zgUZ*NJjYBH@R~{mF!r)NQS@fMG+_~A;)jb2-{%P$FJh7s^$28C4-WjbP0l+XkKj-jRa#!x(bdz}KXKaZx$_q+ zT)brIvYiLcU%qkY!NW&So<4i=>g~JtA3lEi{pat$NcD5TAZ8Twba4!cIQ(|<$uK5E z0as=wt;I@8N*A=wad8-(P*Kp>eCqfA{z7IUE1jU&=Q~c_{rc$My2)NG1`<5~yR7Sv ze2NvVIcCu))4+d@hnZoHq!PpW0@k#J9BB`E_Z-qapmk#35TB9V}k|LqfeI zH-D8u$lsSM=e@OF?-%-e`Cpmqm-=59Uwvnr@@LlJ`8^@BcQ<^ysCq2=kDtf?H~hcW z{Lk0DP@}kr`Sv^KrjFb;p}(BDVwd>j3d26B%k7e%pssQG?_9Np_n`+CvCB0c4bIuw zJ+uE!H1`?(|9+d?zVWALxL^PNu<6zNZ69`RzxS-WTS}w;uIKm0clY%c`@wonq;ZYAiBJSE=ovg+{an^LB{Ts5ij1~F literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/sticky_normal_active.png b/themes/unity/titlebar_normal/sticky_normal_active.png new file mode 100644 index 0000000000000000000000000000000000000000..bdb5595dbafe4cd35499dc8c638f26ce27ceb835 GIT binary patch literal 654 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Uf1o(uw z0_p$%|F2rL>dculKyv^7{XlZtwrx9h?AW?>>!wYcwrtt5apOiH8%S>6ym`Zh4M0I4 z7s!T)K-2)aK$Soe&H#!70gwwM(WKA>A<95HDFab2w0MF3aV`n+3ua(sW@Y2x6qS@$ zR8mn>*U-||HFFIJi%%^mEh}$soiu&soOuhEtysNw!gnPb5^?zLmE(Me3 z5!Y#!3pyg3zNdZV*Sj)}hx>*h>mQDe{b>cf2@QPaORN^nH?VjhG>LuJw&Pb8$TAeS z%==)U;q`5D8^eo0%LV*NQAG{^*m5>%yR4hYGi8hWtF+C({^%^Y=X{3cPmjQPUOzsr z17;gkzTV_HX0m|SR4Rb6m+gt7H}jTx9q@PtbS~la#1OAftM4;Lr9ujIUEO VV$V(cq5||VgQu&X%Q~loCIC1(MV9~o literal 0 HcmV?d00001 diff --git a/themes/unity/titlebar_normal/sticky_normal_inactive.png b/themes/unity/titlebar_normal/sticky_normal_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..a96b9b1951dee732d570ce3afe9512f9e4546d8f GIT binary patch literal 758 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Tk2Ka=y z0_lc^hE=Op?ccv2NN(G<4Z_&Db0?6!Wy_Y08#e+O8#ZiMzkWTCv3c|6ty{MO1%ZrB zn>N9@K$Q?SP!Pg~Fd%AxB0vU&4Iz<5fEpoOAOj8{h5)$`^*{z(1g?e>M&715=YjK=Z`^tC@X?c}&tANG`|kaRkDq@3`TH+Y{Twie83jFE977@w zzny$CjLA^Im6=Ivv67O~1+8;j97ZQp6f`!U`u)GZkXgt|Cn)y$j#GEPKDxJVvR8|N z1ke92>-r;~Vnu6?Sv1Nt@So#hW|$+X#IU}AHEkhB+C$zwhjb5Uo!B?|&@zAh8?{LX zi`V~`t+h5latSLXVq{@2A<-`S@8nRR%6Pl)W@4c{)R9*h3t z=kfmy|F1Rw^K~!OC@x~Y{m!|mBezZHFK4dUB|f>ruutl8yW}URYh3<2SFPcF=z&G- za*aoWb9Q#m?0*x@eMbMk-zK+j{OK9)*S|k(di8$Whh5w6J?rk4(x|`d`MvSo{XO$N t;~h86&tYL<|G#zi)9%_tpr`zPu$~iXT;pyc6afr+22WQ%mvv4FO#rh4ggO8K literal 0 HcmV?d00001 diff --git a/widgets/current_window.lua b/widgets/current_window.lua new file mode 100644 index 0000000..18e4226 --- /dev/null +++ b/widgets/current_window.lua @@ -0,0 +1,22 @@ +local awful = require("awful") +local gears = require("gears") +local wibox = require("wibox") +local awmtk = require("awmtk") + +return function(args) + local style = awmtk.style(awmtk.defaults, args.style or {},"username_") + local icon = style.icon({ + { + widget = wibox.widget.textbox, + markup = "This ain't no gnome", + id = "widget_text" + }, + layout = wibox.layout.fixed.horizontal, + spacing = style.username_container_spacing_horizontal or 4 + }) + local text = icon:get_children_by_id("widget_text")[1] + client.connect_signal("focus", function() + text.markup = "This ain't not gnome" + end) + return icon +end diff --git a/widgets/polytasklist.lua b/widgets/polytasklist.lua index eb7a0c7..c15c6e4 100644 --- a/widgets/polytasklist.lua +++ b/widgets/polytasklist.lua @@ -29,8 +29,6 @@ local tasklist_buttons = gears.table.join( return function(options) local style = awmtk.style(awmtk.defaults,options.style or {},"tasklist_") -- Color definitions - local button_bg_on = style.tasklist_button_bg_focus - local button_bg_off = style.tasklist_button_bg_normal local constraint = options.constraint or style.tasklist_constraint local _style = awmtk._create_preprocess_style(style,"tasklist_") _style.button_shape = awmtk.preprocess.button_shape(_style) diff --git a/widgets/unitybar.lua b/widgets/unitybar.lua index 4b63e92..179f1a8 100644 --- a/widgets/unitybar.lua +++ b/widgets/unitybar.lua @@ -9,7 +9,10 @@ function unitybar(s,args) screen = s, border_width = style.unitybar_border_width or 1, border_color = style.unitybar_border_color or "#262626AA", - bg = style.unitybar_bg or ((style.bg_normal:len() < 8) and style.bg_normal.."AA"), + bg = style.unitybar_bg or ( + (type(style.bg_normal) == "string") and + (style.bg_normal:len() < 8) and + style.bg_normal.."AA"), width = style.unitybar_width or 50, }) local top_widgets = { diff --git a/widgets/username.lua b/widgets/username.lua new file mode 100644 index 0000000..0a41567 --- /dev/null +++ b/widgets/username.lua @@ -0,0 +1,27 @@ +local awful = require("awful") +local gears = require("gears") +local wibox = require("wibox") +local awmtk = require("awmtk") + +return function(args) + local style = awmtk.style(awmtk.defaults, args.style or {},"username_") + local icon = style.icon({ + { + widget = wibox.widget.imagebox, + image = style["username_logout_icon"], + id = "widget_icon", + resize = true + }, + { + widget = wibox.widget.textbox, + markup = os.getenv("USER"), + id = "widget_text" + }, + layout = wibox.layout.fixed.horizontal, + spacing = style.username_container_spacing_horizontal or 4 + }) + icon:get_children_by_id("widget_icon")[1]:connect_signal("button::press",function() + awesome.quit() + end) + return icon +end