3 files changed, 21 insertions, 31 deletions
diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua
index 7895f69..58564ce 100644
--- a/lang/lua/astal/gtk3/app.lua
+++ b/lang/lua/astal/gtk3/app.lua
@@ -25,29 +25,26 @@ end
 local app = AstalLua()
 
 ---@class StartConfig
----@field icons? string
----@field instance_name? string
----@field gtk_theme? string
----@field icon_theme? string
----@field cursor_theme? string
----@field css? string
----@field hold? boolean
----@field request_handler? fun(msg: string, response: fun(res: any))
----@field main? fun(...): unknown
----@field client? fun(message: fun(msg: string): string, ...): unknown
+---@field icons string?
+---@field instance_name string?
+---@field gtk_theme string?
+---@field icon_theme string?
+---@field cursor_theme string?
+---@field css string?
+---@field hold boolean?
+---@field request_handler fun(msg: string, response: fun(res: any)): nil
+---@field main fun(...): nil
+---@field client fun(message: fun(msg: string): string, ...): nil
 
----@param config StartConfig | nil
+---@param config? StartConfig
 function Astal.Application:start(config)
-    if config == nil then
-        config = {}
-    end
+    config = config or {}
 
-    if config.client == nil then
-        config.client = function()
+    config.client = config.client
+        or function()
             print('Astal instance "' .. app.instance_name .. '" is already running')
             os.exit(1)
         end
-    end
 
     if config.hold == nil then
         config.hold = true
@@ -61,17 +58,11 @@ function Astal.Application:start(config)
     if config.icons then
         self:add_icons(config.icons)
     end
-    if config.instance_name then
-        self.instance_name = config.instance_name
-    end
-    if config.gtk_theme then
-        self.gtk_theme = config.gtk_theme
-    end
-    if config.icon_theme then
-        self.icon_theme = config.icon_theme
-    end
-    if config.cursor_theme then
-        self.cursor_theme = config.cursor_theme
+
+    for _, key in ipairs({ "instance_name", "gtk_theme", "icon_theme", "cursor_theme" }) do
+        if config[key] then
+            self[key] = config[key]
+        end
     end
 
     app.on_activate = function()
diff --git a/lang/lua/astal/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua
index 211a1d4..95faa2c 100644
--- a/lang/lua/astal/gtk3/astalify.lua
+++ b/lang/lua/astal/gtk3/astalify.lua
@@ -163,9 +163,7 @@ return function(ctor)
     end
 
     return function(tbl)
-        if tbl == nil then
-            tbl = {}
-        end
+        tbl = tbl or {}
 
         local bindings = {}
         local setup = tbl.setup
diff --git a/lang/lua/astal/gtk3/widget.lua b/lang/lua/astal/gtk3/widget.lua
index 3286c26..adcb65f 100644
--- a/lang/lua/astal/gtk3/widget.lua
+++ b/lang/lua/astal/gtk3/widget.lua
@@ -3,6 +3,7 @@ local Astal = lgi.require("Astal", "3.0")
 local Gtk = lgi.require("Gtk", "3.0")
 local astalify = require("astal.gtk3.astalify")
 
+---@overload fun(ctor: any): function
 local Widget = {
     astalify = astalify,
     Box = astalify(Astal.Box),