From 7d1a0b61559eff23d698c5d3a0ecf15bdb895ce7 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Sat, 16 Jul 2022 17:18:27 -0700
Subject: [PATCH] More cleanup

---
 core/init.lua                                  | 5 ++++-
 sound.lua => core/sound.lua                    | 0
 core/start.lua                                 | 6 +++---
 modules/simple_widgets/init.lua                | 4 ++++
 {core => modules/simple_widgets}/shortcut.lua  | 6 ++----
 {core => modules/simple_widgets}/textclock.lua | 4 +---
 modules/volume/util.lua                        | 4 ++--
 rc.lua                                         | 5 ++---
 8 files changed, 18 insertions(+), 16 deletions(-)
 rename sound.lua => core/sound.lua (100%)
 create mode 100644 modules/simple_widgets/init.lua
 rename {core => modules/simple_widgets}/shortcut.lua (92%)
 rename {core => modules/simple_widgets}/textclock.lua (97%)

diff --git a/core/init.lua b/core/init.lua
index fe3b59e..5f22ddc 100755
--- a/core/init.lua
+++ b/core/init.lua
@@ -1,4 +1,7 @@
 return {
 	-- When everything is ready, call core.start()
-	start = require("core.start")
+	start = require("core.start"),
+
+	-- Utilities
+	sound = require("core.sound")
 }
diff --git a/sound.lua b/core/sound.lua
similarity index 100%
rename from sound.lua
rename to core/sound.lua
diff --git a/core/start.lua b/core/start.lua
index 79da6f0..db6b972 100755
--- a/core/start.lua
+++ b/core/start.lua
@@ -2,11 +2,11 @@ local function start()
 	local desktop = {
 		widgets = {
 			tasklist = require("core.tasklist"),
-			textclock = require("core.textclock"),
+			textclock = modules.simple_widgets.textclock,
 			keymap = modules.ibus.widgets.ibus,
 			volume = modules.volume.widgets.volume,
 			launcher = modules.launcher.widgets.launcher,
-			shortcut = require("core.shortcut"),
+			shortcut = modules.simple_widgets.make_shortcut,
 
 			space = function(size)
 				return wibox.widget {
@@ -141,7 +141,7 @@ local function start()
 					desktop.widgets.space(6)
 				}
 				for k, v in pairs(conf.bar_shortcuts) do
-					s.shortcuts[#s.shortcuts + 1] = desktop.widgets.shortcut:new(v[1], v[2])
+					s.shortcuts[#s.shortcuts + 1] = desktop.widgets.shortcut(v[1], v[2])
 				end
 			end
 
diff --git a/modules/simple_widgets/init.lua b/modules/simple_widgets/init.lua
new file mode 100644
index 0000000..53fc1a2
--- /dev/null
+++ b/modules/simple_widgets/init.lua
@@ -0,0 +1,4 @@
+return {
+	textclock = require("modules.simple_widgets.textclock").widget,
+	make_shortcut = require("modules.simple_widgets.shortcut")
+}
diff --git a/core/shortcut.lua b/modules/simple_widgets/shortcut.lua
similarity index 92%
rename from core/shortcut.lua
rename to modules/simple_widgets/shortcut.lua
index 06892b7..1ae52c7 100644
--- a/core/shortcut.lua
+++ b/modules/simple_widgets/shortcut.lua
@@ -1,6 +1,4 @@
-local shortcuts = {}
-
-function shortcuts:new(command, icon)
+local function make_shortcut(command, icon)
 	local widget = wibox.widget {
 		{
 			{   -- Right space
@@ -48,4 +46,4 @@ function shortcuts:new(command, icon)
 	return widget
 end
 
-return shortcuts
+return make_shortcut
diff --git a/core/textclock.lua b/modules/simple_widgets/textclock.lua
similarity index 97%
rename from core/textclock.lua
rename to modules/simple_widgets/textclock.lua
index cdc3e2d..13fab2d 100755
--- a/core/textclock.lua
+++ b/modules/simple_widgets/textclock.lua
@@ -1,7 +1,5 @@
 local textclock = {}
 
-
-
 textclock.widget = wibox.widget {
 	{
 		{   -- Right spacer
@@ -45,4 +43,4 @@ textclock.widget:connect_signal("mouse::leave", function(result)
 	textclock.widget.bg = beautiful.color.transparent
 end)
 
-return textclock.widget
+return textclock
diff --git a/modules/volume/util.lua b/modules/volume/util.lua
index 505e6e2..aa165f4 100755
--- a/modules/volume/util.lua
+++ b/modules/volume/util.lua
@@ -81,7 +81,7 @@ volume.volume_up = function()
 	end
 
 	volume.commands:up()
-	Sound.play("volume_up")
+	core.sound.play("volume_up")
 
 	volume.exec_hooks()
 end
@@ -92,7 +92,7 @@ volume.volume_down = function()
 	end
 
 	volume.commands:down()
-	Sound.play("volume_down")
+	core.sound.play("volume_down")
 
 	volume.exec_hooks()
 end
diff --git a/rc.lua b/rc.lua
index 98f9e7e..7d94c06 100755
--- a/rc.lua
+++ b/rc.lua
@@ -38,8 +38,6 @@ beautiful.init(require("theme"))
 
 core = require("core")
 
-Sound = require("sound")
-
 -- Load key bindings
 local binds = require("binds")
 local keys = binds.keys
@@ -51,7 +49,8 @@ for k, v in ipairs({
 	"mpc",
 	"ibus",
 	"volume",
-	"launcher"
+	"launcher",
+	"simple_widgets"
 }) do
 	modules[v] = require("modules." .. v)