teldra
/
vinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress

This commit is contained in:
teldra 2022-02-09 01:24:54 +01:00
parent 2f4cefdeb5
commit 18c19467f9
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/profile/plasma
View File

@ -25,7 +25,7 @@ packages() {
config() {
enable_service dbus sddm
if ! [ "$LANGUAGE" == "en" ]; then
if ! [ "${KEY_LANG}" == "en" ]; then
echo "export LANG=${L1}.UTF-8" > /etc/sv/sddm/conf
fi
}
}

26
etc/xserver/x11
View File

@ -15,25 +15,25 @@ packages() {
addpkg ${email} ${terminal} ${imageviewer} ${pdf} ${filemanager} ${archiver} ${screenshot} ${calc} ${pinentry} ${keyring} ${gpg} ${policykit} ${sshaskpass} ${partmanager} ${dm} ${de} ${misc}
ignorepkg font-adobe-75dpi font-adobe-100dpi
}
config() {
enable_service dbus alsa
disable_service acpid
disable_service acpid
ln -s /usr/share/fontconfig/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d/
if [ "$LANGUAGE" == "de" ]; then
mkdir -p /etc/X11/xorg.conf.d
{ echo "Section \"InputClass\"";
echo " Identifier \"keyboard\"";
echo " MatchIsKeyboard \"yes\"";
echo " Option \"XkbLayout\" \"de\"";
echo " Option \"XkbVariant\" \"nodeadkeys\"";
echo " #Option \"XkbOptions\" \"grp:alt_shift_toggle\"";
echo "EndSection"; } > /etc/X11/xorg.conf.d/10-keyboard.conf
fi
ln -s /usr/bin/yt-dlp /usr/local/bin/youtube-dl
if [ "${KEY_LANG}" == "de" ]; then
mkdir -p /etc/X11/xorg.conf.d
{ echo "Section \"InputClass\"";
echo " Identifier \"keyboard\"";
echo " MatchIsKeyboard \"yes\"";
echo " Option \"XkbLayout\" \"de\"";
echo " Option \"XkbVariant\" \"nodeadkeys\"";
echo " #Option \"XkbOptions\" \"grp:alt_shift_toggle\"";
echo "EndSection"; } > /etc/X11/xorg.conf.d/10-keyboard.conf
fi
ln -s /usr/bin/yt-dlp /usr/local/bin/youtube-dl
}

14
main.sh
View File

@ -216,17 +216,26 @@ profile() {
}
lang() {
header "Sprache"
header "Language"
multiplechoice "de" "en"
LANGUAGE="${output}"
L1="en_US"
L2="en"
if [ "${LANGUAGE}" == "de" ]; then
L1="de_DE"
fi
}
lang_key() {
header "Keyboard layout"
multiplechoice de en
L2="en"
KEY_LANG="${output}"
if [ "${KEY_LANG}" == "de" ]; then
L2="de-latin1-nodeadkeys"
fi
}
do_install() {
header "Installation"
mkdir -p "${target}/var/db/xbps/keys"
@ -271,6 +280,7 @@ do_chroot() {
echo "TIMEZONE=${TIMEZONE}" >> "${vars}"
echo "ENC=${ENC}" >> "${vars}"
echo "HIBERNATE=${HIBERNATE}" >> "${vars}"
echo "KEY_LANG=${KEY_LANG}" >> "${vars}"
cat <<EOF > "${target}/tmp/vinstaller/main_chroot"
#!/usr/bin/bash