🐛 fix: Sloppy bugfixes

.config/awesome/lib/exit-screen.lua

@@ -1,8 +1,8 @@
 local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 local helpers = require("helpers")
 
 --- Minimalist Exit Screen

.config/awesome/main/bindings.lua

@@ -12,7 +12,7 @@ local keys = config.keys
 awful.keyboard.append_global_keybindings({
 	awful.key({ keys.mod, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome" }),
 	awful.key({ keys.mod, "Shift" }, "q", awesome.quit, { description = "quit awesome", group = "awesome" }),
-	awful.key({}, "Nothing Set", function()
+	awful.key({ keys.mod, "Control", "Shift" }, "x", function()
 		awful.prompt.run({
 			prompt = "Run Lua code: ",
 			textbox = awful.screen.focused().promptbox.widget,

.config/awesome/main/layout.lua

@@ -16,7 +16,7 @@ machi.editor.nested_layouts = {
 }
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
-awful.layout.layouts = {
+awful.layout.append_default_layouts({
 	awful.layout.suit.tile,
 	awful.layout.suit.spiral.dwindle,
 	awful.layout.suit.floating,
@@ -25,7 +25,7 @@ awful.layout.layouts = {
 	mstab,
 	equal,
 	machi.default_layout,
-}
+})
 
 client.connect_signal("manage", function(c)
 	if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
@@ -33,4 +33,3 @@ client.connect_signal("manage", function(c)
 		awful.placement.no_offscreen(c)
 	end
 end)
-

.config/awesome/main/menu.lua

@@ -1,6 +1,6 @@
 ---@diagnostic disable: undefined-global
 local awful = require("awful")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local gears = require("gears")
 local wibox = require("wibox")
 local helpers = require("helpers")

.config/awesome/main/wallpaper.lua

@@ -1,6 +1,6 @@
 local awful = require("awful")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 
 local function set_wall(s)
 	awful.wallpaper({

.config/awesome/rc.lua

@@ -1,7 +1,6 @@
 pcall(require, "luarocks.loader")
 
 local gears = require("gears")
-local awful = require("awful")
 local beautiful = require("beautiful")
 
 require("awful.autofocus")
@@ -20,6 +19,3 @@ require("signals")
 
 -- Ui/Panels --
 require("ui")
-
--- Autostart --
-awful.spawn.with_shell("picom --experimental-backends")

.config/awesome/themes/catppuccin/macchiato.lua

@@ -0,0 +1,39 @@
+local palette = require("lib.catppuccin.catppuccin.macchiato")
+
+return {
+	-- Base --
+	crust = palette.crust.hex,
+	mantle = palette.mantle.hex,
+	base = palette.base.hex,
+
+	-- Surface --
+	surface0 = palette.surface0.hex,
+	surface1 = palette.surface1.hex,
+	surface2 = palette.surface2.hex,
+
+	-- Overlay --
+	overlay0 = palette.overlay0.hex,
+	overlay1 = palette.overlay1.hex,
+	overlay2 = palette.overlay2.hex,
+
+	-- Text --
+	text = palette.text.hex,
+	subtext0 = palette.subtext0.hex,
+	subtext1 = palette.subtext1.hex,
+
+	-- Colors --
+	rosewater = palette.rosewater.hex,
+	flamingo = palette.flamingo.hex,
+	pink = palette.pink.hex,
+	mauve = palette.mauve.hex,
+	red = palette.red.hex,
+	maroon = palette.maroon.hex,
+	peach = palette.peach.hex,
+	yellow = palette.yellow.hex,
+	green = palette.green.hex,
+	teal = palette.teal.hex,
+	sky = palette.sky.hex,
+	sapphire = palette.sapphire.hex,
+	blue = palette.blue.hex,
+	lavender = palette.lavender.hex,
+}

.config/awesome/ui/info-panel/calendar.lua

@@ -1,6 +1,6 @@
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 
 -- Creating Calendar
 ----------------------

.config/awesome/ui/info-panel/init.lua

@@ -1,8 +1,8 @@
 local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 
 local rubato = require("lib.rubato")
 

.config/awesome/ui/info-panel/music-player.lua

@@ -1,6 +1,6 @@
 local awful = require("awful")
 local gears = require("gears")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local xresources = require("beautiful.xresources")
 local dpi = xresources.apply_dpi
 local wibox = require("wibox")

.config/awesome/ui/info-panel/player.lua

@@ -1,8 +1,8 @@
 local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 
 -- Make Widgets
 -----------------

.config/awesome/ui/info-panel/profile.lua

@@ -1,10 +1,10 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local gears = require("gears")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local helpers = require("helpers")
 
-local dpi = beautiful.xresources.apply_dpi
+local dpi = require("beautiful.xresources").apply_dpi
 local user1 = os.getenv("USER")
 
 -- Create Widgets

.config/awesome/ui/info-panel/weather/init.lua

@@ -1,8 +1,8 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local gears = require("gears")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 local filesystem = gears.filesystem
 local json = require("lib.json")
 local config = require("config")
@@ -190,6 +190,11 @@ local url = (
 awful.widget.watch(string.format(GET_FORECAST_CMD, url), 600, function(_, stdout, stderr)
 	if stderr == "" then
 		local result = json.decode(stdout)
+
+		if not result.current then
+			return
+		end
+
 		-- Current weather setup
 		local icon = current_weather_widget:get_children_by_id("icon")[1]
 		local description = current_weather_widget:get_children_by_id("description")[1]

.config/awesome/ui/notif-panel/init.lua

@@ -1,11 +1,11 @@
 local gears = require("gears")
 local awful = require("awful")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local helpers = require("helpers")
 local naughty = require("naughty")
 local rubato = require("lib.rubato")
-local dpi = beautiful.xresources.apply_dpi
+local dpi = require("beautiful.xresources").apply_dpi
 
 local notifs_text = wibox.widget({
 	font = beautiful.font .. " Bold 20",

.config/awesome/ui/notif-panel/widgets/bri_slider.lua

@@ -1,7 +1,7 @@
 local gears = require("gears")
 local awful = require("awful")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local helpers = require("helpers")
 
 local slider = wibox.widget({

.config/awesome/ui/notif-panel/widgets/mic_slider.lua

@@ -1,9 +1,9 @@
 local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local helpers = require("helpers")
-local dpi = beautiful.xresources.apply_dpi
+local dpi = require("beautiful.xresources").apply_dpi
 
 local config = require("config")
 local microphone = config.widget.mic.name

.config/awesome/ui/notif-panel/widgets/vol_slider.lua

@@ -1,9 +1,9 @@
 local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local helpers = require("helpers")
-local dpi = beautiful.xresources.apply_dpi
+local dpi = require("beautiful.xresources").apply_dpi
 
 local slider = wibox.widget({
 	bar_shape = helpers.ui.rrect(9),

.config/awesome/ui/popups/layout/init.lua

@@ -1,6 +1,6 @@
 local awful = require("awful")
 local gears = require("gears")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local wibox = require("wibox")
 
 local keys = require("config").keys
@@ -102,7 +102,7 @@ awful.keygrabber({
 		layout_popup.visible = false
 	end,
 	export_keybindings = true,
-	release_event = "release",
+	stop_event = "release",
 	stop_key = { "Escape", "Super_L", "Super_R" },
 	keybindings = {
 		{

.config/awesome/ui/popups/notifications/init.lua

@@ -1,7 +1,7 @@
 local gears = require("gears")
 local wibox = require("wibox")
 local awful = require("awful")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local xresources = require("beautiful.xresources")
 local dpi = xresources.apply_dpi
 local naughty = require("naughty")

.config/awesome/ui/popups/notifications/playerctl.lua

@@ -1,6 +1,6 @@
 local naughty = require("naughty")
 local playerctl_daemon = require("signals.playerctl")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 
 playerctl_daemon:connect_signal("metadata", function(_, title, artist, album_path, _, new, _)
 	if album_path == "" then -- Sets Image for Notification --

.config/awesome/ui/popups/volume/init.lua

@@ -1,6 +1,6 @@
 local gears = require("gears")
 local awful = require("awful")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local xresources = require("beautiful.xresources")
 local dpi = xresources.apply_dpi
 local wibox = require("wibox")

.config/awesome/ui/top-panel/init.lua

@@ -2,9 +2,9 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local widgets = require("ui.top-panel.widgets")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 
-local dpi = beautiful.xresources.apply_dpi
+local dpi = require("beautiful.xresources").apply_dpi
 
 local clock = widgets.clock
 local date = widgets.date
@@ -117,4 +117,3 @@ screen.connect_signal("request::desktop_decoration", function(s)
 		height = dpi(2),
 	})
 end)
-

.config/awesome/ui/top-panel/widgets/clock.lua

@@ -1,6 +1,6 @@
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 require("awful.hotkeys_popup.keys")
 
 -- Clock

.config/awesome/ui/top-panel/widgets/cpu.lua

@@ -1,6 +1,6 @@
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 
 -- Icon
 local icon = wibox.widget.textbox()
@@ -15,7 +15,13 @@ cpu.align = "center"
 
 local function get_val()
 	awesome.connect_signal("signal::cpu", function(cpu_perc)
-		cpu.markup = tonumber(cpu_perc) .. "%"
+		if cpu_perc then
+			cpu_perc = tonumber(cpu_perc)
+		else
+			cpu_perc = "?"
+		end
+
+		cpu.markup = cpu_perc .. "%"
 	end)
 end
 

.config/awesome/ui/top-panel/widgets/date.lua

@@ -1,6 +1,6 @@
 local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 require("awful.hotkeys_popup.keys")
 
 -- Clock

.config/awesome/ui/top-panel/widgets/disk.lua

@@ -1,6 +1,6 @@
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 
 -- Icon
 local icon = wibox.widget.textbox()

.config/awesome/ui/top-panel/widgets/launcher.lua

@@ -1,8 +1,7 @@
 local awful = require("awful")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local menu = require("main.menu")
 
 local launcher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = menu })
 
 return launcher
-

.config/awesome/ui/top-panel/widgets/mem.lua

@@ -1,6 +1,6 @@
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 
 -- Icon
 local icon = wibox.widget.textbox()

.config/awesome/ui/top-panel/widgets/menu.lua

@@ -1,7 +1,7 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local gears = require("gears")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local helpers = require("helpers")
 
 -- Menu

.config/awesome/ui/top-panel/widgets/power.lua

@@ -1,7 +1,7 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local gears = require("gears")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 
 -- Menu
 local menu = wibox.widget.textbox()

.config/awesome/ui/top-panel/widgets/pulseaudio.lua

@@ -1,8 +1,8 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local gears = require("gears")
-local beautiful = require("beautiful")
-local dpi = beautiful.xresources.apply_dpi
+local beautiful = require("beautiful").get()
+local dpi = require("beautiful.xresources").apply_dpi
 local helpers = require("helpers")
 
 -- Icon

.config/awesome/ui/top-panel/widgets/seperator.lua

@@ -1,4 +1,4 @@
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local wibox = require("wibox")
 
 local seperator = wibox.widget.textbox()

.config/awesome/ui/top-panel/widgets/systray.lua

@@ -1,9 +1,9 @@
 local awful = require("awful")
 local wibox = require("wibox")
 local gears = require("gears")
-local beautiful = require("beautiful")
+local beautiful = require("beautiful").get()
 local rubato = require("lib.rubato")
-local dpi = beautiful.xresources.apply_dpi
+local dpi = require("beautiful.xresources").apply_dpi
 
 local arrow = wibox.widget.textbox()
 arrow.font = beautiful.font_name .. "13"

.config/awesome/ui/top-panel/widgets/taglist.lua

@@ -1,8 +1,6 @@
 local awful = require("awful")
-local gears = require("gears")
 local wibox = require("wibox")
-local beautiful = require("beautiful")
-beautiful.init(gears.filesystem.get_configuration_dir() .. "themes/catppuccin/theme.lua")
+local beautiful = require("beautiful").get()
 local bling = require("lib.bling")
 
 local keys = require("config").keys