Skip to content

Split up conky.config. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+4,612 −1,781
Open

Split up conky.config. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
76aeae0
Split Widgets into seperate files / modules
simotek May 1, 2023
3b3d2b4
Improve Background Widget Rendering
simotek May 5, 2023
0c77d58
Use a separate surface for widget backgrounds
simotek May 9, 2023
fc93a1e
Formatting fixes
simotek May 9, 2023
fd01927
Accidentally had my network interface name
simotek May 9, 2023
c3846ab
Rename Graph module to Indicator
simotek May 9, 2023
3d65a1b
Update docs
simotek May 9, 2023
f29db35
Split up conky.config.
simotek May 9, 2023
4fa1b69
Don't use xft_true in core config
simotek May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 16 additions & 29 deletions conkyrc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,20 @@ local script_dir = debug.getinfo(1, 'S').source:match("^@(.*/)") or "./"

conkyrc.config = {
lua_load = script_dir .. "layout.lua",
lua_startup_hook = "conky_setup",
lua_draw_hook_pre = "conky_paint_background",
lua_draw_hook_post = "conky_update",

update_interval = 1,

-- awesome wm --
own_window = true,
own_window_class = 'conky',
own_window_type = 'override',
own_window_hints = 'undecorated,sticky,skip_taskbar,skip_pager',

double_buffer = true,

-- positioning --
alignment = 'top_left',
gap_x = 0,
gap_y = 28,
minimum_width = 140,
maximum_width = 140,
minimum_height = 1080 - 28,

draw_shades = false,
draw_outline = false,
draw_borders = false,
border_width = 0,
border_inner_margin = 0,
border_outer_margin = 0,

top_cpu_separate = true,
top_name_width = 10,
no_buffers = true, -- include buffers in easyfree memory?
cpu_avg_samples = 2,
net_avg_samples = 1,

-- font --
use_xft = true, -- Use Xft (anti-aliased font and stuff)
font = 'Ubuntu:pixelsize=10',
override_utf8_locale = true,
xftalpha = 0, -- Alpha of Xft font. Must be a value at or between 1 and 0.
draw_shades = true,
default_shade_color = 'black',
use_xft = true, -- Use Xft (anti-aliased font and stuff)

-- colors --
own_window_colour = '131313',
Expand Down Expand Up @@ -87,6 +62,18 @@ $endif]],
template9 = '${goto 10}',
}

core_config = require('src/config/core')

if os.getenv("DESKTOP") == "Enlightenment" then
wm_config = require('src/config/enlightenment')
else
wm_config = require('src/config/awesome')
end

tmp_config = util.merge_table(core_config, wm_config)
config = util.merge_table(tmp_config, script_config)

conkyrc.config = config
-----------------
----- START -----
-----------------
Expand Down
41 changes: 38 additions & 3 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,14 @@ <h2>Modules</h2>
<li><a href="modules/data.html">data</a></li>
<li><a href="modules/polycore.html">polycore</a></li>
<li><a href="modules/util.html">util</a></li>
<li><a href="modules/widget.html">widget</a></li>
<li><a href="modules/widget_core.html">widget_core</a></li>
<li><a href="modules/widget_cpu.html">widget_cpu</a></li>
<li><a href="modules/widget_drive.html">widget_drive</a></li>
<li><a href="modules/widget_gpu.html">widget_gpu</a></li>
<li><a href="modules/widget_indicator.html">widget_indicator</a></li>
<li><a href="modules/widget_memory.html">widget_memory</a></li>
<li><a href="modules/widget_network.html">widget_network</a></li>
<li><a href="modules/widget_text.html">widget_text</a></li>
</ul>

</div>
Expand Down Expand Up @@ -64,7 +71,35 @@ <h2>Modules</h2>
<td class="summary">Various helper functions</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget.html">widget</a></td>
<td class="name" nowrap><a href="modules/widget_core.html">widget_core</a></td>
<td class="summary">A collection of Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_cpu.html">widget_cpu</a></td>
<td class="summary">A collection of CPU Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_drive.html">widget_drive</a></td>
<td class="summary">A collection of Disk Drive Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_gpu.html">widget_gpu</a></td>
<td class="summary">A collection of GPU Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_indicator.html">widget_indicator</a></td>
<td class="summary">A collection of Basic Graph and indicator Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_memory.html">widget_memory</a></td>
<td class="summary">A collection of Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_network.html">widget_network</a></td>
<td class="summary">A collection of Network Widget classes</td>
</tr>
<tr>
<td class="name" nowrap><a href="modules/widget_text.html">widget_text</a></td>
<td class="summary">A collection of Widget classes</td>
</tr>
</table>
Expand All @@ -73,7 +108,7 @@ <h2>Modules</h2>
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
<i style="float:right;">Last updated 2023-03-26 23:57:51 </i>
<i style="float:right;">Last updated 2023-05-09 11:37:33 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
Expand Down
11 changes: 9 additions & 2 deletions docs/modules/cairo_helpers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ <h2>Modules</h2>
<li><a href="../modules/data.html">data</a></li>
<li><a href="../modules/polycore.html">polycore</a></li>
<li><a href="../modules/util.html">util</a></li>
<li><a href="../modules/widget.html">widget</a></li>
<li><a href="../modules/widget_core.html">widget_core</a></li>
<li><a href="../modules/widget_cpu.html">widget_cpu</a></li>
<li><a href="../modules/widget_drive.html">widget_drive</a></li>
<li><a href="../modules/widget_gpu.html">widget_gpu</a></li>
<li><a href="../modules/widget_indicator.html">widget_indicator</a></li>
<li><a href="../modules/widget_memory.html">widget_memory</a></li>
<li><a href="../modules/widget_network.html">widget_network</a></li>
<li><a href="../modules/widget_text.html">widget_text</a></li>
</ul>

