diff --git a/01_prepare.sh b/01_prepare.sh index 1e7b1c6..6321e9e 100755 --- a/01_prepare.sh +++ b/01_prepare.sh @@ -2,6 +2,8 @@ cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/" +sudo pacman -Sy + sudo pacman -Sw --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168 sudo pacman -Sw --noconfirm --cachedir "./airootfs/usr/share/packages" dracut \ diff --git a/airootfs/etc/sddm.conf b/airootfs/etc/sddm.conf index bb6424f..e69de29 100644 --- a/airootfs/etc/sddm.conf +++ b/airootfs/etc/sddm.conf @@ -1,38 +0,0 @@ -[General] -InputMethod= -Namespaces= -Numlock=on - -[Theme] -DisableAvatarsThreshold=7 -EnableAvatars=true -FacesDir=/usr/share/sddm/faces -ThemeDir=/usr/share/sddm/themes - -[Users] -DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin -HideShells= -HideUsers= -RememberLastSession=true -RememberLastUser=true -ReuseSession=true - -[Wayland] -EnableHiDPI=true -SessionCommand=/usr/share/sddm/scripts/wayland-session -SessionDir=/usr/share/wayland-sessions -SessionLogFile=.local/share/sddm/wayland-session.log - -[X11] -DisplayCommand=/usr/share/sddm/scripts/Xsetup -DisplayStopCommand=/usr/share/sddm/scripts/Xstop -EnableHiDPI=true -MinimumVT=1 -ServerArguments=-nolisten tcp -ServerPath=/usr/bin/X -SessionCommand=/usr/share/sddm/scripts/Xsession -SessionDir=/usr/share/xsessions -SessionLogFile=.local/share/sddm/xorg-session.log -UserAuthFile=.Xauthority -XauthPath=/usr/bin/xauth -XephyrPath=/usr/bin/Xephyr diff --git a/airootfs/etc/sddm.conf.d/autologin.conf b/airootfs/etc/sddm.conf.d/autologin.conf deleted file mode 100644 index 6dfe5b9..0000000 --- a/airootfs/etc/sddm.conf.d/autologin.conf +++ /dev/null @@ -1,9 +0,0 @@ -#[Autologin] -#Relogin=false -#User=liveuser -#Session=plasma - -[Autologin] -Relogin=false -Session= -User= diff --git a/airootfs/etc/sddm.conf.d/kde_settings.conf b/airootfs/etc/sddm.conf.d/kde_settings.conf index ea3c1f8..6dd91ba 100644 --- a/airootfs/etc/sddm.conf.d/kde_settings.conf +++ b/airootfs/etc/sddm.conf.d/kde_settings.conf @@ -1,7 +1,12 @@ +[Autologin] +Relogin=false +Session= +User= + [General] HaltCommand=/usr/bin/systemctl poweroff -Numlock=on RebootCommand=/usr/bin/systemctl reboot +Numlock=on [Theme] Current=Melawy-Nier-A2 diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh index b9726af..0d4adb7 100755 --- a/airootfs/root/customize_airootfs.sh +++ b/airootfs/root/customize_airootfs.sh @@ -11,7 +11,6 @@ usermod -g 'users' liveuser groups="adm audio autologin floppy log network nopasswdlogin optical power rfkill scanner storage sys tty users uucp video wheel" for i in $groups do - #usermod -m -d /home/liveuser -p "123" -g 'users' -G $i -s /bin/bash liveuser usermod -a -G $i liveuser done @@ -39,36 +38,7 @@ sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf echo -e "[Daemon]\nTheme=melawy-lera-sugar\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "/usr/share/plymouth/plymouthd.defaults" -# cat "/usr/lib/melawy-linux-release" >> "/etc/motd" -# echo "------------------" >> "/etc/motd" - -# Melawy -mkdir -p "/etc/calamares/files/" -cp "/root/wallpaper.png" "/etc/calamares/files/melawy-linux-wallpaper.png" -chmod 644 "/etc/calamares/files/"*".png" -chmod 644 "/usr/share/wallpapers/melawy-linux/"*".png" - -cp "/root/wallpaper.png" "/etc/calamares/files/wallpaper.png" -chmod 644 "/etc/calamares/files/"*".png" - mv "/usr/lib/modprobe.d/nvidia-utils.conf" "/etc/calamares/files/nv-modprobe" mv "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/files/nv-modules-load" - -# systemctl enable sddm.service -# systemctl enable ntpd.service -# systemctl enable NetworkManager.service systemd-timesyncd.service bluetooth.service firewalld.service -# systemctl enable vboxservice.service vmtoolsd.service vmware-vmblock-fuse.service -# systemctl enable intel.service -# systemctl enable pacman-init.service choose-mirror.service -# #systemctl set-default multi-user.target -# systemctl set-default graphical.target - -# pacman -Qs | grep "/calamares " | cut -c7- > iso_package_versions -# pacman -Qs | grep "/firefox " | cut -c7- >> iso_package_versions -# pacman -Qs | grep "/linux-xanmod-anbox " | cut -c7- >> iso_package_versions -# pacman -Qs | grep "/mesa " | cut -c7- >> iso_package_versions -# pacman -Qs | grep "/xorg-server " | cut -c7- >> iso_package_versions -# pacman -Qs | grep "/nvidia-dkms " | cut -c7- >> iso_package_versions -# mv "iso_package_versions" "/home/liveuser/" exit 0 diff --git a/airootfs/root/livewall.png b/airootfs/root/livewall.png deleted file mode 100644 index 6ed5499..0000000 Binary files a/airootfs/root/livewall.png and /dev/null differ diff --git a/airootfs/root/wallpaper.png b/airootfs/root/wallpaper.png deleted file mode 100644 index 6ed5499..0000000 Binary files a/airootfs/root/wallpaper.png and /dev/null differ