From d44fefb4a8b76d52533e3d074b722b3bc06dad1d Mon Sep 17 00:00:00 2001 From: hayao Date: Mon, 3 May 2021 15:31:07 +0900 Subject: [PATCH 01/57] [add] : Added kmscon module --- .../etc/fonts/conf.d/99-kmscon.conf | 12 +++++++++++ .../root/customize_airootfs_kmscon.sh | 21 +++++++++++++++++++ modules/kmscon/alteriso | 1 + modules/kmscon/architecture | 10 +++++++++ modules/kmscon/packages.i686/kmscon.x86_64 | 13 ++++++++++++ modules/kmscon/packages.x86_64/kmscon.x86_64 | 13 ++++++++++++ .../kmscon/packages_aur.i686/kmscon.x86_64 | 13 ++++++++++++ .../kmscon/packages_aur.x86_64/kmscon.x86_64 | 13 ++++++++++++ .../airootfs.any/root/customize_airootfs.sh | 4 ++-- 9 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf create mode 100755 modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh create mode 100644 modules/kmscon/alteriso create mode 100644 modules/kmscon/architecture create mode 100644 modules/kmscon/packages.i686/kmscon.x86_64 create mode 100644 modules/kmscon/packages.x86_64/kmscon.x86_64 create mode 100644 modules/kmscon/packages_aur.i686/kmscon.x86_64 create mode 100644 modules/kmscon/packages_aur.x86_64/kmscon.x86_64 diff --git a/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf b/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf new file mode 100644 index 000000000..1a2a8485d --- /dev/null +++ b/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf @@ -0,0 +1,12 @@ + + + + + monospace + + SauceCodePro Nerd Font Mono + DejaVu Sans Mono + IPAGothic + + + diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh new file mode 100755 index 000000000..55e164f03 --- /dev/null +++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# + +# Copy config file for getty@tty1.service to kmsconvt@tty1.service +if [[ -f "/etc/systemd/system/getty@tty1.service.d/autologin.conf" ]]; then + mkdir -p "/etc/systemd/system/kmsconvt@tty1.service.d/" + cp "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@tty1.service.d/autologin.conf" +fi + +# Disable default tty +_systemd_service disable "getty@tty1.service" +_systemd_service enable "kmsconvt@tty1.service" + +# Run KMSCON for all tty +ln -s "/usr/lib/systemd/system/kmsconvt@.service" "/etc/systemd/system/autovt@.service" diff --git a/modules/kmscon/alteriso b/modules/kmscon/alteriso new file mode 100644 index 000000000..9e793f364 --- /dev/null +++ b/modules/kmscon/alteriso @@ -0,0 +1 @@ +alteriso=3.1 diff --git a/modules/kmscon/architecture b/modules/kmscon/architecture new file mode 100644 index 000000000..84d09d348 --- /dev/null +++ b/modules/kmscon/architecture @@ -0,0 +1,10 @@ +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# Supported architecture list + +x86_64 diff --git a/modules/kmscon/packages.i686/kmscon.x86_64 b/modules/kmscon/packages.i686/kmscon.x86_64 new file mode 100644 index 000000000..4b04eb38a --- /dev/null +++ b/modules/kmscon/packages.i686/kmscon.x86_64 @@ -0,0 +1,13 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# kmscon packages + +#-- kmscon --# +kmscon diff --git a/modules/kmscon/packages.x86_64/kmscon.x86_64 b/modules/kmscon/packages.x86_64/kmscon.x86_64 new file mode 100644 index 000000000..4b04eb38a --- /dev/null +++ b/modules/kmscon/packages.x86_64/kmscon.x86_64 @@ -0,0 +1,13 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# kmscon packages + +#-- kmscon --# +kmscon diff --git a/modules/kmscon/packages_aur.i686/kmscon.x86_64 b/modules/kmscon/packages_aur.i686/kmscon.x86_64 new file mode 100644 index 000000000..26d6099c2 --- /dev/null +++ b/modules/kmscon/packages_aur.i686/kmscon.x86_64 @@ -0,0 +1,13 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# kmscon packages + +#-- Fonts --# +nerd-fonts-source-code-pro diff --git a/modules/kmscon/packages_aur.x86_64/kmscon.x86_64 b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64 new file mode 100644 index 000000000..26d6099c2 --- /dev/null +++ b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64 @@ -0,0 +1,13 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# kmscon packages + +#-- Fonts --# +nerd-fonts-source-code-pro diff --git a/modules/share/airootfs.any/root/customize_airootfs.sh b/modules/share/airootfs.any/root/customize_airootfs.sh index 22b45bdf1..fefe56047 100755 --- a/modules/share/airootfs.any/root/customize_airootfs.sh +++ b/modules/share/airootfs.any/root/customize_airootfs.sh @@ -174,8 +174,8 @@ create_user "${username}" "${password}" # Set up auto login -if [[ -f /etc/systemd/system/getty@tty1.service.d/autologin.conf ]]; then - sed -i s/%USERNAME%/"${username}"/g /etc/systemd/system/getty@tty1.service.d/autologin.conf +if [[ -f "/etc/systemd/system/getty@tty1.service.d/autologin.conf" ]]; then + sed -i "s/%USERNAME%/${username}/g" "/etc/systemd/system/getty@tty1.service.d/autologin.conf" fi From e4f04224d9e0fc53743b2402f291d07e53e9933f Mon Sep 17 00:00:00 2001 From: hayao Date: Mon, 3 May 2021 15:33:37 +0900 Subject: [PATCH 02/57] [update] : Enable kmscon module --- channels/basic/config.any | 1 + channels/cinnamon/config.any | 1 + channels/gnome/config.any | 1 + channels/i3/config.any | 1 + channels/lxde/config.any | 1 + channels/plasma/config.any | 1 + channels/serene/config.any | 1 + channels/xfce-pro/config.any | 1 + channels/xfce/config.any | 1 + 9 files changed, 9 insertions(+) diff --git a/channels/basic/config.any b/channels/basic/config.any index b1a9cc893..4abbb3282 100644 --- a/channels/basic/config.any +++ b/channels/basic/config.any @@ -27,5 +27,6 @@ modules=( "share" "zsh-powerline" "share-extra" + #"kmscon" #"lightdm" ) diff --git a/channels/cinnamon/config.any b/channels/cinnamon/config.any index 213c2bca0..b76fd636f 100644 --- a/channels/cinnamon/config.any +++ b/channels/cinnamon/config.any @@ -22,6 +22,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "lightdm" "alter-lightdm" diff --git a/channels/gnome/config.any b/channels/gnome/config.any index 1c61d5d43..db23c5a0f 100644 --- a/channels/gnome/config.any +++ b/channels/gnome/config.any @@ -25,6 +25,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "gdm" "qtongtk" diff --git a/channels/i3/config.any b/channels/i3/config.any index 5e0df8ddf..dfdb5e005 100644 --- a/channels/i3/config.any +++ b/channels/i3/config.any @@ -22,6 +22,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "lightdm" "alter-lightdm" diff --git a/channels/lxde/config.any b/channels/lxde/config.any index 213c2bca0..b76fd636f 100644 --- a/channels/lxde/config.any +++ b/channels/lxde/config.any @@ -22,6 +22,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "lightdm" "alter-lightdm" diff --git a/channels/plasma/config.any b/channels/plasma/config.any index f334c2c7f..aafcb6349 100644 --- a/channels/plasma/config.any +++ b/channels/plasma/config.any @@ -21,4 +21,5 @@ usershell="/bin/zsh" modules=( "share" "base" + "kmscon" ) diff --git a/channels/serene/config.any b/channels/serene/config.any index a30c77696..b27e4bb5e 100644 --- a/channels/serene/config.any +++ b/channels/serene/config.any @@ -63,6 +63,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "lightdm" "alter-lightdm" diff --git a/channels/xfce-pro/config.any b/channels/xfce-pro/config.any index 213c2bca0..b76fd636f 100644 --- a/channels/xfce-pro/config.any +++ b/channels/xfce-pro/config.any @@ -22,6 +22,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "lightdm" "alter-lightdm" diff --git a/channels/xfce/config.any b/channels/xfce/config.any index 213c2bca0..b76fd636f 100644 --- a/channels/xfce/config.any +++ b/channels/xfce/config.any @@ -22,6 +22,7 @@ modules=( "base" "share" "share-extra" + "kmscon" "zsh-powerline" "lightdm" "alter-lightdm" From 72554271e86a8e7edeb4f5954f0a774b41fe2477 Mon Sep 17 00:00:00 2001 From: hayao Date: Mon, 3 May 2021 17:17:43 +0900 Subject: [PATCH 03/57] [fix] : Fixed _systemd_service --- modules/share/airootfs.any/root/customize_airootfs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/share/airootfs.any/root/customize_airootfs.sh b/modules/share/airootfs.any/root/customize_airootfs.sh index fefe56047..b9bd3a78d 100755 --- a/modules/share/airootfs.any/root/customize_airootfs.sh +++ b/modules/share/airootfs.any/root/customize_airootfs.sh @@ -285,12 +285,12 @@ run_additional_command "gtk-update-icon-cache -f /usr/share/icons/hicolor" # Execute the subcommand only when the specified unit is available. # Usage: _systemd_service ... _systemd_service(){ - local _service - local _command="${1}" + local _service _command="${1}" shift 1 for _service in "${@}"; do # https://unix.stackexchange.com/questions/539147/systemctl-check-if-a-unit-service-or-target-exists - if (( "$(systemctl list-unit-files "${_service}" | wc -l)" > 3 )); then + #if (( "$(systemctl list-unit-files "${_service}" | wc -l)" > 3 )); then + if systemctl cat "${_service}" 2>/dev/null 1>&2; then systemctl ${_command} "${_service}" else echo "${_service} was not found" >&2 From 358e7055deed27228d38f8a2fbb277a9f8307f7b Mon Sep 17 00:00:00 2001 From: kokkiemouse Date: Mon, 3 May 2021 21:44:43 +0900 Subject: [PATCH 04/57] removed Signed-off-by: kokkiemouse --- channels/basic/config.any | 2 +- system/pacman-x86_64.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/basic/config.any b/channels/basic/config.any index 4abbb3282..9c2efceea 100644 --- a/channels/basic/config.any +++ b/channels/basic/config.any @@ -27,6 +27,6 @@ modules=( "share" "zsh-powerline" "share-extra" - #"kmscon" + "kmscon" #"lightdm" ) diff --git a/system/pacman-x86_64.conf b/system/pacman-x86_64.conf index 187c6163b..4a57b0598 100644 --- a/system/pacman-x86_64.conf +++ b/system/pacman-x86_64.conf @@ -87,8 +87,8 @@ Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch Server = https://repo.dyama.net/$repo/$arch #Server = https://xn--d-8o2b.com/repo/$repo/$arch -[dvzrv] -Server = https://pkgbuild.com/~dvzrv/repo/$arch +#[dvzrv] +#Server = https://pkgbuild.com/~dvzrv/repo/$arch #[alter-testing] #Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch From fdd299d4ac89a7223d3defee7790a91b4f404665 Mon Sep 17 00:00:00 2001 From: hayao Date: Sat, 31 Jul 2021 21:44:55 +0900 Subject: [PATCH 05/57] [fix] : Fixed setterm error --- modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh index 55e164f03..e70ab950b 100755 --- a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh +++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh @@ -17,5 +17,8 @@ fi _systemd_service disable "getty@tty1.service" _systemd_service enable "kmsconvt@tty1.service" +# Do not run setterm +remove /etc/profile.d/disable-beep.sh + # Run KMSCON for all tty ln -s "/usr/lib/systemd/system/kmsconvt@.service" "/etc/systemd/system/autovt@.service" From 0de669cf9f52d05b0cc8c4f9d733483a36c5278c Mon Sep 17 00:00:00 2001 From: hayao Date: Sat, 31 Jul 2021 21:45:13 +0900 Subject: [PATCH 06/57] [fix] : Enable kmscon in all tty --- .../kmscon/airootfs.any/root/customize_airootfs_kmscon.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh index e70ab950b..2686e1a97 100755 --- a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh +++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh @@ -8,9 +8,9 @@ # # Copy config file for getty@tty1.service to kmsconvt@tty1.service -if [[ -f "/etc/systemd/system/getty@tty1.service.d/autologin.conf" ]]; then - mkdir -p "/etc/systemd/system/kmsconvt@tty1.service.d/" - cp "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@tty1.service.d/autologin.conf" +if [[ -f "/etc/systemd/system/getty@.service.d/autologin.conf" ]]; then + mkdir -p "/etc/systemd/system/kmsconvt@.service.d/" + cp "/etc/systemd/system/getty@.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@.service.d/autologin.conf" fi # Disable default tty From fcb191599c5641a33e869f7de767644a31684d1c Mon Sep 17 00:00:00 2001 From: hayao Date: Sat, 31 Jul 2021 22:03:01 +0900 Subject: [PATCH 07/57] [fix] : Fixed debug message --- tools/clean.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/clean.sh b/tools/clean.sh index 457e023f3..64b2e2593 100755 --- a/tools/clean.sh +++ b/tools/clean.sh @@ -58,7 +58,8 @@ remove() { _umount() { if mountpoint -q "${1}"; then umount -lf "${1}"; fi; } # Unmount chroot dir -umount_chroot () { "${tools_dir}/umount.sh" -d "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"; } +#umount_chroot () { "${tools_dir}/umount.sh" -d "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"; } +umount_chroot () { "${tools_dir}/umount.sh" "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")" "$([[ "${debug}" = true ]] && printf "%s" "-d")"; } # Usage: getclm # 標準入力から値を受けとり、引数で指定された列を抽出します。 From bb5248e954d3ddc44c7b9e9fbcfd3f4dc6040567 Mon Sep 17 00:00:00 2001 From: hayao Date: Sat, 31 Jul 2021 22:13:53 +0900 Subject: [PATCH 08/57] [fix] :] Fixed service name (for all tty) --- .../kmscon/airootfs.any/root/customize_airootfs_kmscon.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh index 2686e1a97..3e782e809 100755 --- a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh +++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh @@ -7,15 +7,15 @@ # (c) 2019-2021 Fascode Network. # -# Copy config file for getty@tty1.service to kmsconvt@tty1.service +# Copy config file for getty@.service to kmsconvt@.service if [[ -f "/etc/systemd/system/getty@.service.d/autologin.conf" ]]; then mkdir -p "/etc/systemd/system/kmsconvt@.service.d/" cp "/etc/systemd/system/getty@.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@.service.d/autologin.conf" fi # Disable default tty -_systemd_service disable "getty@tty1.service" -_systemd_service enable "kmsconvt@tty1.service" +_systemd_service disable "getty@tty1.service" "getty@.service" +_systemd_service enable "kmsconvt@.service" # Do not run setterm remove /etc/profile.d/disable-beep.sh From a086aa4b1f67600b5e0ded0670a227e32548c6c0 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 1 Aug 2021 18:18:32 +0900 Subject: [PATCH 09/57] [fix] : FIxed systemd error (disabled) --- modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh index 3e782e809..1a76a2df1 100755 --- a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh +++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh @@ -15,7 +15,7 @@ fi # Disable default tty _systemd_service disable "getty@tty1.service" "getty@.service" -_systemd_service enable "kmsconvt@.service" +#_systemd_service enable "kmsconvt@.service" # Do not run setterm remove /etc/profile.d/disable-beep.sh From 5942400fe28cf7307fe29b0a00dac7e21995d23c Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 1 Aug 2021 18:24:06 +0900 Subject: [PATCH 10/57] [fix] : Prevent multiple addition of groups --- .../airootfs.any/root/customize_airootfs_share-extra.sh | 2 +- modules/share/airootfs.any/root/functions.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh b/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh index ee7d09e04..7a67fef6d 100644 --- a/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh +++ b/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh @@ -20,7 +20,7 @@ _systemd_service enable ufw.service # Added autologin group to auto login -groupadd autologin +_groupadd autologin usermod -aG autologin ${username} diff --git a/modules/share/airootfs.any/root/functions.sh b/modules/share/airootfs.any/root/functions.sh index 00f248177..83c7f1c4c 100644 --- a/modules/share/airootfs.any/root/functions.sh +++ b/modules/share/airootfs.any/root/functions.sh @@ -52,6 +52,11 @@ function installedpkg () { fi } +# Add group if it does not exist +_groupadd(){ + cut -d ":" -f 1 < "/etc/group" | grep -qx "${1}" && return 0 || groupadd "${1}" +} + # Create a user. # create_user function create_user () { @@ -74,7 +79,7 @@ function create_user () { if ! user_check "${_username}"; then useradd -m -s ${usershell} ${_username} - groupadd sudo + _groupadd sudo usermod -U -g ${_username} ${_username} usermod -aG sudo ${_username} usermod -aG storage ${_username} From 1e79e8a35ba8c87f88fa512546ae28609b12a336 Mon Sep 17 00:00:00 2001 From: hayao Date: Mon, 2 Aug 2021 17:14:37 +0900 Subject: [PATCH 11/57] [fix] : Enable kmscon on tty1 and tty2 --- modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh index 1a76a2df1..d606c8044 100755 --- a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh +++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh @@ -15,7 +15,9 @@ fi # Disable default tty _systemd_service disable "getty@tty1.service" "getty@.service" -#_systemd_service enable "kmsconvt@.service" +_systemd_service enable "kmsconvt@tty1.service" +_systemd_service enable "kmsconvt@tty2.service" + # Do not run setterm remove /etc/profile.d/disable-beep.sh From 4d184e1c9fdd37403353bfce02fec77aec7f6cdc Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 19:25:23 +0900 Subject: [PATCH 12/57] [add] : Added gnome i686 package list --- channels/gnome/packages.i686/exclude | 3 + channels/gnome/packages.i686/gedit.i686 | 11 ++++ .../gnome/packages.i686/gnome-extensions.i686 | 12 ++++ channels/gnome/packages.i686/gnome.i686 | 58 +++++++++++++++++++ .../gnome/packages.i686/gtk-icon-theme.i686 | 16 +++++ .../packages_aur.i686/gnome-extensions.x86_64 | 20 +++++++ .../gnome/packages_aur.i686/wallpapers.x86_64 | 12 ++++ 7 files changed, 132 insertions(+) create mode 100644 channels/gnome/packages.i686/exclude create mode 100644 channels/gnome/packages.i686/gedit.i686 create mode 100644 channels/gnome/packages.i686/gnome-extensions.i686 create mode 100644 channels/gnome/packages.i686/gnome.i686 create mode 100644 channels/gnome/packages.i686/gtk-icon-theme.i686 create mode 100644 channels/gnome/packages_aur.i686/gnome-extensions.x86_64 create mode 100644 channels/gnome/packages_aur.i686/wallpapers.x86_64 diff --git a/channels/gnome/packages.i686/exclude b/channels/gnome/packages.i686/exclude new file mode 100644 index 000000000..3400aad36 --- /dev/null +++ b/channels/gnome/packages.i686/exclude @@ -0,0 +1,3 @@ +xf86-input-synaptics +alterlinux-medit-themes +medit diff --git a/channels/gnome/packages.i686/gedit.i686 b/channels/gnome/packages.i686/gedit.i686 new file mode 100644 index 000000000..6b164e17c --- /dev/null +++ b/channels/gnome/packages.i686/gedit.i686 @@ -0,0 +1,11 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# + +gedit diff --git a/channels/gnome/packages.i686/gnome-extensions.i686 b/channels/gnome/packages.i686/gnome-extensions.i686 new file mode 100644 index 000000000..03488315e --- /dev/null +++ b/channels/gnome/packages.i686/gnome-extensions.i686 @@ -0,0 +1,12 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# Gnome extensions + +gnome-shell-extension-appindicator diff --git a/channels/gnome/packages.i686/gnome.i686 b/channels/gnome/packages.i686/gnome.i686 new file mode 100644 index 000000000..d43932e08 --- /dev/null +++ b/channels/gnome/packages.i686/gnome.i686 @@ -0,0 +1,58 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# Gnome + + +#-- gnome --# +gnome-backgrounds +gnome-boxes +gnome-calculator +gnome-calendar +gnome-control-center +gnome-common +gnome-desktop +gnome-disk-utility +gnome-keyring +gnome-logs +gnome-menus +gnome-remote-desktop +gnome-screenshot +gnome-session +gnome-settings-daemon +gnome-shell +gnome-shell-extensions +gnome-system-monitor +gnome-terminal +mutter +nautilus +sushi + + +#-- gnome-extra --# +dconf-editor +gnome-tweaks + + +#-- Display manager --# +gdm + +#-- other --# +gnome-bluetooth +gnome-epub-thumbnailer + +#aur build +meson +ninja +jq +oniguruma + +# libinput +xf86-input-libinput + diff --git a/channels/gnome/packages.i686/gtk-icon-theme.i686 b/channels/gnome/packages.i686/gtk-icon-theme.i686 new file mode 100644 index 000000000..12d9ce753 --- /dev/null +++ b/channels/gnome/packages.i686/gtk-icon-theme.i686 @@ -0,0 +1,16 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# look and feel + +# icon +papirus-icon-theme + +# theme +materia-gtk-theme diff --git a/channels/gnome/packages_aur.i686/gnome-extensions.x86_64 b/channels/gnome/packages_aur.i686/gnome-extensions.x86_64 new file mode 100644 index 000000000..961b6f533 --- /dev/null +++ b/channels/gnome/packages_aur.i686/gnome-extensions.x86_64 @@ -0,0 +1,20 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# +# Gnome extensions + +chrome-gnome-shell + +gnome-shell-extension-arc-menu +gnome-shell-extension-clipboard-indicator +gnome-shell-extension-coverflow-alt-tab +gnome-shell-extension-dash-to-panel +gnome-shell-extension-desktop-icons-ng +gnome-shell-extension-extensions +#gnome-shell-extension-topicons-redux diff --git a/channels/gnome/packages_aur.i686/wallpapers.x86_64 b/channels/gnome/packages_aur.i686/wallpapers.x86_64 new file mode 100644 index 000000000..67eb9b097 --- /dev/null +++ b/channels/gnome/packages_aur.i686/wallpapers.x86_64 @@ -0,0 +1,12 @@ +# +# Alter Linux package list +# +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2021 Fascode Network. +# + +#-- wallpaper --# +alterlinux-wallpapers From 341724673420c9e52a9fc71280a9a4b957d133a2 Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 19:25:51 +0900 Subject: [PATCH 13/57] [enable] : Enabled i686 architecture --- channels/gnome/architecture | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/gnome/architecture b/channels/gnome/architecture index 84d09d348..664761fd1 100644 --- a/channels/gnome/architecture +++ b/channels/gnome/architecture @@ -8,3 +8,4 @@ # Supported architecture list x86_64 +i686 From c2bf2231c8c718125006465d86e03b01c7fdea8e Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 20:10:53 +0900 Subject: [PATCH 14/57] [fix] : Fixed filename --- .../{gnome-extensions.x86_64 => gnome-extensions.i686} | 0 .../packages_aur.i686/{wallpapers.x86_64 => wallpapers.i686} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename channels/gnome/packages_aur.i686/{gnome-extensions.x86_64 => gnome-extensions.i686} (100%) rename channels/gnome/packages_aur.i686/{wallpapers.x86_64 => wallpapers.i686} (100%) diff --git a/channels/gnome/packages_aur.i686/gnome-extensions.x86_64 b/channels/gnome/packages_aur.i686/gnome-extensions.i686 similarity index 100% rename from channels/gnome/packages_aur.i686/gnome-extensions.x86_64 rename to channels/gnome/packages_aur.i686/gnome-extensions.i686 diff --git a/channels/gnome/packages_aur.i686/wallpapers.x86_64 b/channels/gnome/packages_aur.i686/wallpapers.i686 similarity index 100% rename from channels/gnome/packages_aur.i686/wallpapers.x86_64 rename to channels/gnome/packages_aur.i686/wallpapers.i686 From a1403b8ace9eeeda4ed0ffd89ed0d17d74d854fa Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 22:27:08 +0900 Subject: [PATCH 15/57] [fix] : Replace chromium with firefox --- .../gnome/airootfs.any/root/customize_airootfs_gnome.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh b/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh index c5f60decf..a1b450fbd 100755 --- a/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh +++ b/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh @@ -26,3 +26,10 @@ function remove_userfile() { } remove_userfile "Desktop/calamares.desktop" #remove_userfile ".config/autostart/genicon.desktop" + +# Optimize for i686 +if [[ "${arch}" = "i686" ]]; then + for _file in "/etc/dconf/db/local.d/01-alter-gnome" "/etc/dconf/db/local.d/02-live-installer-panel"; do + sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g" "${_file}" + done +fi From 13440be1016e7c1d2e17d789c1ee74b52e6b3125 Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 22:47:20 +0900 Subject: [PATCH 16/57] [update] : Install go with pacstrap --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 4dd4abeb0..b267b03c9 100755 --- a/build.sh +++ b/build.sh @@ -578,6 +578,7 @@ make_packages_aur() { # prepare for yay cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh" + _pacstrap "go" # Run aur script _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${makepkg_script_args[@]}" "${_pkglist_aur[@]}" From cbb59a2a45009c70cab01d66ff142eb23e81e11e Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 22:59:02 +0900 Subject: [PATCH 17/57] [update] : Install go with --asdes --needed --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b267b03c9..e8f28d28f 100755 --- a/build.sh +++ b/build.sh @@ -578,7 +578,7 @@ make_packages_aur() { # prepare for yay cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh" - _pacstrap "go" + _pacstrap --asdeps --needed "go" # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない # Run aur script _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${makepkg_script_args[@]}" "${_pkglist_aur[@]}" From 8179dc7111942ff98290337e3c9fd29be502c0ba Mon Sep 17 00:00:00 2001 From: hayao Date: Thu, 12 Aug 2021 23:02:10 +0900 Subject: [PATCH 18/57] [fix] : Fixed pacman output --- system/aur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/aur.sh b/system/aur.sh index 702b75db4..2a0de9596 100755 --- a/system/aur.sh +++ b/system/aur.sh @@ -90,7 +90,7 @@ if ! pacman -Qq yay 1> /dev/null 2>&1; then # Install depends for _pkg in "${yay_depends[@]}"; do - if ! pacman -Qq "${_pkg}" | grep -q "${_pkg}"; then + if ! pacman -Qq "${_pkg}" > /dev/null 2>&1 | grep -q "${_pkg}"; then pacman -S --asdeps --needed "${pacman_args[@]}" "${_pkg}" remove_list+=("${_pkg}") fi From a63ebff7b9fd8ddc36ae414664e1f757ac9f3da4 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:26:13 +0900 Subject: [PATCH 19/57] [fix] : Replace "chromium" to "firefox" --- channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh b/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh index a1b450fbd..e1c5b261e 100755 --- a/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh +++ b/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh @@ -30,6 +30,6 @@ remove_userfile "Desktop/calamares.desktop" # Optimize for i686 if [[ "${arch}" = "i686" ]]; then for _file in "/etc/dconf/db/local.d/01-alter-gnome" "/etc/dconf/db/local.d/02-live-installer-panel"; do - sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g" "${_file}" + sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g; s|chromium|firefox|g" "${_file}" done fi From eef7604fb395364e3b8fcb538545b6d83755f7dc Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:26:27 +0900 Subject: [PATCH 20/57] [clean] : Removed old dconf --- .../airootfs.any/etc/dconf/db/local.d/01-alter-gnome | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome index 339806974..9779be9a5 100644 --- a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome +++ b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome @@ -69,23 +69,12 @@ enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions. favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop'] [org/gnome/shell/extensions/arc-menu] -application-shortcuts-list=[['Software', 'system-software-install-symbolic', 'ArcMenu_Software'], ['Settings', 'preferences-system-symbolic', 'gnome-control-center.desktop'], ['Tweaks', 'org.gnome.tweaks-symbolic', 'org.gnome.tweaks.desktop'], ['Terminal', 'utilities-terminal-symbolic', 'org.gnome.Terminal.desktop']] -arc-menu-placement='DTD' button-icon-padding=0 -custom-menu-button-icon='/usr/share/icons/hicolor/128x128/apps/alter.png' -custom-menu-button-icon-size=24.0 -disable-activities-button=true -disable-tooltips=false dtp-dtd-state=[true, true] -enable-custom-arc-menu=false enable-menu-button-arrow=false -menu-button-icon='Custom_Icon' -pinned-app-list=['Chromium', 'chromium', 'chromium.desktop', 'LibreOffice', 'libreoffice-startcenter', 'libreoffice-startcenter.desktop', 'VLC Media Player', 'vlc', 'vlc.desktop', 'System Monitor', 'org.gnome.SystemMonitor', 'gnome-system-monitor.desktop', 'Terminal', 'org.gnome.Terminal', 'org.gnome.Terminal.desktop', 'Settings', 'org.gnome.Settings', 'gnome-control-center.desktop'] position-in-panel='Left' recently-installed-apps=@as [] show-external-devices=true -show-lock-button=false -show-logout-button=false show-suspend-button=false [org/gnome/shell/extensions/arcmenu] From f253fc67553311993c23983135d9f0247c17c88b Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:29:19 +0900 Subject: [PATCH 21/57] [update] : Enable shortcut key "Super_L" --- channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome index 9779be9a5..718518831 100644 --- a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome +++ b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome @@ -94,6 +94,7 @@ enable-sub-menus=false extra-categories=[(0, true), (1, true), (2, true), (3, true), (4, false)] menu-button-icon='Custom_Icon' menu-height=550 +menu-hotkey='Super_L' menu-layout='Windows' menu-width=290 pinned-app-list=['Chromium', '', 'chromium.desktop', 'Thunderbird', '', 'thunderbird.desktop', 'LibreOffice Writer', '', 'libreoffice-writer.desktop', 'LibreOffice Impress', '', 'libreoffice-impress.desktop', 'LibreOffice Calc', '', 'libreoffice-calc.desktop', 'System Monitor', '', 'gnome-system-monitor.desktop', 'Extensions', '', 'org.gnome.Extensions.desktop', 'VLC media player', '', 'vlc.desktop', 'medit', '', 'medit.desktop'] From 054294a25a7399401b1745ebf2e3e639600486e1 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:31:07 +0900 Subject: [PATCH 22/57] [update] : Show activities icon --- .../etc/dconf/db/local.d/01-alter-gnome | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome index 718518831..823bce6e8 100644 --- a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome +++ b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome @@ -126,23 +126,30 @@ position='Bottom' switcher-style='Timeline' [org/gnome/shell/extensions/dash-to-panel] -appicon-margin=4 +animate-appicon-hover-animation-extent={'RIPPLE': 4, 'PLANK': 4, 'SIMPLE': 1} +appicon-padding=4 available-monitors=[0] dot-position='BOTTOM' group-apps=true hotkeys-overlay-combo='TEMPORARILY' intellihide=false isolate-workspaces=true -panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}' +leftbox-padding=-1 +panel-anchors='{"0":"MIDDLE"}' +panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}' +panel-lengths='{"0":100}' panel-positions='{"0":"BOTTOM"}' -panel-size=32 +panel-sizes='{"0":32}' secondarymenu-contains-showdetails=true show-appmenu=false show-apps-icon-file='' +status-icon-padding=-1 stockgs-keep-dash=true stockgs-keep-top-panel=false stockgs-panelbtn-click-only=false taskbar-locked=false +tray-padding=-1 +window-preview-title-position='TOP' [org/gnome/shell/extensions/ding] icon-size='small' From 00b70d9c64c1331a1fee5c524d216482faaa3ee2 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:44:35 +0900 Subject: [PATCH 23/57] [fix] : Not show welcome dialog --- channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome index 823bce6e8..86e82c7af 100644 --- a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome +++ b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome @@ -67,6 +67,7 @@ app-picker-view=uint32 0 disabled-extensions=['window-list@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'apps-menu@gnome-shell-extensions.gcampax.github.com'] enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'CoverflowAltTab@palatis.blogspot.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com', 'CoverflowAltTab@dmo60.de', 'arcmenu@arcmenu.com', 'clipboard-indicator@tudmotu.com', 'appindicatorsupport@rgcjonas.gmail.com'] favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop'] +welcome-dialog-last-shown-version='999999999' [org/gnome/shell/extensions/arc-menu] button-icon-padding=0 From 3fdce1cf890f564e7b8ed93f16c73469eb19a662 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:44:57 +0900 Subject: [PATCH 24/57] [update] : Show activities on panel --- .../gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome index 86e82c7af..c1a8de212 100644 --- a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome +++ b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome @@ -42,7 +42,7 @@ network-monitor-gio-name='' [org/gnome/mutter] center-new-windows=false dynamic-workspaces=true -overlay-key='Super_R' +overlay-key='Super_L' [org/gnome/nautilus/list-view] default-column-order=['name', 'size', 'type', 'owner', 'group', 'permissions', 'where', 'date_modified', 'date_modified_with_time', 'date_accessed', 'recency', 'starred', 'detailed_type'] @@ -65,7 +65,7 @@ hinting='slight' [org/gnome/shell] app-picker-view=uint32 0 disabled-extensions=['window-list@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'apps-menu@gnome-shell-extensions.gcampax.github.com'] -enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'CoverflowAltTab@palatis.blogspot.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com', 'CoverflowAltTab@dmo60.de', 'arcmenu@arcmenu.com', 'clipboard-indicator@tudmotu.com', 'appindicatorsupport@rgcjonas.gmail.com'] +enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'CoverflowAltTab@palatis.blogspot.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com', 'CoverflowAltTab@dmo60.de', 'arcmenu@arcmenu.com', 'clipboard-indicator@tudmotu.com', 'appindicatorsupport@rgcjonas.gmail.com', 'activities_icons@fawtytoo'] favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop'] welcome-dialog-last-shown-version='999999999' @@ -99,6 +99,7 @@ menu-hotkey='Super_L' menu-layout='Windows' menu-width=290 pinned-app-list=['Chromium', '', 'chromium.desktop', 'Thunderbird', '', 'thunderbird.desktop', 'LibreOffice Writer', '', 'libreoffice-writer.desktop', 'LibreOffice Impress', '', 'libreoffice-impress.desktop', 'LibreOffice Calc', '', 'libreoffice-calc.desktop', 'System Monitor', '', 'gnome-system-monitor.desktop', 'Extensions', '', 'org.gnome.Extensions.desktop', 'VLC media player', '', 'vlc.desktop', 'medit', '', 'medit.desktop'] +position-in-panel='Left' prefs-visible-page=0 right-panel-width=205 searchbar-default-bottom-location='Bottom' @@ -137,7 +138,7 @@ intellihide=false isolate-workspaces=true leftbox-padding=-1 panel-anchors='{"0":"MIDDLE"}' -panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}' +panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}' panel-lengths='{"0":100}' panel-positions='{"0":"BOTTOM"}' panel-sizes='{"0":32}' From d3699fc19f253db57491c25aefd5f9376aebbb38 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:56:16 +0900 Subject: [PATCH 25/57] [update] : Added gnome-shell-extension-activities-icons-git --- channels/gnome/packages_aur.i686/gnome-extensions.i686 | 1 + channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/channels/gnome/packages_aur.i686/gnome-extensions.i686 b/channels/gnome/packages_aur.i686/gnome-extensions.i686 index 961b6f533..4e1d0ce8f 100644 --- a/channels/gnome/packages_aur.i686/gnome-extensions.i686 +++ b/channels/gnome/packages_aur.i686/gnome-extensions.i686 @@ -18,3 +18,4 @@ gnome-shell-extension-dash-to-panel gnome-shell-extension-desktop-icons-ng gnome-shell-extension-extensions #gnome-shell-extension-topicons-redux +gnome-shell-extension-activities-icons-git diff --git a/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 b/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 index 961b6f533..4e1d0ce8f 100644 --- a/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 +++ b/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 @@ -18,3 +18,4 @@ gnome-shell-extension-dash-to-panel gnome-shell-extension-desktop-icons-ng gnome-shell-extension-extensions #gnome-shell-extension-topicons-redux +gnome-shell-extension-activities-icons-git From 2657032e0ddcf70bc7d540377ea7412613427fb6 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 16:57:25 +0900 Subject: [PATCH 26/57] [enable] : Enabled make gnome-32 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e91710d06..a148c1ac1 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ full: sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686 ${FULL_i686} @make clean -basic-64 basic-32 cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64: +basic-64 basic-32 cinnamon-64 cinnamon-32 gnome-64 gnome-32 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64: @$(eval ARCHITECTURE=${shell echo ${@} | rev | cut -d '-' -f 1 | rev }) @$(eval CHANNEL=${shell echo ${@} | sed "s/-${ARCHITECTURE}//g"}) @[[ -z "${CHANNEL}" ]] && echo "Empty Channel" && exit 1 || : From 2d51b0af4dcacc9d3185a695258a624746bcf519 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 17:29:51 +0900 Subject: [PATCH 27/57] [change] : Change the order of the README --- docs/README.md | 28 ++++++++++++++-------------- docs/README_jp.md | 29 ++++++++++++++--------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/docs/README.md b/docs/README.md index dca7676e1..07772b589 100644 --- a/docs/README.md +++ b/docs/README.md @@ -60,28 +60,35 @@

