From 72efbdf51c2c4b00553a03bb1f323a1c9e85c8c5 Mon Sep 17 00:00:00 2001 From: hayao Date: Wed, 1 Dec 2021 22:27:13 +0900 Subject: [PATCH 01/10] [update] : Added retry --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3d37b9084..e86eef0e6 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" ARCH_x86_64 := --arch x86_64 ARCH_i686 := --arch i686 ARCH_Pen4 := --arch pen4 -FULLBUILD := -d -g -e --noconfirm +FULLBUILD := -d -g -e -r 5 --noconfirm DEBUG_OPTION := --debug --log DEBUG := false FULL_x86_64 := xfce cinnamon i3 plasma gnome From e9d1d87333942570746fa29df2841da007a68c85 Mon Sep 17 00:00:00 2001 From: watasuke102 Date: Wed, 8 Dec 2021 20:20:02 +0900 Subject: [PATCH 02/10] [update] : Rofi setting for new version --- channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi b/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi index 60413777e..79ba0ab88 100644 --- a/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi +++ b/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi @@ -15,6 +15,6 @@ configuration { font : "hack 10"; show-icons : true; icon-theme : "Inverse-blue"; - theme : "~/.config/rofi/alter-dark.rasi"; kb-cancel : "Escape"; } +@theme "~/.config/rofi/alter-dark.rasi"; From d712f0b3bbad8f2df964771111a5af19bc928306 Mon Sep 17 00:00:00 2001 From: watasuke102 Date: Wed, 8 Dec 2021 20:49:36 +0900 Subject: [PATCH 03/10] [fix] : rename old name of compositor command to new --- channels/i3/airootfs.any/etc/skel/.config/i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/i3/airootfs.any/etc/skel/.config/i3/config b/channels/i3/airootfs.any/etc/skel/.config/i3/config index eaa436584..76e63f40c 100644 --- a/channels/i3/airootfs.any/etc/skel/.config/i3/config +++ b/channels/i3/airootfs.any/etc/skel/.config/i3/config @@ -35,7 +35,7 @@ exec_always --no-startup-id light-locker exec --no-startup-id xfce4-clipman exec --no-startup-id dex -ae i3 exec --no-startup-id nm-applet -exec --no-startup-id compton +exec --no-startup-id picom exec --no-startup-id conky exec --no-startup-id fcitx From 0cba2895c6a1cd33c5fa1dce2c799ae102a01fae Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 17 Dec 2021 21:42:31 +0900 Subject: [PATCH 04/10] [fix] : Fixed SC2086 --- channels/i3/airootfs.any/root/customize_airootfs_i3.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh index caefc4b6e..72f66d64f 100755 --- a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh +++ b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh @@ -28,12 +28,12 @@ remove "/home/${username}/.config/conky/conky-jp.conf" # Change browser that open help file if [[ "${arch}" = "i686" ]]; then - sed -i -e s/chromium/firefox/g /etc/skel/.config/i3/config - sed -i -e s/chromium/firefox/g /home/${username}/.config/i3/config + sed -i -e s/chromium/firefox/g "/etc/skel/.config/i3/config" + sed -i -e s/chromium/firefox/g "/home/${username}/.config/i3/config" fi # disable light-locker on live -sed -i "/light/s/^/# /g" /home/${username}/.config/i3/config +sed -i "/light/s/^/# /g" "/home/${username}/.config/i3/config" # disable auto screen lock rm /etc/xdg/autostart/light-locker.desktop From fc77cf1ca05eab5456f98db53fd778de79562ac5 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 17 Dec 2021 21:47:12 +0900 Subject: [PATCH 05/10] [fix] : Fixed script permission for i3wm environment --- channels/i3/airootfs.any/root/customize_airootfs_i3.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh index 72f66d64f..5ae915953 100755 --- a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh +++ b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh @@ -32,6 +32,16 @@ if [[ "${arch}" = "i686" ]]; then sed -i -e s/chromium/firefox/g "/home/${username}/.config/i3/config" fi +# Set permission for script +for _dir in "/etc/skel/" "/home/${username}/"; do + for _script in ".config/"{"polybar/launch.sh","rofi/power.sh"}; do + [[ -e "${_dir}/${_script}" ]] && { + echo "Change permission of ${_dir}/${_script} to 755" + chmod 755 "${_dir}/${_script}" + } + done +done + # disable light-locker on live sed -i "/light/s/^/# /g" "/home/${username}/.config/i3/config" From 9f8a640310480fa9b545ead11008054f41fedfb3 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 9 Jan 2022 18:46:05 +0900 Subject: [PATCH 06/10] [fix] : Ignore DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 60714e261..70593f498 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ out /pacman-*.conf /.config menuconfig-script/channels_menuconfig-* +.DS_Store From 6a5bad61c99e9f17ac16013b353efce6555da4a1 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 16 Jan 2022 17:34:30 +0900 Subject: [PATCH 07/10] [disable] : Disabled adduser-deb adduser-deb has been removed. --- modules/share/packages_aur.i686/alter.i686 | 2 +- modules/share/packages_aur.x86_64/alter.x86_64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/share/packages_aur.i686/alter.i686 b/modules/share/packages_aur.i686/alter.i686 index 6c5816598..5e1218e2a 100644 --- a/modules/share/packages_aur.i686/alter.i686 +++ b/modules/share/packages_aur.i686/alter.i686 @@ -1 +1 @@ -adduser-deb +#adduser-deb diff --git a/modules/share/packages_aur.x86_64/alter.x86_64 b/modules/share/packages_aur.x86_64/alter.x86_64 index 6c5816598..5e1218e2a 100644 --- a/modules/share/packages_aur.x86_64/alter.x86_64 +++ b/modules/share/packages_aur.x86_64/alter.x86_64 @@ -1 +1 @@ -adduser-deb +#adduser-deb From b497331e41bd99f852b38c9b527f3e95efef7ec4 Mon Sep 17 00:00:00 2001 From: Watasuke Date: Thu, 20 Jan 2022 15:38:21 +0900 Subject: [PATCH 08/10] [fix] : rofi config file isn't correct --- channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi b/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi index 79ba0ab88..0b415f20d 100644 --- a/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi +++ b/channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi @@ -17,4 +17,4 @@ configuration { icon-theme : "Inverse-blue"; kb-cancel : "Escape"; } -@theme "~/.config/rofi/alter-dark.rasi"; +@theme "~/.config/rofi/alter-dark.rasi" From f1446651bd7f858013e48b078ffc39e54be16bf6 Mon Sep 17 00:00:00 2001 From: watasuke102 Date: Thu, 20 Jan 2022 20:04:17 +0900 Subject: [PATCH 09/10] [update] : add wallpaper package to i3wm channel --- channels/i3/packages_aur.i686/wallpapers.x86_64 | 12 ++++++++++++ channels/i3/packages_aur.x86_64/wallpapers.x86_64 | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 channels/i3/packages_aur.i686/wallpapers.x86_64 create mode 100644 channels/i3/packages_aur.x86_64/wallpapers.x86_64 diff --git a/channels/i3/packages_aur.i686/wallpapers.x86_64 b/channels/i3/packages_aur.i686/wallpapers.x86_64 new file mode 100644 index 000000000..2cc970e1d --- /dev/null +++ b/channels/i3/packages_aur.i686/wallpapers.x86_64 @@ -0,0 +1,12 @@ +# +# Alter Linux i3wm edition package list +# +# Watasuke +# Twitter: @Watasuke102 +# Email : Watasuke102@gmail.com +# +# (c) 2019-2021 Fascode Network. +# +# wallpaper + +alterlinux-wallpapers diff --git a/channels/i3/packages_aur.x86_64/wallpapers.x86_64 b/channels/i3/packages_aur.x86_64/wallpapers.x86_64 new file mode 100644 index 000000000..2cc970e1d --- /dev/null +++ b/channels/i3/packages_aur.x86_64/wallpapers.x86_64 @@ -0,0 +1,12 @@ +# +# Alter Linux i3wm edition package list +# +# Watasuke +# Twitter: @Watasuke102 +# Email : Watasuke102@gmail.com +# +# (c) 2019-2021 Fascode Network. +# +# wallpaper + +alterlinux-wallpapers From a70ea2d768b7f3ae0ba2f238fe56d5a70ed5b691 Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 28 Jan 2022 18:34:30 +0900 Subject: [PATCH 10/10] [disable] : pipewire-jack-dropin --- modules/pipewire/packages_aur.i686/pipewire.i686 | 2 +- modules/pipewire/packages_aur.pen4/pipewire.pen4 | 2 +- modules/pipewire/packages_aur.x86_64/pipewire.x86_64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/pipewire/packages_aur.i686/pipewire.i686 b/modules/pipewire/packages_aur.i686/pipewire.i686 index 1f4745423..a2a10acd0 100644 --- a/modules/pipewire/packages_aur.i686/pipewire.i686 +++ b/modules/pipewire/packages_aur.i686/pipewire.i686 @@ -8,5 +8,5 @@ # (c) 2019-2021 Fascode Network. # -pipewire-jack-dropin +#pipewire-jack-dropin pipewire-enable-bluez5 diff --git a/modules/pipewire/packages_aur.pen4/pipewire.pen4 b/modules/pipewire/packages_aur.pen4/pipewire.pen4 index 1f4745423..a2a10acd0 100644 --- a/modules/pipewire/packages_aur.pen4/pipewire.pen4 +++ b/modules/pipewire/packages_aur.pen4/pipewire.pen4 @@ -8,5 +8,5 @@ # (c) 2019-2021 Fascode Network. # -pipewire-jack-dropin +#pipewire-jack-dropin pipewire-enable-bluez5 diff --git a/modules/pipewire/packages_aur.x86_64/pipewire.x86_64 b/modules/pipewire/packages_aur.x86_64/pipewire.x86_64 index 1f4745423..a2a10acd0 100644 --- a/modules/pipewire/packages_aur.x86_64/pipewire.x86_64 +++ b/modules/pipewire/packages_aur.x86_64/pipewire.x86_64 @@ -8,5 +8,5 @@ # (c) 2019-2021 Fascode Network. # -pipewire-jack-dropin +#pipewire-jack-dropin pipewire-enable-bluez5