Skip to content

Commit 967ac61

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents aea1765 + a70ea2d commit 967ac61

File tree

12 files changed

+46
-11
lines changed

12 files changed

+46
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ out
2828
/pacman-*.conf
2929
/.config
3030
menuconfig-script/channels_menuconfig-*
31+
.DS_Store

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter"
66
ARCH_x86_64 := --arch x86_64
77
ARCH_i686 := --arch i686
88
ARCH_Pen4 := --arch pen4
9-
FULLBUILD := -d -g -e --noconfirm
9+
FULLBUILD := -d -g -e -r 5 --noconfirm
1010
DEBUG_OPTION := --debug --log
1111
DEBUG := false
1212
FULL_x86_64 := xfce cinnamon i3 plasma gnome

channels/i3/airootfs.any/etc/skel/.config/i3/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ exec_always --no-startup-id light-locker
3535
exec --no-startup-id xfce4-clipman
3636
exec --no-startup-id dex -ae i3
3737
exec --no-startup-id nm-applet
38-
exec --no-startup-id compton
38+
exec --no-startup-id picom
3939
exec --no-startup-id conky
4040
exec --no-startup-id fcitx
4141

channels/i3/airootfs.any/etc/skel/.config/rofi/config.rasi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ configuration {
1515
font : "hack 10";
1616
show-icons : true;
1717
icon-theme : "Inverse-blue";
18-
theme : "~/.config/rofi/alter-dark.rasi";
1918
kb-cancel : "Escape";
2019
}
20+
@theme "~/.config/rofi/alter-dark.rasi"

channels/i3/airootfs.any/root/customize_airootfs_i3.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,22 @@ remove "/home/${username}/.config/conky/conky-jp.conf"
2828

2929
# Change browser that open help file
3030
if [[ "${arch}" = "i686" ]]; then
31-
sed -i -e s/chromium/firefox/g /etc/skel/.config/i3/config
32-
sed -i -e s/chromium/firefox/g /home/${username}/.config/i3/config
31+
sed -i -e s/chromium/firefox/g "/etc/skel/.config/i3/config"
32+
sed -i -e s/chromium/firefox/g "/home/${username}/.config/i3/config"
3333
fi
3434

35+
# Set permission for script
36+
for _dir in "/etc/skel/" "/home/${username}/"; do
37+
for _script in ".config/"{"polybar/launch.sh","rofi/power.sh"}; do
38+
[[ -e "${_dir}/${_script}" ]] && {
39+
echo "Change permission of ${_dir}/${_script} to 755"
40+
chmod 755 "${_dir}/${_script}"
41+
}
42+
done
43+
done
44+
3545
# disable light-locker on live
36-
sed -i "/light/s/^/# /g" /home/${username}/.config/i3/config
46+
sed -i "/light/s/^/# /g" "/home/${username}/.config/i3/config"
3747

3848
# disable auto screen lock
3949
rm /etc/xdg/autostart/light-locker.desktop
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# Alter Linux i3wm edition package list
3+
#
4+
# Watasuke
5+
# Twitter: @Watasuke102
6+
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# wallpaper
11+
12+
alterlinux-wallpapers
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# Alter Linux i3wm edition package list
3+
#
4+
# Watasuke
5+
# Twitter: @Watasuke102
6+
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# wallpaper
11+
12+
alterlinux-wallpapers

modules/pipewire/packages_aur.i686/pipewire.i686

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
# (c) 2019-2021 Fascode Network.
99
#
1010

11-
pipewire-jack-dropin
11+
#pipewire-jack-dropin
1212
pipewire-enable-bluez5

modules/pipewire/packages_aur.pen4/pipewire.pen4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
# (c) 2019-2021 Fascode Network.
99
#
1010

11-
pipewire-jack-dropin
11+
#pipewire-jack-dropin
1212
pipewire-enable-bluez5

modules/pipewire/packages_aur.x86_64/pipewire.x86_64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
# (c) 2019-2021 Fascode Network.
99
#
1010

11-
pipewire-jack-dropin
11+
#pipewire-jack-dropin
1212
pipewire-enable-bluez5

0 commit comments

Comments
 (0)