diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2013-09-24 14:03:03 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2013-09-24 14:03:26 +0200 |
| commit | c9e835b33c007604b66b062811178376bae391f2 (patch) | |
| tree | bba845d44b4623659e2c030ac8838cd1f6c7f1f7 /.i3 | |
| parent | adc93aec5dce3929471f6dff61c1a939871fa262 (diff) | |
| download | dotfiles-c9e835b33c007604b66b062811178376bae391f2.tar.gz dotfiles-c9e835b33c007604b66b062811178376bae391f2.tar.bz2 dotfiles-c9e835b33c007604b66b062811178376bae391f2.zip | |
Conky changes
Diffstat (limited to '.i3')
| -rw-r--r-- | .i3/conkyrc | 8 | ||||
| -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 |