• R/O
  • HTTP
  • SSH
  • HTTPS

iso-arch: Commit


Commit MetaInfo

Revisionf931c63f8b6ac5d8b9d038d570467f5568457a3f (tree)
Time2020-06-19 15:50:41
Authorfhdk <fh@uex....>
Commiterfhdk

Log Message

fix conky - add lsb-release

Change Summary

Incremental Difference

--- a/airootfs/etc/skel/.config/conky/backup.default.conkyrc
+++ /dev/null
@@ -1,40 +0,0 @@
1-# conky configuration
2-#
3-# Adapted from conky script found at:
4-# http://crunchbanglinux.org/forums/topic/59/my-conky-config/
5-
6-background yes
7-use_xft yes
8-xftfont sans:size=72
9-xftalpha 1
10-update_interval 1.0
11-total_run_times 0
12-own_window no
13-own_window_transparent no
14-own_window_colour #282828
15-own_window_type override
16-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
17-double_buffer yes
18-minimum_size 0 0
19-maximum_width 900
20-draw_shades no
21-draw_outline no
22-draw_borders no
23-draw_graph_borders no
24-default_color d64937
25-default_shade_color 000000
26-default_outline_color d9d7d6
27-alignment bm
28-gap_x 0
29-gap_y 0
30-no_buffers yes
31-uppercase no
32-override_utf8_locale no
33-
34-##############################################
35-# Output
36-##############################################
37-
38-TEXT
39-${font Sans:style=Bold:size=11}${voffset -60} Kernel: ${kernel} ${font Sans:size=11}| ${font Sans:style=Bold:size=11}RAM: ${mem} / ${memmax} ${font Sans:size=11}| ${font Sans:style=Bold:size=11}[/]: ${fs_used /} / ${fs_size /} ${font Sans:size=11}| ${font Sans:style=Bold:size=11}CPU: ${cpu cpu0}%
40-${voffset -25}
--- a/airootfs/etc/skel/.config/conky/default.conkyrc
+++ b/airootfs/etc/skel/.config/conky/default.conkyrc
@@ -4,9 +4,10 @@ conky.config = {
44 -- Adapted from conky script found at:
55 -- http://crunchbanglinux.org/forums/topic/59/my-conky-config/
66
7+ alignment = 'bottom_center',
78 background = true,
89 use_xft = true,
9- font = 'sans:size=72',
10+ font = 'sans:size=12',
1011 xftalpha = 1,
1112 update_interval = 1.0,
1213 total_run_times = 0,
@@ -35,10 +36,8 @@ conky.config = {
3536 --#############################################
3637 -- Output
3738 --#############################################
38-
3939 };
4040
4141 conky.text = [[
42-${font Sans:style=Bold:size=11}${voffset -60} Kernel: ${kernel} ${font Sans:size=11}| ${font Sans:style=Bold:size=11}RAM: ${mem} / ${memmax} ${font Sans:size=11}| ${font Sans:style=Bold:size=11}[/]: ${fs_used /} / ${fs_size /} ${font Sans:size=11}| ${font Sans:style=Bold:size=11}CPU: ${cpu cpu0}%
43-${voffset -25}
42+${voffset -60}${exec "lsb_release -d | awk '{print $2" "$3}'"} | Kernel: ${exec "uname -r | cut -d'-' -f1"} ${machine} | RAM: ${mem} / ${memmax} | rootfs: ${fs_used /} / ${fs_size /} | CPU: ${cpu cpu0}%
4443 ]];
--- a/build.sh
+++ b/build.sh
@@ -61,7 +61,8 @@ make_pacman_conf() {
6161 # Base installation, plus needed packages (airootfs)
6262 make_basefs() {
6363 mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
64- mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
64+ mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
65+ -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
6566 }
6667
6768 # Additional packages (airootfs)
--- a/pacbang.sh
+++ b/pacbang.sh
@@ -2,10 +2,11 @@
22 echo "cleaning work folders (./work ./out)"
33 rm -rf work out
44
5-iso_label="PB_$(date +%Y%m%d)"
5+iso_label="PacBang_$(date +%Y%m%d)"
66
77 ./build.sh -N 'PacBang' \
8+ -V 'PacBang' \
89 -L "${iso_label}" \
9- -P 'PacBang <https://pacbang.org>' \
10- -A 'PacBang Live' \
10+ -P 'PacBang <https://pacbang-linux.org>' \
11+ -A 'PacBang Live ISO/Rescue' \
1112 -v
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -10,12 +10,14 @@ gnome-keyring
1010 gparted
1111 gpicview-gtk3
1212 gtk-engine-murrine
13+gtk-engines
1314 gufw
1415 gvfs
1516 gvfs-nfs
1617 gvfs-smb
1718 htop
1819 laptop-detect
20+lsb-release
1921 lxappearance-gtk3
2022 lxdm-gtk3
2123 lxinput-gtk3
@@ -34,7 +36,7 @@ parcellite
3436 pcmanfm-gtk3
3537 polkit
3638 polkit-gnome
37-python-xdg
39+python-pyxdg
3840 tint2
3941 ttf-dejavu
4042 udisks2
Show on old repository browser