Update awesome config

2 files changed, 29 insertions, 17 deletions

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 7408cec..655682b 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -15,6 +15,9 @@ require("awful.hotkeys_popup.keys")
 
 -- Custom libraries
 local charitable = require("charitable")
+local widget_battery = require("awesome-wm-widgets.batteryarc-widget.batteryarc")
+local widget_brightness = require("awesome-wm-widgets.brightness-widget.brightness")
+local widget_volume = require("awesome-wm-widgets.pactl-widget.volume")
 
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
@@ -153,29 +156,35 @@ awful.screen.connect_for_each_screen(function(s)
 		awful.button({ }, 5, function () awful.layout.inc(-1) end))
 	)
 
-	-- Create a taglist widget
+	-- Create widgets
+	s.widgets.battery = widget_battery({
+		show_current_level = false,
+		warning_msg_position = top_right,
+	})
+	s.widgets.brightness = widget_brightness({
+		program = "brightnessctl",
+		tooltip = true,
+	})
+	s.widgets.clock = wibox.widget {
+		widget = wibox.widget.textclock,
+		format = "%F %H:%M",
+	}
+	s.widgets.systray = wibox.widget.systray()
 	s.widgets.tags = awful.widget.taglist {
 		screen  = s,
 		filter  = awful.widget.taglist.filter.all,
 		buttons = taglist_buttons,
 		source  = function(screen, args) return tags end,
 	}
-
-	-- Create a tasklist widget
 	s.widgets.tasklist = awful.widget.tasklist {
 		screen  = s,
 		filter  = awful.widget.tasklist.filter.currenttags,
 		buttons = tasklist_buttons,
 	}
-
-	-- Create a clock
-	s.widgets.clock = wibox.widget {
-		widget = wibox.widget.textclock,
-		format = "%F %H:%M",
-	}
-
-	-- Create a systray
-	s.widgets.systray = wibox.widget.systray()
+	s.widgets.volume = widget_volume({
+		tooltip = true,
+		widget_type = "arc",
+	})
 
 	-- Create the taskbar
 	s.bars.bottom = awful.wibar({
@@ -183,12 +192,10 @@ awful.screen.connect_for_each_screen(function(s)
 		screen   = s,
 		bg       = beautiful.bg_normal .. "cc",
 	})
-	--
 
 	-- Add widgets to the wibox
 	s.bars.bottom:setup {
 		layout  = wibox.layout.align.horizontal,
-		spacing = 16,
 		s.widgets.tags,
 		s.widgets.tasklist,
 		s.widgets.layout,
@@ -214,7 +221,11 @@ awful.screen.connect_for_each_screen(function(s)
 		},
 		{
 			layout = wibox.layout.fixed.horizontal,
+			spacing = 4,
 			s.widgets.systray,
+			s.widgets.brightness,
+			s.widgets.volume,
+			s.widgets.battery,
 		},
 	}
 end)
@@ -281,7 +292,7 @@ globalkeys = gears.table.join(
 		{description = "reload awesome", group = "awesome"}
 	),
 	awful.key(
-		{ modkey, "Shift" }, "q", awesome.quit,
+		{ modkey, "Shift" }, "x", awesome.quit,
 		{description = "quit awesome", group = "awesome"}
 	),
 
@@ -495,6 +506,7 @@ awful.rules.rules = {
 	{ -- Remove borders from windows where it doesn't fit (housestyles ought to be banned, tho)
 		rule_any = {
 			class = {
+				"albert",
 				"nextcloud",
 			}
 		},
diff --git a/.config/awesome/theme.lua b/.config/awesome/theme.lua
index 61bec2c..25c9167 100644
--- a/.config/awesome/theme.lua
+++ b/.config/awesome/theme.lua
@@ -28,11 +28,11 @@ theme.border_normal = "#4b5165"
 theme.border_focus  = "#5294e2"
 theme.border_marked = "#91231c"
 
-theme.taglist_spacing     = dpi(4)
+theme.taglist_spacing     = 0
 theme.taglist_bg_occupied = "#4b5165"
 
 theme.tasklist_bg_normal = "#4b5165"
-theme.tasklist_spacing   = dpi(4)
+theme.tasklist_spacing   = 0
 
 theme.useless_gap             = dpi(4)
 theme.maximized_honor_padding = true