From 05ece594ad5642ab447b7a01b72d237474210759 Mon Sep 17 00:00:00 2001 From: Jakub Fojt Date: Tue, 3 Dec 2019 21:55:44 +0100 Subject: [PATCH] lemonbar: Move conky configs into modules --- .i3/lemonbar/conky_fast | 26 ------------ .i3/lemonbar/conky_slow | 25 ------------ .i3/lemonbar/i3_lemonbar_config.py | 3 -- .i3/lemonbar/i3_lemonbar_modules.py | 62 +++++++++++++++++++++++++++-- 4 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 .i3/lemonbar/conky_fast delete mode 100644 .i3/lemonbar/conky_slow diff --git a/.i3/lemonbar/conky_fast b/.i3/lemonbar/conky_fast deleted file mode 100644 index 06a74f1..0000000 --- a/.i3/lemonbar/conky_fast +++ /dev/null @@ -1,26 +0,0 @@ - -- Conky for external bar - -- out simple text to console - -conky.config = { - background=false, - update_interval=0.2, - total_run_times=0, - override_utf8_locale=true, - short_units=true, - uppercase=false, - out_to_console=true, - out_to_x=false, - if_up_strictness='address', - format_human_readable=true, -} - -conky.text = [[ -${time %a %d %b %H:%M:%S} \ -${exec ~/.i3/lemonbar/get_vol.sh} \ -${if_up wlp3s0}${downspeedf wlp3s0} ${upspeedf wlp3s0}\ -${else}down down${endif}\ - \ -${if_up enp5s0}${downspeedf enp2s0} ${upspeedf enp5s0}\ -${else}down down${endif}\ - \ -]] diff --git a/.i3/lemonbar/conky_slow b/.i3/lemonbar/conky_slow deleted file mode 100644 index 5a0d199..0000000 --- a/.i3/lemonbar/conky_slow +++ /dev/null @@ -1,25 +0,0 @@ - -- Conky for external bar - -- out simple text to console - -conky.config = { - background=false, - update_interval=5, - total_run_times=0, - override_utf8_locale=true, - short_units=true, - uppercase=false, - out_to_console=true, - out_to_x=false, - if_up_strictness='address', - format_human_readable=true, -} - -conky.text = [[ -${cpu} \ -${mem} \ -${fs_used_perc /} \ -${fs_used_perc /home} \ -F100 \ -100.00 \ -${exec /home/kuba/.i3/scripts/lang.sh show} -]] diff --git a/.i3/lemonbar/i3_lemonbar_config.py b/.i3/lemonbar/i3_lemonbar_config.py index 2ff85ca..7a3164c 100755 --- a/.i3/lemonbar/i3_lemonbar_config.py +++ b/.i3/lemonbar/i3_lemonbar_config.py @@ -7,9 +7,6 @@ fifo_file_status = '/tmp/i3_lemonbar1_{}'.format(getpass.getuser()) fifo_screen_log = '/tmp/i3_screen_{}'.format(getpass.getuser()) health_file = '/tmp/i3_lemonbar_health.info' -path="/home/kuba/.i3/lemonbar/" -logpath="/home/kuba/lemonbar.log" # Write here on exceptions - # color definitions color_back = "#FF1D1F21" # Default background color_fore = "#FFC5C8C6" # Default foreground diff --git a/.i3/lemonbar/i3_lemonbar_modules.py b/.i3/lemonbar/i3_lemonbar_modules.py index 94ec5d8..1edea4a 100644 --- a/.i3/lemonbar/i3_lemonbar_modules.py +++ b/.i3/lemonbar/i3_lemonbar_modules.py @@ -72,14 +72,41 @@ def format_load(data, module, alert): return (d_v, u_v) class ConkyFastModule(LemonModule): + # TODO use internal python stuff for stuff like clock, then raise update interval + conky_config = """ +conky.config = { + background=false, + update_interval=0.2, + total_run_times=0, + override_utf8_locale=true, + short_units=true, + uppercase=false, + out_to_console=true, + out_to_x=false, + if_up_strictness='address', + format_human_readable=true, +} +conky.text = [[ +${time %a %d %b %H:%M:%S} \ +${exec ~/.i3/lemonbar/get_vol.sh} \ +${if_up wlp3s0}${downspeedf wlp3s0} ${upspeedf wlp3s0}\ +${else}down down${endif}\ + \ +${if_up enp5s0}${downspeedf enp2s0} ${upspeedf enp5s0}\ +${else}down down${endif}\ + \ +]] + """ def __init__(self): self.show_secs = False super().__init__() def _start_module(self): - self.p_handle = subprocess.Popen(['conky', '-c', config.path+'conky_fast'], - stdout=subprocess.PIPE, text=True) + self.p_handle = subprocess.Popen(['conky', '-c', '-'], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True) + self.p_handle.stdin.write(self.conky_config) + self.p_handle.stdin.close() # Otherwise conky doesn't load self.status_handle = self.p_handle.stdout self.wlan_load = parser.IconTextUnit('wlan_load', action='wlan', order=13) @@ -150,12 +177,39 @@ class ConkyFastModule(LemonModule): class ConkySlowModule(LemonModule): + conky_config = """ +conky.config = { + background=false, + update_interval=5, + total_run_times=0, + override_utf8_locale=true, + short_units=true, + uppercase=false, + out_to_console=true, + out_to_x=false, + if_up_strictness='address', + format_human_readable=true, +} + +conky.text = [[ +${cpu} \ +${mem} \ +${fs_used_perc /} \ +${fs_used_perc /home} \ +F100 \ +100.00 \ +${exec /home/kuba/.i3/scripts/lang.sh show} +]] + """ + def __init__(self): super().__init__() def _start_module(self): - self.p_handle = subprocess.Popen(['conky', '-c', config.path+'conky_slow'], - stdout=subprocess.PIPE, text=True) + self.p_handle = subprocess.Popen(['conky', '-c', '-'], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True) + self.p_handle.stdin.write(self.conky_config) + self.p_handle.stdin.close() # Otherwise conky doesn't load self.status_handle = self.p_handle.stdout self.sys_load = parser.IconTextUnit('sys_load', action='load', order=10)