Merge branch 'dev' into dev-stable

FascodeNet · Feb 6, 2022 · 967ac61 · 967ac61
2 parents aea1765 + a70ea2d
commit 967ac61
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ out
 /pacman-*.conf
 /.config
 menuconfig-script/channels_menuconfig-*
+.DS_Store
diff --git 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

diff --git 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
 

diff --git 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"
diff --git a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh
@@ -28,12 +28,22 @@ 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
 
+# 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
+sed -i "/light/s/^/# /g" "/home/${username}/.config/i3/config"
 
 # disable auto screen lock
 rm /etc/xdg/autostart/light-locker.desktop

diff --git a/channels/i3/packages_aur.i686/wallpapers.x86_64 b/channels/i3/packages_aur.i686/wallpapers.x86_64
@@ -0,0 +1,12 @@
+#
+# Alter Linux i3wm edition package list
+#
+# Watasuke
+# Twitter: @Watasuke102
+# Email  : [email protected]
+#
+# (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
@@ -0,0 +1,12 @@
+#
+# Alter Linux i3wm edition package list
+#
+# Watasuke
+# Twitter: @Watasuke102
+# Email  : [email protected]
+#
+# (c) 2019-2021 Fascode Network.
+#
+# wallpaper
+
+alterlinux-wallpapers
diff --git 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
@@ -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
@@ -8,5 +8,5 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-pipewire-jack-dropin
+#pipewire-jack-dropin
 pipewire-enable-bluez5
diff --git 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
@@ -1 +1 @@
-adduser-deb
+#adduser-deb