Usunięcie pliku files/100/conkyrc. Plik w xfcedebian jest bardziej odpowiedni do...

diff --git a/files/100/conkyrc b/files/100/conkyrc
deleted file mode 100644 (file)
index 6ce45dc..0000000
--- a/files/100/conkyrc
+++ /dev/null
@@ -1,75 +0,0 @@
--- Conky, a system monitor https://github.com/brndnmtthws/conky
---
--- This configuration file is Lua code. You can write code in here, and it will
--- execute when Conky loads. You can use it to generate your own advanced
--- configurations.
---
--- Try this (remove the `--`):
---
---   print("Loading Conky config")
---
--- For more on Lua, see:
--- https://www.lua.org/pil/contents.html
-
-conky.config = {
-    alignment = 'top_right',
-    background = true,
-    border_width = 1,
-    cpu_avg_samples = 2,
-    default_color = 'red',
-    default_outline_color = 'brown',
-    default_shade_color = 'brown',
-    double_buffer = true,
-    draw_borders = false,
-    draw_graph_borders = true,
-    draw_outline = false,
-    draw_shades = false,
-    extra_newline = false,
-    font = 'DejaVu Sans Mono:size=12',
-    gap_x = 5,
-    gap_y = 0,
-    minimum_height = 5,
-    minimum_width = 5,
-    net_avg_samples = 2,
-    no_buffers = true,
-    out_to_console = false,
-    out_to_ncurses = false,
-    out_to_stderr = false,
-    out_to_x = true,
-    own_window = true,
-       own_window_transparent = true,
-       own_window_argb_visual = true,
-    own_window_class = 'Conky',
-        own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-    show_graph_range = false,
-    show_graph_scale = false,
-    stippled_borders = 0,
-    update_interval = 1.0,
-    uppercase = false,
-    use_spacer = 'none',
-    use_xft = true,
-}
-
-conky.text = [[
-${color blue}Info:$color ${scroll 32 immudex${exec immudex_branch} ${cat /run/live/medium/live/version} - $sysname $nodename $kernel $machine}
-$hr
-${color blue}Uptime:$color $uptime
-${color blue}Frequency (in MHz):$color $freq
-${color blue}Frequency (in GHz):$color $freq_g
-${color blue}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
-${color blue}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
-${color blue}CPU Usage:$color $cpu% ${cpubar 4}
-${color blue}Processes:$color $processes  ${color blue}Running:$color $running_processes
-${color blue}Battery:$color ${battery}
-$hr
-${color blue}File systems:
- / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
-${color blue}Networking:
-Up:$color ${upspeed} ${color blue} - Down:$color ${downspeed}
-$hr
-${color blue}Name              PID     CPU%   MEM%
-${color red} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
-${color red} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
-${color red} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
-${color red} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
-]]

diff --git a/versions/100.sh b/versions/100.sh
index dca2d5f7638a96331b552a219ef1242246bccd17..618c352a979f180e3c9a69143d32809120fd2e04 100644 (file)
--- a/versions/100.sh
+++ b/versions/100.sh
@@ -80,7 +80,6 @@ cp -vv ~/immudex-testing/files/${VERSION}/Klient\ poczty\ Thunderbird.desktop /e
 cp -vv ~/immudex-testing/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
 cp -vv ~/immudex-testing/files/${VERSION}/mimeapps.list /etc/skel/.config;
 cp -rvv ~/immudex-testing/files/${VERSION}/sync.sh /usr/share;
-cp -vv ~/immudex-testing/files/${VERSION}/conkyrc /etc/skel/.conkyrc;
 cp -vv ~/immudex-testing/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
 cp -vv ~/immudex-testing/files/${VERSION}/immudex_hostname.service /etc/systemd/system;
 

diff --git a/versions/base.sh b/versions/base.sh
index 7f83ab71879ff962fae1db3a9e7b147f0e801301..4e425bf3adb22a56fe77baa8b03d3045196ee0b4 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -66,7 +66,6 @@ cp -vv ~/immudex-testing/files/${VERSION}/Klient\ poczty\ Thunderbird.desktop /e
 cp -vv ~/immudex-testing/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
 cp -vv ~/immudex-testing/files/${VERSION}/mimeapps.list /etc/skel/.config;
 cp -rvv ~/immudex-testing/files/${VERSION}/sync.sh /usr/share;
-cp -vv ~/immudex-testing/files/${VERSION}/conkyrc /etc/skel/.conkyrc;
 cp -vv ~/immudex-testing/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
 cp -vv ~/immudex-testing/files/${VERSION}/immudex_hostname.service /etc/systemd/system;