From 1e6be2b88e1be3740b3a233f0bb37997701d119a Mon Sep 17 00:00:00 2001
From: Toma Adrian Ionut <sirhadrian21@gmail.com>
Date: Thu, 10 Nov 2022 19:17:18 +0200
Subject: [PATCH] better battery and volume toolbar and removed some dyn
 tagging

---
 themes/vertex/rc.lua.custom | 37 ++++++++++++++++++++-----------------
 themes/vertex/theme.lua     | 18 ++++++++++--------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/themes/vertex/rc.lua.custom b/themes/vertex/rc.lua.custom
index fda668c..78a9989 100644
--- a/themes/vertex/rc.lua.custom
+++ b/themes/vertex/rc.lua.custom
@@ -421,17 +421,19 @@ end, {
 --     group = "tag"
 -- }),
 -- Dynamic tagging
-awful.key({modkey, "Shift"}, "n", function()
-    lain.util.add_tag()
-end, {
-    description = "add new tag",
-    group = "tag"
-}), awful.key({modkey, "Shift"}, "r", function()
-    lain.util.rename_tag()
-end, {
-    description = "rename tag",
-    group = "tag"
-}), awful.key({modkey, "Shift"}, "Left", function()
+-- awful.key({modkey, "Shift"}, "n", function()
+--     lain.util.add_tag()
+-- end, {
+--     description = "add new tag",
+--     group = "tag"
+-- }), 
+-- awful.key({modkey, "Shift"}, "r", function()
+--     lain.util.rename_tag()
+-- end, {
+--     description = "rename tag",
+--     group = "tag"
+-- }), 
+awful.key({modkey, "Shift"}, "Left", function()
     lain.util.move_tag(-1)
 end, {
     description = "move tag to the left",
@@ -441,12 +443,13 @@ end, {
 end, {
     description = "move tag to the right",
     group = "tag"
-}), awful.key({modkey, "Shift"}, "d", function()
-    lain.util.delete_tag()
-end, {
-    description = "delete tag",
-    group = "tag"
-}), -- Standard program
+}), -- awful.key({modkey, "Shift"}, "d", function()
+--     lain.util.delete_tag()
+-- end, {
+--     description = "delete tag",
+--     group = "tag"
+-- }), 
+-- Standard program
 awful.key({modkey}, "Return", function()
     awful.spawn(terminal)
 end, {
diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua
index 337a3ea..5836b78 100644
--- a/themes/vertex/theme.lua
+++ b/themes/vertex/theme.lua
@@ -123,7 +123,7 @@ theme.cal = lain.widget.cal({
         fg = "#FFFFFF",
         bg = theme.bg_normal,
         position = "top_middle",
-        font = "JetBrainsMono Nerd Font Bold 12"
+        font = theme.font
     }
 })
 
@@ -132,14 +132,15 @@ local baticon = wibox.widget.imagebox(theme.bat000)
 local battooltip = awful.tooltip({
     objects = {baticon},
     margin_leftright = dpi(15),
-    margin_topbottom = dpi(12)
+    margin_topbottom = dpi(4)
 })
 battooltip.wibox.fg = "#fcfbf7"
 battooltip.wibox.widget.bg = "#404040"
 battooltip.textbox.font = theme.font
 battooltip.timeout = 0
+
 battooltip:set_shape(function(cr, width, height)
-    gears.shape.infobubble(cr, width, height, corner_radius, arrow_size, 8)
+    gears.shape.rounded_bar(cr, width, height)
 end)
 local bat = lain.widget.bat({
     settings = function()
@@ -164,7 +165,7 @@ local bat = lain.widget.bat({
         end
 
         baticon:set_image(theme[index])
-        battooltip:set_markup(string.format("\n%s%%, %s", perc, bat_now.time))
+        battooltip:set_markup(string.format("%s%%, %s", perc, bat_now.time))
     end
 })
 
@@ -192,19 +193,20 @@ local volicon = wibox.widget.imagebox()
 local battooltip = awful.tooltip({
     objects = {volicon},
     margin_leftright = dpi(15),
-    margin_topbottom = dpi(12)
+    margin_topbottom = dpi(4)
 })
 battooltip.wibox.fg = "#fcfbf7"
 battooltip.wibox.widget.bg = "#404040"
 battooltip.textbox.font = theme.font
 battooltip.timeout = 0
+
 battooltip:set_shape(function(cr, width, height)
-    gears.shape.infobubble(cr, width, height, corner_radius, arrow_size, 4)
+    gears.shape.rounded_bar(cr, width, height)
 end)
 theme.volume = lain.widget.alsabar({
     -- togglechannel = "IEC958,3",
     notification_preset = {
-        font = "Monospace 12",
+        font = theme.font,
         fg = theme.fg_normal
     },
     settings = function()
@@ -225,7 +227,7 @@ theme.volume = lain.widget.alsabar({
         end
 
         volicon:set_image(theme[index])
-        battooltip:set_markup(string.format("\n%s%%", perc))
+        battooltip:set_markup(string.format("%s%%", perc))
     end
 })
 volicon:buttons(my_table.join(awful.button({}, 1, function()