.cspell.json

@@ -2,9 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
   "version": "0.2",
   "useGitignore": true,
-  "ignorePaths": [
-    ".git"
-  ],
+  "ignorePaths": [".git"],
   "enableGlobDot": true,
   "words": [
     "Aire-One",
@@ -16,9 +14,7 @@
     "dryrun",
     "fatalwarnings",
     "fullscreen",
-    "halign",
     "hasitem",
-    "imagebox",
     "JohnnyMorganz",
     "keygrabber",
     "ldoc",
@@ -34,7 +30,6 @@
     "rockspec",
     "rockspecs",
     "staticfct",
-    "stylua",
-    "wibox"
+    "stylua"
   ]
 }

awesome-slot-dev-1.rockspec

@@ -19,10 +19,6 @@ description = {
    },
 }
 
-dependencies = {
-   "lua >= 5.1, < 5.5",
-}
-
 build = {
    type = "builtin",
    modules = {

spec/helper.lua

@@ -16,15 +16,3 @@ package.loaded["ruled.notification"] = {}
 package.loaded["awful.keyboard"] = {
    append_client_keybindings = function() end,
 }
-
-package.loaded["awful.mouse"] = {}
-
-package.loaded["beautiful"] = {}
-
-package.loaded["wibox.widget.imagebox"] = {}
-
-package.loaded["wibox.container.tile"] = {}
-
-package.loaded["awful.wallpaper"] = {}
-
-package.loaded["awful.layout"] = {}

src/awesome-slot/slots/client.lua

@@ -1,17 +1,18 @@
-local keyboard = require "awful.keyboard"
-local mouse = require "awful.mouse"
-
 local client_slots = {}
 
 function client_slots.append_mousebindings(params)
-   return function()
-      mouse.append_client_mousebindings(params.mousebindings)
+   local mouse = require "awful.mouse"
+
+   for _, bindings in pairs(params.mousebindings) do
+      mouse.append_client_mousebindings(bindings)
    end
 end
 
 function client_slots.append_keybindings(params)
-   return function()
-      keyboard.append_client_keybindings(params.keybindings)
+   local keyboard = require "awful.keyboard"
+
+   for _, bindings in pairs(params.keybindings) do
+      keyboard.append_client_keybindings(bindings)
    end
 end
 

src/awesome-slot/slots/ruled.lua

@@ -1,17 +1,18 @@
-local client = require "ruled.client"
-local notification = require "ruled.notification"
-
 local ruled_slots = {}
 
 function ruled_slots.append_client_rules(params)
-   return function()
-      client.append_rules(params.rules)
+   local client = require "ruled.client"
+
+   for _, rule in pairs(params.rules) do
+      client.append_rule(rule)
    end
 end
 
 function ruled_slots.append_notification_rules(params)
-   return function()
-      notification.append_rules(params.rules)
+   local notification = require "ruled.notification"
+
+   for _, rule in pairs(params.rules) do
+      notification.append_rule(rule)
    end
 end
 

src/awesome-slot/slots/screen.lua

@@ -1,27 +1,22 @@
-local beautiful = require "beautiful"
-local imagebox = require "wibox.widget.imagebox"
-local tile = require "wibox.container.tile"
-local wallpaper = require "awful.wallpaper"
-
 local screen_slots = {}
 
-function screen_slots.wallpaper(params)
-   return function(screen)
-      wallpaper {
-         screen = screen,
-         widget = {
-            {
-               image = params.wallpaper or beautiful.wallpaper,
-               upscale = true,
-               downscale = true,
-               widget = imagebox,
-            },
-            valign = "center",
-            halign = "center",
-            tiled = false,
-            widget = tile,
-         },
+function screen_slots.wallpaper(screen, params)
+   local beautiful = require "beautiful"
+   local wallpaper = require "gears.wallpaper"
+
+   params = params or {
+      wallpaper = beautiful.wallpaper,
    }
+
+   local w = params.wallpaper
+
+   if w then
+      -- If wallpaper is a function, call it with the screen
+      if type(w) == "function" then
+         w = w(screen)
+      end
+
+      wallpaper.maximized(w, screen, true)
    end
 end
 

src/awesome-slot/slots/tag.lua

@@ -1,11 +1,9 @@
-local layout = require "awful.layout"
-
 local tag_slots = {}
 
 function tag_slots.default_layouts(params)
-   return function()
+   local layout = require "awful.layout"
+
    layout.append_default_layouts(params.layouts)
 end
-end
 
 return tag_slots