Commit 449af5b2 authored by BrLi's avatar BrLi

squash the commits and strip the failure

parent 622d374d
Pipeline #1369 skipped with stages
......@@ -3,7 +3,8 @@ Use this script inside a buildsystem to avoid conflics with your current system
Dependencies:
- python3
- libisoburn
- prebootloader
- efitools
- syslinux
# gitlab-runner
## Installation
......
nvidia-utils
nvidia
nvidia-390xx-utils
nvidia-390xx
nvidia-340xx-utils
nvidia-340xx
nvidia-304xx-utils
nvidia-304xx
virtualbox-guest-dkms
virtualbox-guest-utils
......@@ -115,9 +115,7 @@ xorg-xrdb
xorg-xauth
xorg-xinit
xorg-apps
xorg-fonts-alias
xorg-fonts-encodings
xorg-fonts-misc
xorg-xrandr
# xorg video drivers
xf86-video-amdgpu
......@@ -129,26 +127,19 @@ xf86-video-vmware
xf86-video-voodoo
# xorg input drivers
xorg-input-drivers
xf86-input-synaptics
xf86-input-libinput
xf86-input-wacom
###########################
# FONTS #
###########################
xorg-fonts-75dpi
xorg-fonts-100dpi
xorg-fonts-cyrillic
terminus-font
ttf-dejavu
ttf-liberation
ttf-indic-fonts
ttf-lklug
ttf-opensans
ttf-raleway
ttf-noto
ttf-noto-cjk
ttf-noto-emoji
ttf-hack
# additional stuff that needs xorg
hicolor-icon-theme
......@@ -350,6 +341,13 @@ kde-telepathy
fcitx-qt5
kcm-fcitx
# fcitx input methods
fcitx-chewing
fcitx-table-extra
fcitx-libpinyin
fcitx-kkc
# old QsystemTryIcon (like Skype) integration
sni-qt
......
[ClassicUI]
# Status Panel Position X
#MainWindowOffsetX=500
# Status Panel Position Y
#MainWindowOffsetY=40
# Font Size
#FontSize=0
# Font
#Font=Sans
# Menu Font
#MenuFont=Sans
# Font Locale to display
#FontLocale=zh_CN.UTF-8
# Use System Tray Icon
# Available Value:
# True False
UseTray=False
# Status Panel Hide Mode
# Available Value:
# Show Auto Hide
#MainWindowHideMode=Auto
# Vertical Candidate Word List
# Available Value:
# True False
#VerticalList=False
# Skin Name
SkinType=dark
......@@ -20,7 +20,7 @@ immutability=1
plugin=org.kde.plasma.kickoff
[Containments][2][Applets][3][Configuration][General]
favorites=qupzilla.desktop,calamares.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.konsole.desktop,org.kde.kate.desktop,octopi.desktop
favorites=falkon.desktop,calamares.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.konsole.desktop,org.kde.kate.desktop,octopi.desktop
[Containments][2][Applets][3][Configuration][Shortcuts]
global=Alt+F1
......@@ -38,9 +38,13 @@ plugin=org.kde.plasma.icontasks
[Containments][2][Applets][6]
immutability=1
plugin=org.kde.plasma.kimpanel
[Containments][2][Applets][7]
immutability=1
plugin=org.kde.plasma.systemtray
[Containments][2][Applets][6][Configuration]
[Containments][2][Applets][7][Configuration]
SystrayContainmentId=7
[Containments][2][Applets][8]
......@@ -48,7 +52,7 @@ immutability=1
plugin=org.kde.plasma.digitalclock
[Containments][2][General]
AppletOrder=3;4;5;6;8
AppletOrder=3;4;5;6;7;8
[Containments][26]
activityId=706396f9-002c-411d-89e1-471225615358
......
......@@ -82,7 +82,7 @@ class IsoBuilder:
os.makedirs(package_dir, exist_ok=True)
pacman_config = pjoin(self.configdir, "pacman.conf")
command = "pacman -Sw --noconfirm --cachedir {} --config {} {}"
command = "pacman -Sywdd --noconfirm --cachedir {} --config {} {}"
# pacman -Sw doesn't check dependencies with installed system, but it will fetch required packages altogether
with open(os.path.join(self.configdir, "overlay-packages.conf")) as packages:
for line in packages:
......@@ -97,8 +97,8 @@ class IsoBuilder:
).split())
def prepare_efi_img(self):
prebootloader_path = "/usr/lib/prebootloader"
assert os.path.isdir(prebootloader_path), "preloader must be installed"
prebootloader_path = "/usr/lib/efitools/efi"
assert os.path.isdir(prebootloader_path), "efitools must be installed"
systemd_path = "/usr/lib/systemd/boot/efi"
assert os.path.isdir(systemd_path), "systemd >=220 must be installed"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment