summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.i3/conkyrc8
-rw-r--r--.i3/scripts/conky_helpers.lua (renamed from .i3/scripts/json_escape.lua)10
2 files changed, 13 insertions, 5 deletions
diff --git a/.i3/conkyrc b/.i3/conkyrc
index ca8be29..f7e4a3c 100644
--- a/.i3/conkyrc
+++ b/.i3/conkyrc
@@ -32,7 +32,7 @@ override_utf8_locale yes
# set to 1 to disable averaging
cpu_avg_samples 2
-lua_load $HOME/.i3/scripts/json_escape.lua
+lua_load $HOME/.i3/scripts/conky_helpers.lua
template0 "$HOME/.i3/icons/\1.xbm"
@@ -52,9 +52,9 @@ TEXT
"align" : "right"\
},\
{\
- "full_text" : "${mem}",\
+ "full_text" : " ${mem}",\
"icon" : ${template0 load},\
- "min_width" : "1000M",\
+ "min_width" : " 1000M",\
"color" : "\#${if_match ${memperc}<90}ffffff${else}ff0000${endif}"\
},\
{\
@@ -62,7 +62,7 @@ TEXT
"icon" : ${template0 temp}\
},\
{\
- "full_text" : "${if_up eth0}${addr}${else}(down)${endif}",\
+ "full_text" : " ${if_up eth0}${addr}${else}(down)${endif}",\
"icon" : ${template0 net-wired},\
"color" : "\#${if_up eth0}ffffff${else}ff0000${endif}"\
},\
diff --git a/.i3/scripts/json_escape.lua b/.i3/scripts/conky_helpers.lua
index 8723d3e..b796753 100644
--- a/.i3/scripts/json_escape.lua
+++ b/.i3/scripts/conky_helpers.lua
@@ -1,12 +1,20 @@
+-- escape special chars to be usable in JSON
function conky_json(str)
return string.gsub(conky_parse(str), '([\\"])', '\\%1')
end
+-- format strings of 'xxh xxm xxs' as 'hh:mm'
+function conky_utime(str)
+ return string.format("%d:%02d", string.match(conky_parse(str), '(%d+)h (%d+)m (%d+)s'))
+end
+
+-- format all the args as a JSON dictionary
+-- args are as key1, value1, key2, value2, ...
function conky_i3(...)
d = "{"
key = true
for i,v in ipairs(arg) do
- if key then
+ if key then
d = d .. "\"" .. v .. "\":"
key = false
else