</div>
Expand Down Expand Up @@ -646,7 +653,7 @@ <h3>Parameters:</h3>
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
<i style="float:right;">Last updated 2023-03-26 23:57:51 </i>
<i style="float:right;">Last updated 2023-05-09 11:37:33 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
Expand Down
11 changes: 9 additions & 2 deletions docs/modules/data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ <h2>Modules</h2>
<li><strong>data</strong></li>
<li><a href="../modules/polycore.html">polycore</a></li>
<li><a href="../modules/util.html">util</a></li>
<li><a href="../modules/widget.html">widget</a></li>
<li><a href="../modules/widget_core.html">widget_core</a></li>
<li><a href="../modules/widget_cpu.html">widget_cpu</a></li>
<li><a href="../modules/widget_drive.html">widget_drive</a></li>
<li><a href="../modules/widget_gpu.html">widget_gpu</a></li>
<li><a href="../modules/widget_indicator.html">widget_indicator</a></li>
<li><a href="../modules/widget_memory.html">widget_memory</a></li>
<li><a href="../modules/widget_network.html">widget_network</a></li>
<li><a href="../modules/widget_text.html">widget_text</a></li>
</ul>

</div>
Expand Down Expand Up @@ -742,7 +749,7 @@ <h3>Parameters:</h3>
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
<i style="float:right;">Last updated 2023-03-26 23:57:51 </i>
<i style="float:right;">Last updated 2023-05-09 11:37:33 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
Expand Down
11 changes: 9 additions & 2 deletions docs/modules/polycore.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ <h2>Modules</h2>
<li><a href="../modules/data.html">data</a></li>
<li><strong>polycore</strong></li>
<li><a href="../modules/util.html">util</a></li>
<li><a href="../modules/widget.html">widget</a></li>
<li><a href="../modules/widget_core.html">widget_core</a></li>
<li><a href="../modules/widget_cpu.html">widget_cpu</a></li>
<li><a href="../modules/widget_drive.html">widget_drive</a></li>
<li><a href="../modules/widget_gpu.html">widget_gpu</a></li>
<li><a href="../modules/widget_indicator.html">widget_indicator</a></li>
<li><a href="../modules/widget_memory.html">widget_memory</a></li>
<li><a href="../modules/widget_network.html">widget_network</a></li>
<li><a href="../modules/widget_text.html">widget_text</a></li>
</ul>

</div>
Expand Down Expand Up @@ -245,7 +252,7 @@ <h3>Parameters:</h3>
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
<i style="float:right;">Last updated 2023-03-26 23:57:51 </i>
<i style="float:right;">Last updated 2023-05-09 11:37:33 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
Expand Down
11 changes: 9 additions & 2 deletions docs/modules/util.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,14 @@ <h2>Modules</h2>
<li><a href="../modules/data.html">data</a></li>
<li><a href="../modules/polycore.html">polycore</a></li>
<li><strong>util</strong></li>
<li><a href="../modules/widget.html">widget</a></li>
<li><a href="../modules/widget_core.html">widget_core</a></li>
<li><a href="../modules/widget_cpu.html">widget_cpu</a></li>
<li><a href="../modules/widget_drive.html">widget_drive</a></li>
<li><a href="../modules/widget_gpu.html">widget_gpu</a></li>
<li><a href="../modules/widget_indicator.html">widget_indicator</a></li>
<li><a href="../modules/widget_memory.html">widget_memory</a></li>
<li><a href="../modules/widget_network.html">widget_network</a></li>
<li><a href="../modules/widget_text.html">widget_text</a></li>
</ul>

</div>
Expand Down Expand Up @@ -771,7 +778,7 @@ <h3>Parameters:</h3>
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
<i style="float:right;">Last updated 2023-03-26 23:57:51 </i>
<i style="float:right;">Last updated 2023-05-09 11:37:33 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
Expand Down
Loading