〈Overview〉

- Alter Linux is a new OS developed based on Arch Linux.
Check the project board for the latest status of Alter Linux.
Please see the official website for information on announcements and bugs for users. +

〈Download〉

+The image file can be downloaded from the official website. +
+We are looking for a mirror server provider for repositories and image file distribution. +
+If you would like us to provide a mirror please contact the developer's Twitter. + +

〈Screenshots〉

Xfce

-screenshot +screenshot

Plasma

-screenshot +screenshot

Lxde

-screenshot +screenshot

Gnome

-screenshot +screenshot

Cinnamon

-screenshot +screenshot

i3wm

-screenshot +screenshot

〈Feature〉

-

〈Download〉

-The image file can be downloaded from the official website. -
-We are looking for a mirror server provider for repositories and image file distribution. -
-If you would like us to provide a mirror please contact the developer's Twitter. -

〈Branch〉

These are a list of major branches. Other branches are temporary or used for specific purposes. diff --git a/docs/README_jp.md b/docs/README_jp.md index 875cc64be..24f0d27c7 100644 --- a/docs/README_jp.md +++ b/docs/README_jp.md @@ -57,28 +57,35 @@

〈概要〉

- Alter LinuxはArch Linuxをベースに開発されている新しいOSです。
Alter Linuxの最新の開発状況はプロジェクトボードを確認してください。
ユーザ向けのアナウンスや不具合等の情報は公式サイトをご覧ください。 +

