aboutsummaryrefslogtreecommitdiff
path: root/plugins/statusclock.lua
diff options
context:
space:
mode:
authorAdam Harrison <adamdharrison@gmail.com>2021-12-05 22:56:04 -0500
committerjgmdev <jgmdev@gmail.com>2022-05-22 13:02:00 -0400
commit3fcf065be6387c5bb38a46924f5ea1a7bb17850d (patch)
tree19b3c571c7e1beae325049e56e3df12a0a647637 /plugins/statusclock.lua
parentc569b3b3697c1656c78ec4b4d233d4ed78fa898a (diff)
downloadlite-xl-plugins-3fcf065be6387c5bb38a46924f5ea1a7bb17850d.tar.gz
lite-xl-plugins-3fcf065be6387c5bb38a46924f5ea1a7bb17850d.zip
Appropriately merged config hashes.
Diffstat (limited to 'plugins/statusclock.lua')
-rw-r--r--plugins/statusclock.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/statusclock.lua b/plugins/statusclock.lua
index a2155df..139ae23 100644
--- a/plugins/statusclock.lua
+++ b/plugins/statusclock.lua
@@ -2,13 +2,14 @@
local core = require "core"
local config = require "core.config"
local style = require "core.style"
+local common = require "core.common"
local StatusView = require "core.statusview"
local scan_rate = 1
-config.plugins.statusclock = {
+config.plugins.statusclock = common.merge({
time_format = "%H:%M:%S",
date_format = "%A, %d %B %Y"
-}
+}, config.plugins.statusclock)
local time_data = {
time_text = '',