diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3ecb8fc..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "[python]": { - "editor.defaultFormatter": "ms-python.autopep8" - }, - "python.formatting.provider": "none" -} diff --git a/03_boot.sh b/03_boot.sh index 89bdea4..0edb080 100644 --- a/03_boot.sh +++ b/03_boot.sh @@ -2,21 +2,23 @@ #qemu-system-x86_64 -boot d -cdrom ./out/melawy-linux-2023.10.02-x86_64.iso -usb -vga virtio -display spice-app -full-screen -net nic -net user -m 8192 -smbios type=0,uefi=on -smp cpus=4 -enable-kvm -bios /usr/share/ovmf/x64/OVMF.fd +numberofcores=$(grep -c ^processor /proc/cpuinfo) +virt_cpu=$(( $numberofcores/2 )) + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./out/" qemu-system-x86_64 \ -boot order=d,menu=on,reboot-timeout=5000 \ --cdrom ./out/melawy-linux-2023.10.02-x86_64.iso \ +-cdrom ./out/melawy-linux-2023.10.03-x86_64.iso \ -smbios type=0,uefi=on \ --smp cpus=4 \ --m 8192 \ +-smp cpus=$virt_cpu \ +-m "size=3072,slots=0,maxmem=$((3072*1024*1024))" \ -usb \ -k en-us \ -name archiso,process=archiso_0 \ --display sdl,gl=on,show-cursor=on,window-close=on \ +-display spice-app \ -vga virtio \ --full-screen \ --audiodev pa,id=snd0 \ +-audiodev pipewire,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 -netdev user,id=net0,hostfwd=tcp::60022-:22 \ @@ -27,3 +29,8 @@ qemu-system-x86_64 \ -drive "if=pflash,format=raw,unit=1,file=./out/OVMF_VARS.fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ -serial stdio + +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ diff --git a/airootfs/etc/mkinitcpio.conf b/airootfs/etc/mkinitcpio.conf index 8123c43..3059924 100644 --- a/airootfs/etc/mkinitcpio.conf +++ b/airootfs/etc/mkinitcpio.conf @@ -49,7 +49,9 @@ FILES=() # ## NOTE: If you have /usr on a separate partition, you MUST include the # usr, fsck and shutdown hooks. -HOOKS=(base udev modconf kms keymap consolefont memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth) +#HOOKS=(base udev modconf kms keymap consolefont memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth) +HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth) + #HOOKS=(base systemd systemd-tool modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard sd-vconsole plymouth sd-shutdown) diff --git a/airootfs/etc/pacman.conf b/airootfs/etc/pacman.conf index dcdc795..9d085eb 100644 --- a/airootfs/etc/pacman.conf +++ b/airootfs/etc/pacman.conf @@ -122,6 +122,22 @@ Include = /etc/pacman.d/chaotic-mirrorlist [chaotic-aur] Include = /etc/pacman.d/chaotic-mirrorlist +[xhbp] +SigLevel = Optional TrustAll +Server = https://repos.xerolinux.xyz/$repo/$arch + +[xiso] +SigLevel = Optional TrustAll +Server = https://repos.xerolinux.xyz/$repo/$arch + +[xerolinux_repo] +SigLevel = Optional TrustAll +Server = https://xerolinux.github.io/$repo/$arch + +[xerolinux_repo_xl] +SigLevel = Optional TrustAll +Server = https://repos.xerolinux.xyz/$repo/$arch + [melawy] SigLevel = Required DatabaseOptional Include = /etc/pacman.d/melawy-linux-mirrorlist diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh index 7de3975..b45c8f2 100755 --- a/airootfs/root/customize_airootfs.sh +++ b/airootfs/root/customize_airootfs.sh @@ -2,18 +2,21 @@ locale-gen -usermod -p "123" -s /bin/bash root +usermod -p '$y$j9T$DCmooGCtnp3i6gg0IuIhG/$n9NDMoszCJzqEPuJvZppPqjDMttYJlNZVDpxQikzHH1' -s /bin/bash root cp -aT /etc/skel/ /root/ -usermod -p "123" liveuser +usermod -p '$y$j9T$TNQr0I6vYHoPyYW..UMVS.$REa5y1aHgxjCdYbEeGviSn2oxSSD6AuoyP1ktQptkL6' liveuser +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 -G $i liveuser + usermod -a -G $i liveuser done +#usermod -a -G adm,audio,autologin,floppy,log,network,nopasswdlogin,optical,power,rfkill,scanner,storage,sys,tty,users,uucp,video,wheel liveuser + chown -R 1000:1000 /home/liveuser findstr=$(grep -e 'kdesu' /usr/bin/eos-install-mode-run-calamares) @@ -54,7 +57,7 @@ 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/" -cd "/root" +# cd "/root" tar -xJvf /root/archives/skel.tar.xz -C /etc/skel --strip=1 --overwrite chown -R 0:0 /etc/skel diff --git a/packages.x86_64 b/packages.x86_64 index 82877b0..51af0ef 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -143,7 +143,7 @@ xdg-utils xz ## Network -bind +dnsutils dhclient dnsmasq ethtool @@ -277,8 +277,15 @@ os-prober # VM SUPPORT +bridge-utils + ## Qemu +libguestfs +libvirt +qemu-desktop qemu-guest-agent +virt-manager +virt-viewer ## Spice spice-vdagent @@ -295,191 +302,12 @@ xf86-video-qxl # eos-arm needed packages for chroot into arm device qemu-arm-aarch64-static-bin -pacman-mirrorlist -archlinux-appstream-data -arcolinux-keyring -arcolinux-mirrorlist-git -chaotic-keyring -chaotic-mirrorlist -cachyos-keyring -cachyos-mirrorlist -cachyos-v3-mirrorlist -cachyos-rate-mirrors -melawy-linux-keyring -melawy-linux-mirrorlist -linux-xanmod-anbox -linux-atm -linux-xanmod-anbox-headers -procps-ng -syslog-ng -neovim -neovim-lsp_signature -neovim-lspconfig -neovim-nvim-treesitter -neovim-qt - -ripgrep - -alacritty -avahi -boost-libs -cronie -fmt -imwheel -intltool -kio -chwd -chwd-db -polkit -polkit-kde-agent -polkit-qt5 -profile-sync-daemon -python -python-defusedxml -qt5-xmlpatterns -realtime-privileges -smbclient -solid -traceroute -yad - -fatresize -gvfs -gvfs-afc -gvfs-gphoto2 -gvfs-mtp -gvfs-nfs -gvfs-smb - -udftools - -zfs-utils -zfs-dkms - -## BTRFS -btrfs-assistant -btrfs-snapshots -timeshift -timeshift-autosnap - -xorg-apps -nvidia-settings - -xf86-input-elographics -xf86-input-evdev -xf86-input-synaptics -xf86-input-void - -xf86-video-fbdev -xf86-video-openchrome - -xorg-xrdb -xorg-xhost - -pipewire - -curl - -xdg-desktop-portal -xdg-desktop-portal-kde -xdg-user-dirs-gtk - -dhcpcd -#openresolv -systemd-resolvconf -openssh -wireguard-tools -wireless_tools -wvdial -mobile-broadband-provider-info -bluez-tools - -refind - -ddrescue -gparted -partclone -parted -partimage -squashfs-tools +## HyperV +hyperv -## Display manager -accountsservice -sddm -breeze -breeze-icons -discord -drkonqi -ksystemlog -flatpak -flatpak-kcm -kdeplasma-addons -ksshaskpass -gnome-keyring -kwrited -libwnck3 -lightly-boehs-git -network-manager-applet - -plasma-framework -plasma-integration -plasma-workspace -plasma-browser-integration -plasma-firewall -plasma-thunderbolt -plasma-vault -plasma-workspace-wallpapers - -plymouth -plymouth-kcm - -libreoffice-fresh -libreoffice-fresh-ru -libreoffice-fresh-en-gb - -onlyoffice-bin - -thunderbird -mailspring - -## Picture Editor -gimp -inkscape -krita - -## Video player -vlc-luajit -mpv -elisa -audacious -audacity - -firefox -firefox-i18n-ru -firefox-developer-edition -firefox-developer-edition-i18n-ru - -google-chrome -brave-bin - -neofetch -lolcat -fastfetch - -skypeforlinux-stable-bin -telegram-desktop -yakuake -zoom - -anydesk-bin -yandex-disk -yandex-disk-indicator -keepassxc -visual-studio-code-bin -codelldb - +## Fonts adobe-source-code-pro-fonts ttf-sourcecodepro-nerd ttf-jetbrains-mono @@ -509,53 +337,289 @@ ttf-nerd-fonts-symbols ttf-nerd-fonts-symbols-common ttf-nerd-fonts-symbols-mono -bash-language-server -find-the-command-git -lynx -make -mc -nmap -pamac-cli -pamac-gtk + +## Spell +aspell +aspell-en +aspell-ru +hunspell +hunspell-en_us +hunspell-ru + + +## Support +samba-support +pipewire-support +bluetooth-support +input-devices-support +printer-support +scanner-support +laptop-detect +chwd +chwd-db + + +### Printers & Scanner support +print-manager +system-config-printer +gutenprint +cups +cups-filters +cups-pdf +foomatic-db +foomatic-db-engine +foomatic-db-gutenprint-ppds +foomatic-db-nonfree +foomatic-db-nonfree-ppds +foomatic-db-ppds +hplip +hplip-plugin +ghostscript +gsfonts +xsane +splix + + +## Pacman +pace +arcolinux-keyring +arcolinux-mirrorlist-git +chaotic-keyring +chaotic-mirrorlist +cachyos-keyring +cachyos-mirrorlist +cachyos-v3-mirrorlist +cachyos-v4-mirrorlist +cachyos-rate-mirrors +melawy-linux-keyring +melawy-linux-mirrorlist + +#pamac-cli +#pamac-gtk +arcolinux-pamac-all paru + +flatpak +flatpak-kcm +snapd +snapd-glib +appimagelauncher +ocs-url + +gvfs +gvfs-afc +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb + + +## Core +linux-xanmod-anbox +linux-xanmod-anbox-headers +zfs-utils +zfs-dkms +v4l2loopback-dkms +procps-ng +syslog-ng + + +## Console +find-the-command + +mc +beep powerline +powerline-common powerline-fonts screen tcpdump +nmap terminus-font ttf-terminus-nerd tmux xterm -zsh -## HyperV -hyperv - -brltty -cloud-init -darkhttpd -espeakup fsarchiver -gnu-netcat -grml-zsh-config -irssi -iw -lftp -libfido2 -libusb-compat -libxinerama -livecd-sounds -nvme-cli -open-iscsi -packagekit-qt5 -pcsclite -pulseaudio-qt -sdparm -testdisk +openbsd-netcat + tpm2-tss -usbmuxd -dex +tpm2-tools + +neovim +neovim-lsp_signature +neovim-lspconfig +neovim-nvim-treesitter +neovim-qt + +ripgrep + +neofetch +lolcat +fastfetch + + +## BTRFS +btrfs-assistant +btrfs-snapshots +timeshift +timeshift-autosnap + + +## Network +dhcpcd +#openresolv +systemd-resolvconf +openssh +wireguard-tools +wireless_tools +traceroute + + +## Disk +refind + +ddrescue +gparted +partclone +parted +partimage + + +## Display manager +sddm +plasma-framework +plasma-integration +plasma-workspace +plasma-browser-integration +plasma-firewall +plasma-thunderbolt +plasma-vault +plasma-workspace-wallpapers + +kdeplasma-addons +lightly-boehs-git + +xdg-desktop-portal +xdg-desktop-portal-kde +xdg-user-dirs-gtk + +drkonqi +ksystemlog +ksshaskpass +gnome-keyring +libwnck3 +network-manager-applet + +plymouth +plymouth-kcm + +nvidia-settings + +## X server +xf86-input-elographics +xf86-input-evdev +xf86-input-synaptics +xf86-input-void + +xf86-video-fbdev +xf86-video-openchrome + +xorg-xrdb +xorg-xhost + + +## Office +libreoffice-fresh +libreoffice-fresh-ru +libreoffice-fresh-en-gb +libreoffice-extension-languagetool + +onlyoffice-bin + +thunderbird +mailspring + + +## Desktop +discord +telegram-desktop +zoom +skypeforlinux-stable-bin + +qbittorrent + +blender + +obs-studio-tytan652 + +anydesk-bin + +yandex-disk +yandex-disk-indicator + +keepassxc +kleopatra + +alacritty +yakuake +corectrl +gwe + + +## Picture Editor +gimp +gimp-help-ru +inkscape +krita + + +## Video player +vlc-luajit +mpv +elisa +audacious +audacity + + +## Browser +firefox +firefox-i18n-ru +firefox-developer-edition +firefox-developer-edition-i18n-ru + +google-chrome +brave-bin + +profile-sync-daemon + + +## Code +codelldb +gdb +git-lfs +github-cli +github-desktop +icu69-bin +jdk-openjdk +jre-openjdk +lldb +make +rust-analyzer +rustup +sccache +visual-studio-code-bin +vscode-json-languageserver + +bash-language-server +eslint-language-server +python-lsp-server +tailwindcss-language-server +typescript +typescript-language-server +vue-language-server +yaml-language-server ## Melawy REPO