〈ダウンロード〉

+イメージファイルは公式サイトからダウンロードできます。 +
+私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。 +
+もし私達にミラーを提供して頂ける場合は開発者のTwitterまでお願いします。 + +

〈Screenshots〉

Xfce

-screenshot +screenshot

Plasma

-screenshot +screenshot

Lxde

-screenshot +screenshot

Gnome

-screenshot +screenshot

Cinnamon

-screenshot +screenshot

i3wm

-screenshot +screenshot

〈特徴〉

    @@ -93,14 +100,6 @@ Alter Linuxの最新の開発状況は公式サイトからダウンロードできます。 -
    -私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。 -
    -もし私達にミラーを提供して頂ける場合は開発者のTwitterまでお願いします。 - -

    〈ブランチ〉

    主要なブランチは以下のとおりです。これ以外のブランチは一時的なものや特定の用途で使われているものです。 From a284d64db097e6b3966a45602f0e812a21b40d0f Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 13 Aug 2021 18:14:48 +0900 Subject: [PATCH 28/57] [update] : Added --add-module --- build.sh | 11 ++++++++++- default.conf | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index e8f28d28f..112aad823 100755 --- a/build.sh +++ b/build.sh @@ -151,6 +151,7 @@ _usage () { echo " --nopkgbuild Ignore PKGBUILD (Use only for debugging)" echo " --tar-type Set compression type (gzip, lzma, lzo, xz, zstd)" echo " --tar-opts