diff --git a/Melawy-Linux-Base-System/_base_and_developer_edition.yaml b/Melawy-Linux-Base-System/_base_and_developer_edition.yaml index eaf7c4f..904b001 100644 --- a/Melawy-Linux-Base-System/_base_and_developer_edition.yaml +++ b/Melawy-Linux-Base-System/_base_and_developer_edition.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Base-System/_base_system.yaml b/Melawy-Linux-Base-System/_base_system.yaml index d166d4b..b9c4a56 100644 --- a/Melawy-Linux-Base-System/_base_system.yaml +++ b/Melawy-Linux-Base-System/_base_system.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Base-System/_netinstall_only.yaml b/Melawy-Linux-Base-System/_netinstall_only.yaml index 6c95edd..f4563f3 100644 --- a/Melawy-Linux-Base-System/_netinstall_only.yaml +++ b/Melawy-Linux-Base-System/_netinstall_only.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: false packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Base-System/airootfs/etc/mkinitcpio.d/linux.preset b/Melawy-Linux-Base-System/airootfs/etc/mkinitcpio.d/linux-xanmod.preset similarity index 58% rename from Melawy-Linux-Base-System/airootfs/etc/mkinitcpio.d/linux.preset rename to Melawy-Linux-Base-System/airootfs/etc/mkinitcpio.d/linux-xanmod.preset index 7c25186..3428b60 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/mkinitcpio.d/linux.preset +++ b/Melawy-Linux-Base-System/airootfs/etc/mkinitcpio.d/linux-xanmod.preset @@ -1,6 +1,6 @@ # mkinitcpio preset file for the 'Melawy Linux' package on archiso -KNAME="cachyos" +KNAME="xanmod" KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1) @@ -8,11 +8,11 @@ if [[ -z "$KVER" ]]; then exit fi -cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-cachyos" +cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-xanmod-anbox" PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux-cachyos' +ALL_kver='/boot/vmlinuz-xanmod-anbox' archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' -archiso_image="/boot/initramfs-linux-cachyos.img" +archiso_image="/boot/initramfs-xanmod-anbox.img" diff --git a/Melawy-Linux-Base-System/airootfs/etc/motd b/Melawy-Linux-Base-System/airootfs/etc/motd index 46bf986..e69de29 100755 --- a/Melawy-Linux-Base-System/airootfs/etc/motd +++ b/Melawy-Linux-Base-System/airootfs/etc/motd @@ -1,46 +0,0 @@ -Info: -This ISO is based on Arch-ISO modified hugely to provide Installation Environment for Melawy Linux. -https://melawy.ru - -Melawy Linux-archiso Sources: -https://gitlab.com/melawy - -Arch-ISO Source: -https://gitlab.archlinux.org/archlinux/archiso - -Calamares as our installer: -https://github.com/calamares/calamares - -Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. ------------------- - -News: -https://melawy.ru -https://en.melawy.ru - -https://techhub.social/@Melawy - -https://t.me/Melawy_Linux ------------------- - -Chat: -https://t.me/Melawy_Linux_Chat ------------------- - -Help: -https://melawy.ru -https://github.com/Melawy/Develop/wiki -https://github.com/Melawy/Develop/issues - -Bugs can be reported here: -https://github.com/Melawy/Develop/issues ------------------- - -Our journey wouldn't be made possible without the donates: -https://melawy.ru/donate ------------------- - -Thank you for donating your trust in us! - -Welcome to your Melawy Linux ------------------- diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf index 5dbd9c6..0870091 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf b/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf index e5958e1..305607f 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf +++ b/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman.conf b/Melawy-Linux-Base-System/airootfs/etc/pacman.conf index 9e11ad6..b81119d 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/pacman.conf +++ b/Melawy-Linux-Base-System/airootfs/etc/pacman.conf @@ -105,12 +105,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Base-System/airootfs/etc/pacman.d/mirrorlist index 5c6ea02..47a0917 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-Base-System/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2025-01-25 00:01:01 UTC +# When: 2025-06-18 07:17:28 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2025-01-25 00:00:07 UTC -# Last Check: 2025-01-24 23:44:23 UTC +# Retrieved: 2025-06-18 07:15:41 UTC +# Last Check: 2025-06-18 07:10:04 UTC -Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch +Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = https://singapore.mirror.pkgbuild.com/$repo/os/$arch +Server = https://archlinux.richard-neumann.de/$repo/os/$arch +Server = rsync://rsync.mirrors.niyawe.de/archlinux/$repo/os/$arch Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = http://mirror.moson.org/arch/$repo/os/$arch -Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch -Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch -Server = https://de.arch.niranjan.co/$repo/os/$arch -Server = http://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch -Server = http://de.arch.niranjan.co/$repo/os/$arch -Server = http://archlinux.thaller.ws/$repo/os/$arch -Server = https://archlinux.thaller.ws/$repo/os/$arch Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch -Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch +Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = rsync://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = https://arch.phinau.de/$repo/os/$arch Server = https://de.arch.mirror.kescher.at/$repo/os/$arch Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch -Server = rsync://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch -Server = rsync://mirror.moson.org/arch/$repo/os/$arch +Server = https://berlin.mirror.pkgbuild.com/$repo/os/$arch +Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch +Server = https://taipei.mirror.pkgbuild.com/$repo/os/$arch +Server = http://mirror.twds.com.tw/archlinux/$repo/os/$arch +Server = https://mirror.twds.com.tw/archlinux/$repo/os/$arch +Server = rsync://mirror.twds.com.tw/archlinux/$repo/os/$arch +Server = http://mirror.trap.moe/archlinux/$repo/os/$arch +Server = https://mirror.trap.moe/archlinux/$repo/os/$arch diff --git a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf index ea90615..e654505 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf +++ b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf @@ -1,6 +1,7 @@ [General] -DisplayServer=x11-user +DisplayServer=wayland GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell +#InputMethod= [Wayland] CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1 --inputmethod maliit-keyboard diff --git a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/autologin.conf b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/autologin.conf new file mode 100644 index 0000000..2ace995 --- /dev/null +++ b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/autologin.conf @@ -0,0 +1,4 @@ +[Autologin] +Relogin=false +Session=plasma +User=liveuser diff --git a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/kde_settings.conf b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/kde_settings.conf index ae8c334..94d6c8b 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/kde_settings.conf +++ b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/kde_settings.conf @@ -1,8 +1,3 @@ -[Autologin] -Relogin=false -Session=plasmax11 -User=liveuser - [General] HaltCommand=/usr/bin/systemctl poweroff RebootCommand=/usr/bin/systemctl reboot diff --git a/Melawy-Linux-Base-System/airootfs/etc/tor/torrc b/Melawy-Linux-Base-System/airootfs/etc/tor/torrc index cc5249b..31d42ec 100644 --- a/Melawy-Linux-Base-System/airootfs/etc/tor/torrc +++ b/Melawy-Linux-Base-System/airootfs/etc/tor/torrc @@ -47,7 +47,7 @@ Log notice syslog ## Uncomment this to start the process in the background... or use ## --runasdaemon 1 on the command line. This is ignored on Windows; ## see the FAQ entry if you want Tor to run as an NT service. -#RunAsDaemon 1 +RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. @@ -296,8 +296,15 @@ VirtualAddrNetwork 10.192.0.0/10 AutomapHostsOnResolve 1 TransPort 9040 DNSPort 6669 -ControlPort 9051 +# ControlPort 9051 ExcludeExitNodes {ru},{by},{cn},{??} ExitPolicy reject *:* HardwareAccel 1 NumCPUs 4 + +# Uncomment if your needed +# SocksPort 0.0.0.0:9050 +# SocksPolicy accept 192.168.1.0/24 +# SocksPolicy accept 127.0.0.0/8 +#SOCKSPolicy accept6 FC00::/7 +# SOCKSPolicy reject * diff --git a/Melawy-Linux-Base-System/airootfs/opt/extra-drivers/r8168-dkms-8.055.00-4-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/opt/extra-drivers/r8168-dkms-8.055.00-4-x86_64.pkg.tar.zst new file mode 100644 index 0000000..f94dbf2 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/opt/extra-drivers/r8168-dkms-8.055.00-4-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/root/airootfs.img b/Melawy-Linux-Base-System/airootfs/root/airootfs.img new file mode 100644 index 0000000..b44f2ab Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/root/airootfs.img differ diff --git a/Melawy-Linux-Base-System/airootfs/root/airootfs.tar.zst b/Melawy-Linux-Base-System/airootfs/root/airootfs.tar.zst new file mode 100644 index 0000000..9b6c4e8 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/root/airootfs.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/local/bin/remove-unneeded b/Melawy-Linux-Base-System/airootfs/usr/local/bin/remove-unneeded index 9433bd6..e5c1d6f 100755 --- a/Melawy-Linux-Base-System/airootfs/usr/local/bin/remove-unneeded +++ b/Melawy-Linux-Base-System/airootfs/usr/local/bin/remove-unneeded @@ -17,6 +17,7 @@ _clean_packages() { mkinitcpio-archiso mkinitcpio-busybox mkinitcpio-nfs-utils + mkinitcpio-firmware qemu-arm-aarch64-static-bin syslinux yaml-cpp diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/dracut-107-1-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/dracut-107-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..9d06bba Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/dracut-107-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/grub-dracut-1.2.1-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/grub-dracut-1.2.1-1-any.pkg.tar.xz new file mode 100644 index 0000000..6cc2a20 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/grub-dracut-1.2.1-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/libxvmc-1.0.14-1-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/libxvmc-1.0.14-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..31aa1c2 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/libxvmc-1.0.14-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-api-headers-6.15-1-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-api-headers-6.15-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..15c4da9 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-api-headers-6.15-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-xanmod-anbox-6.14.11-1-x86_64.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-xanmod-anbox-6.14.11-1-x86_64.pkg.tar.xz new file mode 100644 index 0000000..19ddd9c Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-xanmod-anbox-6.14.11-1-x86_64.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-xanmod-anbox-headers-6.14.11-1-x86_64.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-xanmod-anbox-headers-6.14.11-1-x86_64.pkg.tar.xz new file mode 100644 index 0000000..40462ff Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/linux-xanmod-anbox-headers-6.14.11-1-x86_64.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-dracut-initramfs-1.25-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-dracut-initramfs-1.25-1-any.pkg.tar.xz new file mode 100644 index 0000000..2e7196b Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-dracut-initramfs-1.25-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-dracut-ukify-1.29-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-dracut-ukify-1.29-1-any.pkg.tar.xz new file mode 100644 index 0000000..a1ce0bc Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-dracut-ukify-1.29-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-plymouth-theme-nier-a2-1.15-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-plymouth-theme-nier-a2-1.15-1-any.pkg.tar.xz new file mode 100644 index 0000000..d189467 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-plymouth-theme-nier-a2-1.15-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-refind-menu-generator-1.40-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-refind-menu-generator-1.40-1-any.pkg.tar.xz new file mode 100644 index 0000000..b264bdf Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-refind-menu-generator-1.40-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-refind-theme-nier-a2-1.12-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-refind-theme-nier-a2-1.12-1-any.pkg.tar.xz new file mode 100644 index 0000000..53584d7 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/melawy-refind-theme-nier-a2-1.12-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/os-prober-1.83-1-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/os-prober-1.83-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..43eaa04 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/os-prober-1.83-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/refind-0.14.2-1-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/refind-0.14.2-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..3005b61 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/refind-0.14.2-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/systemd-boot-dracut-1.9.1.19-1-any.pkg.tar.xz b/Melawy-Linux-Base-System/airootfs/usr/share/packages/systemd-boot-dracut-1.9.1.19-1-any.pkg.tar.xz new file mode 100644 index 0000000..c36e289 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/systemd-boot-dracut-1.9.1.19-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/update-grub-0.0.1-8-any.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/update-grub-0.0.1-8-any.pkg.tar.zst new file mode 100644 index 0000000..afdcf56 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/update-grub-0.0.1-8-any.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/usr/share/packages/xf86-video-intel-1:2.99.917+939+g4a64400e-1-x86_64.pkg.tar.zst b/Melawy-Linux-Base-System/airootfs/usr/share/packages/xf86-video-intel-1:2.99.917+939+g4a64400e-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..dbb4fe0 Binary files /dev/null and b/Melawy-Linux-Base-System/airootfs/usr/share/packages/xf86-video-intel-1:2.99.917+939+g4a64400e-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Base-System/airootfs/var/lib/sddm/.config/kcminputrc b/Melawy-Linux-Base-System/airootfs/var/lib/sddm/.config/kcminputrc index 03851aa..c57eb1a 100644 --- a/Melawy-Linux-Base-System/airootfs/var/lib/sddm/.config/kcminputrc +++ b/Melawy-Linux-Base-System/airootfs/var/lib/sddm/.config/kcminputrc @@ -6,6 +6,7 @@ NumLock=0 [Mouse] X11LibInputXAccelProfileFlat=true +cursorTheme=Melawy-red-light-default-cursors [Tmp] update_info=delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize diff --git a/Melawy-Linux-Base-System/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-Base-System/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 9ea54d2..c4a76a5 100644 --- a/Melawy-Linux-Base-System/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-Base-System/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Open-Source Drivers) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Base-System/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-Base-System/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 05efd9a..a1581f9 100644 --- a/Melawy-Linux-Base-System/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-Base-System/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Nvidia Drivers. Video card Nvidia GTX 900+) sort-key 02 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Base-System/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-Base-System/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf index be97e77..4871116 100644 --- a/Melawy-Linux-Base-System/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf +++ b/Melawy-Linux-Base-System/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 03 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Base-System/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf b/Melawy-Linux-Base-System/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf index 57bf37d..e0e6d25 100644 --- a/Melawy-Linux-Base-System/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf +++ b/Melawy-Linux-Base-System/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 04 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Base-System/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf b/Melawy-Linux-Base-System/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf index 9e7a68a..3c03c34 100644 --- a/Melawy-Linux-Base-System/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf +++ b/Melawy-Linux-Base-System/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Speech) sort-key 05 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap accessibility=on diff --git a/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_and_developer_edition.py b/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_and_developer_edition.py index 7b98fa9..b9a1598 100755 --- a/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_and_developer_edition.py +++ b/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_and_developer_edition.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_system.py b/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_system.py index a15b1fa..79db6aa 100755 --- a/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_system.py +++ b/Melawy-Linux-Base-System/generate_packages.x86_64_from_base_system.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall.py b/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall.py index 53cdb1f..eaf8056 100755 --- a/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall.py +++ b/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall_only.py b/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall_only.py index 3100212..f3eed8a 100755 --- a/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall_only.py +++ b/Melawy-Linux-Base-System/generate_packages.x86_64_from_netinstall_only.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Base-System/grub/grub.cfg b/Melawy-Linux-Base-System/grub/grub.cfg index a95bb7c..27ed5f7 100644 --- a/Melawy-Linux-Base-System/grub/grub.cfg +++ b/Melawy-Linux-Base-System/grub/grub.cfg @@ -91,35 +91,35 @@ fi menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility' { set gfxpayload=800x600,1024x768,1366x768,1920x1080 - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-Base-System/grub/loopback.cfg b/Melawy-Linux-Base-System/grub/loopback.cfg index 1792470..ec50db2 100644 --- a/Melawy-Linux-Base-System/grub/loopback.cfg +++ b/Melawy-Linux-Base-System/grub/loopback.cfg @@ -13,32 +13,32 @@ timeout_style=menu # Menu entries menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility on' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-Base-System/netinstall.yaml b/Melawy-Linux-Base-System/netinstall.yaml index 0c792d4..9adb788 100644 --- a/Melawy-Linux-Base-System/netinstall.yaml +++ b/Melawy-Linux-Base-System/netinstall.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -281,6 +278,7 @@ - tree - ttf-terminus-nerd - unace + - unifetch - unrar - unzip - usbutils @@ -362,6 +360,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +400,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +593,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +622,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +664,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +744,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +897,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +932,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +940,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +974,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1014,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1022,7 @@ description: "Add the mail applications" selected: true packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Base-System/packages.x86_64 b/Melawy-Linux-Base-System/packages.x86_64 new file mode 100644 index 0000000..7f8477f --- /dev/null +++ b/Melawy-Linux-Base-System/packages.x86_64 @@ -0,0 +1,653 @@ +accountsservice +adobe-source-code-pro-fonts +adobe-source-han-sans-cn-fonts +adobe-source-han-sans-jp-fonts +adobe-source-han-sans-kr-fonts +adw-gtk-theme +aic94xx-firmware +akonadi +akonadi-calendar +akonadi-calendar-tools +akonadi-contacts +akonadi-import-wizard +akonadi-search +akonadiconsole +alsa-firmware +alsa-lib +alsa-plugins +alsa-utils +amd-ucode +amneziavpn +amneziawg-dkms +amneziawg-go +amneziawg-tools +ananicy-cpp +anydesk-bin +appimagelauncher +appstream +archiso +archlinux-keyring +arcolinux-keyring +arcolinux-mirrorlist-git +ark +aspell +aspell-en +aspell-ru +ast-firmware +audacious +audacity +audio-recorder +audiocd-kio +avahi +avidemux-cli +avidemux-qt +awesome-terminal-fonts +b43-fwcutter +base +base-devel +bash-completion +bat +bcachefs-tools +beep +blueberry +bluedevil +bluetooth-support +bluez +bluez-hid2hci +bluez-libs +bluez-utils +breeze +breeze-gtk +bridge-utils +brltty +broadcom-wl-dkms +btop +btrfs-assistant +btrfs-progs +btrfs-snapshots-git +btrfsmaintenance +busybox +cachyos-ananicy-rules-git +cachyos-keyring +cachyos-mirrorlist +cachyos-settings +cantarell-fonts +chaotic-keyring +chaotic-mirrorlist +chwd +clonezilla +cloud-init +cpupower +cronie +cryfs +cryptsetup +cups +cups-browsed +cups-filters +cups-pdf +darkhttpd +dbus-broker +ddrescue +device-mapper +dex +dhclient +dhcpcd +dialog +diffutils +dmidecode +dmraid +dnscrypt-proxy +dnsmasq +dnsutils +dolphin +dolphin-plugins +dosfstools +doublecmd-qt6 +downgrade +dracut +dracut-luks-autounlock +drkonqi +duf +e2fsprogs +edk2-shell +efibootmgr +efitools +elisa +encfs +endeavouros-keyring +endeavouros-mirrorlist +espeak-ng +ethtool +exfatprogs +expac +expect +f2fs-tools +fastfetch +fatresize +feh +ffmpeg-obs +ffmpegthumbnailer +ffmpegthumbs +file-roller +find-the-command +findutils +firefox +firefox-i18n-ru +firewalld +flatpak +flatpak-kcm +flatpak-xdg-utils +foomatic-db +foomatic-db-engine +foomatic-db-gutenprint-ppds +foomatic-db-nonfree +foomatic-db-nonfree-ppds +foomatic-db-ppds +freetype2 +fsarchiver +fwupd +fwupd-efi +galculator +ghostscript +gimp +gimp-help-ru +git +gksu +glances +glfw +gnome-firmware +gnome-keyring +gnome-settings-daemon +gnome-themes-extra +gocryptfs +gpart +gparted +gpm +gptfdisk +green-tunnel-bin +grsync +grub +gsettings-desktop-schemas +gsettings-qt +gsfonts +gst-libav +gst-plugin-pipewire +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +gstreamer +gstreamer-meta +gtk-engine-murrine +gutenprint +gvfs +gvfs-afc +gvfs-goa +gvfs-google +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb +gwenview +hardcode-fixer-git +hardinfo2 +haveged +hdparm +hiddify-next-bin +hplip +htop +hunspell +hunspell-en_us +hunspell-ru +hw-probe +hwdetect +hwinfo +hyperv +ibus +ibus-typing-booster +iftop +imwheel +inetutils +inkscape +input-devices-support +intel-ucode +intltool +inxi +iotop-c +ipset +iptables-nft +iw +iwd +jfsutils +karchive5 +kate +kcalc +kde-cli-tools +kde-gtk-config +kde-system-meta +kdeconnect +kdegraphics-thumbnailers +kdenetwork-filesharing +kdeplasma-addons +kdialog +keepassxc +kfind +kgamma +kimageformats +kimageformats5 +kinfocenter +kinit +kio +kio-admin +kio-extras +kio-fuse +klassy +klassy-qt5 +kleopatra +kmail +kmail-account-wizard +konsole +kpmcore +kscreen +ksshaskpass +ksystemlog +kvantum +kwallet-pam +kwalletmanager +kwayland-integration +laptop-detect +ldns +legcord +less +lftp +lib32-pipewire +libappindicator-gtk3 +libdvdcss +libfido2 +libgsf +libmicrohttpd +libmtp +libnetfilter_queue +libopenraw +libreoffice-extension-languagetool +libreoffice-fresh +libreoffice-fresh-ru +libusb-compat +libva-intel-driver +libva-utils +libvirt +libwnck3 +linux-api-headers +linux-atm +linux-firmware +linux-firmware-marvell +linux-xanmod-anbox +linux-xanmod-anbox-headers +logrotate +lolcat +lsb-release +lshw +lsscsi +lua-filesystem +lvm2 +lxappearance-gtk3 +lynx +lyrebird-proxy +malcontent +maliit-keyboard +man-db +man-pages +manjaro-keyring +mbedtls +mbedtls2 +mc +mdadm +media-downloader +melawy-branding +melawy-calamares +melawy-calamares-config +melawy-check-reboot-required +melawy-dracut-initramfs +melawy-dracut-ukify +melawy-etc-skel-std-powerman-kvantum +melawy-icon-theme-kde6 +melawy-kde-theme-fenek-kde6 +melawy-kde-theme-lera-sugar-kde6 +melawy-kde-theme-nier-a2-kde6 +melawy-linux-keyring +melawy-linux-mirrorlist +melawy-linux-updater +melawy-linux-updater-tray +melawy-linux-welcome +melawy-pamac-helper +melawy-plymouth-theme +melawy-plymouth-theme-fenek +melawy-plymouth-theme-hard-install-nier-a2 +melawy-plymouth-theme-lera-sugar +melawy-plymouth-theme-nier-a2 +melawy-purple-dark-cursors +melawy-purple-dark-default-cursors +melawy-purple-light-cursors +melawy-purple-light-default-cursors +melawy-red-dark-cursors +melawy-red-dark-default-cursors +melawy-red-light-cursors +melawy-red-light-default-cursors +melawy-refind-menu-generator +melawy-refind-theme +melawy-refind-theme-fenek +melawy-refind-theme-hard-install-nier-a2 +melawy-refind-theme-lera-sugar +melawy-refind-theme-nier-a2 +melawy-skel-liveuser +melawy-skel-root +melawy-theme-kde6 +memtest86+ +memtest86+-efi +mesa +mesa-utils +mintstick-git +mkinitcpio +mkinitcpio-archiso +mkinitcpio-firmware +mkinitcpio-nfs-utils +mkinitcpio-openswap +mlocate +mobile-broadband-provider-info +modemmanager +most +mousetweaks +mtools +mtpfs +nano +nano-syntax-highlighting +nbd +ndisc6 +neovim +net-tools +netctl +network-manager-applet +networkmanager +networkmanager-l2tp +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-qt +networkmanager-qt5 +networkmanager-strongswan +networkmanager-vpnc +nfs-utils +nilfs-utils +nmap +noto-color-emoji-fontconfig +noto-fonts +noto-fonts-cjk +noto-fonts-emoji +noto-fonts-extra +nss-mdns +ntfs-3g +ntp +nvidia-dkms +nvidia-settings +nvidia-utils +nvme-cli +obfs4proxy +obs-studio-tytan652 +obsidian +ocs-url +okular +open-iscsi +open-vm-tools +openbsd-netcat +opencl-nvidia +openconnect +opendesktop-fonts +openssh +openvpn +orca +os-prober +otf-fira-mono +otf-fira-sans +otf-firamono-nerd +p7zip +pace +packagekit-qt5 +packagekit-qt6 +paclast +pacman +pacman-contrib +pacman-mirrorlist +pacseek +pacutils +pamac +parallel +partclone +parted +partimage +partitionmanager +paru +pavucontrol +pcsclite +picom +pipewire +pipewire-alsa +pipewire-jack +pipewire-pulse +pipewire-support +pkgfile +plasma +plasma-browser-integration +plasma-desktop +plasma-disks +plasma-firewall +plasma-integration +plasma-nm +plasma-pa +plasma-systemmonitor +plasma-thunderbolt +plasma-vault +plasma-wayland-protocols +plasma-workspace +plasma-workspace-wallpapers +plasma5-integration +plymouth +plymouth-kcm +polkit +polkit-kde-agent +polkit-qt5 +polkit-qt6 +poppler-glib +poppler-qt5 +poppler-qt6 +powerdevil +powerline +powerline-common +powerline-fonts +powersave-tweaks +ppp +pptpclient +preload +print-manager +printer-support +procps-ng +profile-sync-daemon +pv +python-capng +python-defusedxml +python-packaging +python-pyparted +python-pyqt5 +qbittorrent +qemu-guest-agent +qt5-imageformats +qt5ct +qt6-imageformats +r8168-dkms +rate-mirrors-bin +realtime-privileges +rebuild-detector +refind +reflector +ripgrep +rp-pppoe +rsync +rtkit +rtl8821cu-morrownr-dkms-git +s-nail +samba-support +sbctl +sbsigntools +screen +screenfetch +sddm +sddm-kcm +sdparm +sed +sequoia-sq +sg3_utils +shadowsocks-electron-bin +smartmontools +smbclient +snapd +snapd-glib +snowflake-pt-client-git +sof-firmware +sofirem-git +solid +spectacle +spice-vdagent +splix +squashfs-tools +sshguard +sshpass +sudo +sysfsutils +syslinux +syslog-ng +system-config-printer +systemd-kcm +systemd-oomd-defaults +systemd-resolvconf +systemd-ukify +tcpdump +telegram-desktop-bin +terminus-font +testdisk +texinfo +the_silver_searcher +timeshift +timeshift-autosnap +tldr +tmux +topgrade +tor +tor-browser-bin +tor-router +tpm2-tools +tpm2-tss +traceroute +tracker3-miners +translate-shell +transmission-qt +tree +ttf-bitstream-vera +ttf-dejavu +ttf-dejavu-nerd +ttf-droid +ttf-fira-code +ttf-fira-sans +ttf-firacode-nerd +ttf-font-awesome +ttf-hack +ttf-hack-nerd +ttf-jetbrains-mono +ttf-jetbrains-mono-nerd +ttf-liberation +ttf-liberation-mono-nerd +ttf-ms-fonts +ttf-nerd-fonts-symbols +ttf-nerd-fonts-symbols-common +ttf-nerd-fonts-symbols-mono +ttf-noto-nerd +ttf-opensans +ttf-roboto +ttf-roboto-mono +ttf-roboto-mono-nerd +ttf-sourcecodepro-nerd +ttf-terminus-nerd +ttf-twemoji +ttf-ubuntu-font-family +ttf-ubuntu-mono-nerd +ttf-ubuntu-nerd +tumbler +tuned +tuned-ppd +udftools +udiskie +udisks2 +unace +unrar +unzip +upd72020x-fw +upower +usb_modeswitch +usbmuxd +usbutils +v4l2loopback-dkms +variety +ventoy-bin +virtualbox-guest-utils +vlc-luajit +vpnc +wd719x-firmware +webtunnel-git +weston +wget +wget2 +which +whois +wireguard-tools +wireless-regdb +wireless_tools +wireplumber +wl-clipboard +wpa_supplicant +wvdial +xcompmgr +xdg-desktop-portal +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +xdg-utils +xed +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-synaptics +xf86-input-vmmouse +xf86-input-void +xf86-video-amdgpu +xf86-video-fbdev +xf86-video-qxl +xfsprogs +xl2tpd +xmlstarlet +xorg-server +xorg-xdpyinfo +xorg-xhost +xorg-xinit +xorg-xinput +xorg-xkill +xorg-xrandr +xorg-xrdb +xsettingsd +xz +yad +yakuake +yandex-disk +yandex-disk-indicator +yay +zapret-git +zenity +zoom +zram-generator diff --git a/Melawy-Linux-Base-System/pacman_sys.conf b/Melawy-Linux-Base-System/pacman_sys.conf index 03c93c6..fb63c62 100644 --- a/Melawy-Linux-Base-System/pacman_sys.conf +++ b/Melawy-Linux-Base-System/pacman_sys.conf @@ -1,41 +1,38 @@ -# # /etc/pacman.conf -# +# +# # See the pacman.conf(5) manpage for option and repository directives -# +# # GENERAL OPTIONS -# +# [options] # The following paths are commented out with their default values listed. # If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = base base-devel pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled +# RootDir = / +# DBPath = /var/lib/pacman/ +# CacheDir = /var/cache/pacman/pkg/ +# LogFile = /var/log/pacman.log +# GPGDir = /etc/pacman.d/gnupg/ +# HookDir = /etc/pacman.d/hooks/ +HoldPkg = base base-devel pacman glibc +# XferCommand = /usr/bin/curl -L -C - -f -o %o %u +# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# CleanMethod = KeepInstalled Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog +# IgnoreGroup = +# NoUpgrade = +# NoExtract = +# UseSyslog Color ILoveCandy -#NoProgressBar -#TotalDownload +# NoProgressBar +# TotalDownload # We cannot check disk space from within a chroot environment -#CheckSpace +# CheckSpace VerbosePkgLists DisableDownloadTimeout ParallelDownloads = 10 @@ -44,7 +41,7 @@ ParallelDownloads = 10 # trusts (see pacman-key and its man page), as well as unsigned packages. SigLevel = Required DatabaseOptional LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required +# RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux @@ -79,14 +76,20 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist [melawy-core] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[core-testing] -#Include = /etc/pacman.d/mirrorlist +# [cache] +# SigLevel = Optional +# Server = http://10.120.152.1/$repo/$arch +# Server = http://192.168.1.250/$repo/$arch +# Server = https://repo.melawy.ru/$repo/$arch + +# [core-testing] +# Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist +# [extra-testing] +# Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist @@ -94,8 +97,8 @@ Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +# [multilib-testing] +# Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist @@ -103,12 +106,6 @@ Include = /etc/pacman.d/mirrorlist [melawy-3party] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[cache] -#SigLevel = Optional -#Server = http://10.120.152.1/$repo/$arch -#Server = http://192.168.1.250/$repo/$arch -#Server = https://repo.melawy.ru/$repo/$arch - # [cachyos-iso] # Server = https://mirror.cachyos.org/repo/$arch/$repo # @@ -119,12 +116,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] @@ -135,6 +135,6 @@ Include = /etc/pacman.d/endeavouros-mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs +# [custom] +# SigLevel = Optional TrustAll +# Server = file:///home/custompkgs diff --git a/Melawy-Linux-Base-System/syslinux/archiso_pxe-linux.cfg b/Melawy-Linux-Base-System/syslinux/archiso_pxe-linux.cfg index fa2865d..bedf9cb 100644 --- a/Melawy-Linux-Base-System/syslinux/archiso_pxe-linux.cfg +++ b/Melawy-Linux-Base-System/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium using NBD. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the Melawy Linux live medium using NFS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the Melawy Linux live medium using HTTP. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y SYSAPPEND 3 diff --git a/Melawy-Linux-Base-System/syslinux/archiso_sys-linux.cfg b/Melawy-Linux-Base-System/syslinux/archiso_sys-linux.cfg index 62ccdc7..da2d37e 100644 --- a/Melawy-Linux-Base-System/syslinux/archiso_sys-linux.cfg +++ b/Melawy-Linux-Base-System/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium on BIOS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium default (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Nvidia propritary (Non-Free) @@ -15,8 +15,8 @@ Boot the Melawy Linux install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium NVIDIA (latest cards, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Fallback (nomodeset) @@ -26,8 +26,8 @@ Boot the Melawy Linux install medium on Bios in fallback mode. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium Fallback (nomodeset, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes quiet splash bgrt_disable # Accessibility boot option @@ -37,6 +37,6 @@ Boot the Melawy Linux install medium on BIOS with speakup screen reader. It allows you to install Melawy Linux or perform system maintenance with speech feedback. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on diff --git a/Melawy-Linux-Base-System/time.log b/Melawy-Linux-Base-System/time.log index e69de29..16e526a 100644 --- a/Melawy-Linux-Base-System/time.log +++ b/Melawy-Linux-Base-System/time.log @@ -0,0 +1,24 @@ + +clean Elapsed: 0hrs 0min 0sec + + +airootfs Elapsed: 0hrs 0min 1sec + + +check_internet Elapsed: 0hrs 0min 0sec + + +prepare Elapsed: 0hrs 0min 29sec + + +check_internet Elapsed: 0hrs 0min 0sec + + +build Elapsed: 0hrs 3min 43sec + + +sign Elapsed: 0hrs 0min 0sec + + +std_build Elapsed: 0hrs 0min 0sec + diff --git a/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml b/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml index eaf7c4f..904b001 100644 --- a/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml +++ b/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml b/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml index d166d4b..b9c4a56 100644 --- a/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml +++ b/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml b/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml index 6c95edd..f4563f3 100644 --- a/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml +++ b/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: false packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/mkinitcpio.d/linux.preset b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/mkinitcpio.d/linux-xanmod.preset similarity index 58% rename from Melawy-Linux-Developer-Edition-Custom/airootfs/etc/mkinitcpio.d/linux.preset rename to Melawy-Linux-Developer-Edition-Custom/airootfs/etc/mkinitcpio.d/linux-xanmod.preset index 7c25186..3428b60 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/mkinitcpio.d/linux.preset +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/mkinitcpio.d/linux-xanmod.preset @@ -1,6 +1,6 @@ # mkinitcpio preset file for the 'Melawy Linux' package on archiso -KNAME="cachyos" +KNAME="xanmod" KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1) @@ -8,11 +8,11 @@ if [[ -z "$KVER" ]]; then exit fi -cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-cachyos" +cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-xanmod-anbox" PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux-cachyos' +ALL_kver='/boot/vmlinuz-xanmod-anbox' archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' -archiso_image="/boot/initramfs-linux-cachyos.img" +archiso_image="/boot/initramfs-xanmod-anbox.img" diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/motd b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/motd index 46bf986..e69de29 100755 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/motd +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/motd @@ -1,46 +0,0 @@ -Info: -This ISO is based on Arch-ISO modified hugely to provide Installation Environment for Melawy Linux. -https://melawy.ru - -Melawy Linux-archiso Sources: -https://gitlab.com/melawy - -Arch-ISO Source: -https://gitlab.archlinux.org/archlinux/archiso - -Calamares as our installer: -https://github.com/calamares/calamares - -Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. ------------------- - -News: -https://melawy.ru -https://en.melawy.ru - -https://techhub.social/@Melawy - -https://t.me/Melawy_Linux ------------------- - -Chat: -https://t.me/Melawy_Linux_Chat ------------------- - -Help: -https://melawy.ru -https://github.com/Melawy/Develop/wiki -https://github.com/Melawy/Develop/issues - -Bugs can be reported here: -https://github.com/Melawy/Develop/issues ------------------- - -Our journey wouldn't be made possible without the donates: -https://melawy.ru/donate ------------------- - -Thank you for donating your trust in us! - -Welcome to your Melawy Linux ------------------- diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf index 5dbd9c6..0870091 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf index e5958e1..305607f 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf index 9e11ad6..b81119d 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf @@ -105,12 +105,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist index 5c6ea02..15e0581 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2025-01-25 00:01:01 UTC +# When: 2025-06-15 16:15:31 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2025-01-25 00:00:07 UTC -# Last Check: 2025-01-24 23:44:23 UTC +# Retrieved: 2025-06-15 16:13:54 UTC +# Last Check: 2025-06-15 16:00:51 UTC -Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch -Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://cdnmirror.com/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch -Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch +Server = http://cdnmirror.com/archlinux/$repo/os/$arch Server = https://de.arch.niranjan.co/$repo/os/$arch -Server = http://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch +Server = https://mirror.pseudoform.org/$repo/os/$arch Server = http://de.arch.niranjan.co/$repo/os/$arch +Server = http://mirror.bakertelekom.fr/Arch/$repo/os/$arch +Server = https://taipei.mirror.pkgbuild.com/$repo/os/$arch +Server = https://mirror.lcarilla.de/archlinux/$repo/os/$arch +Server = rsync://mirror.lcarilla.de/archlinux/$repo/os/$arch +Server = https://nz.arch.niranjan.co/$repo/os/$arch +Server = rsync://de.arch.niranjan.co/archlinux/$repo/os/$arch +Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch +Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = https://berlin.mirror.pkgbuild.com/$repo/os/$arch +Server = https://singapore.mirror.pkgbuild.com/$repo/os/$arch +Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch Server = http://archlinux.thaller.ws/$repo/os/$arch Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = https://de.arch.mirror.kescher.at/$repo/os/$arch -Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch -Server = rsync://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch -Server = rsync://mirror.moson.org/arch/$repo/os/$arch diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf index ea90615..e654505 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf @@ -1,6 +1,7 @@ [General] -DisplayServer=x11-user +DisplayServer=wayland GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell +#InputMethod= [Wayland] CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1 --inputmethod maliit-keyboard diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/autologin.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/autologin.conf new file mode 100644 index 0000000..2ace995 --- /dev/null +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/autologin.conf @@ -0,0 +1,4 @@ +[Autologin] +Relogin=false +Session=plasma +User=liveuser diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/kde_settings.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/kde_settings.conf index ae8c334..94d6c8b 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/kde_settings.conf +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/kde_settings.conf @@ -1,8 +1,3 @@ -[Autologin] -Relogin=false -Session=plasmax11 -User=liveuser - [General] HaltCommand=/usr/bin/systemctl poweroff RebootCommand=/usr/bin/systemctl reboot diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/tor/torrc b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/tor/torrc index cc5249b..31d42ec 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/tor/torrc +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/tor/torrc @@ -47,7 +47,7 @@ Log notice syslog ## Uncomment this to start the process in the background... or use ## --runasdaemon 1 on the command line. This is ignored on Windows; ## see the FAQ entry if you want Tor to run as an NT service. -#RunAsDaemon 1 +RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. @@ -296,8 +296,15 @@ VirtualAddrNetwork 10.192.0.0/10 AutomapHostsOnResolve 1 TransPort 9040 DNSPort 6669 -ControlPort 9051 +# ControlPort 9051 ExcludeExitNodes {ru},{by},{cn},{??} ExitPolicy reject *:* HardwareAccel 1 NumCPUs 4 + +# Uncomment if your needed +# SocksPort 0.0.0.0:9050 +# SocksPolicy accept 192.168.1.0/24 +# SocksPolicy accept 127.0.0.0/8 +#SOCKSPolicy accept6 FC00::/7 +# SOCKSPolicy reject * diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/opt/extra-drivers/r8168-dkms-8.055.00-4-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/opt/extra-drivers/r8168-dkms-8.055.00-4-x86_64.pkg.tar.zst new file mode 100644 index 0000000..f94dbf2 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/opt/extra-drivers/r8168-dkms-8.055.00-4-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/root/airootfs.img b/Melawy-Linux-Developer-Edition-Custom/airootfs/root/airootfs.img new file mode 100644 index 0000000..bd153e4 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/root/airootfs.img differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/root/airootfs.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/root/airootfs.tar.zst new file mode 100644 index 0000000..dc10070 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/root/airootfs.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/remove-unneeded b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/remove-unneeded index 9433bd6..e5c1d6f 100755 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/remove-unneeded +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/remove-unneeded @@ -17,6 +17,7 @@ _clean_packages() { mkinitcpio-archiso mkinitcpio-busybox mkinitcpio-nfs-utils + mkinitcpio-firmware qemu-arm-aarch64-static-bin syslinux yaml-cpp diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/dracut-107-1-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/dracut-107-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..9d06bba Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/dracut-107-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/grub-dracut-1.2.1-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/grub-dracut-1.2.1-1-any.pkg.tar.xz new file mode 100644 index 0000000..6cc2a20 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/grub-dracut-1.2.1-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/libxvmc-1.0.14-1-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/libxvmc-1.0.14-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..31aa1c2 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/libxvmc-1.0.14-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-api-headers-6.15-1-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-api-headers-6.15-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..15c4da9 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-api-headers-6.15-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-xanmod-anbox-6.14.11-1-x86_64.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-xanmod-anbox-6.14.11-1-x86_64.pkg.tar.xz new file mode 100644 index 0000000..19ddd9c Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-xanmod-anbox-6.14.11-1-x86_64.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-xanmod-anbox-headers-6.14.11-1-x86_64.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-xanmod-anbox-headers-6.14.11-1-x86_64.pkg.tar.xz new file mode 100644 index 0000000..40462ff Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/linux-xanmod-anbox-headers-6.14.11-1-x86_64.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-dracut-initramfs-1.25-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-dracut-initramfs-1.25-1-any.pkg.tar.xz new file mode 100644 index 0000000..2e7196b Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-dracut-initramfs-1.25-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-dracut-ukify-1.29-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-dracut-ukify-1.29-1-any.pkg.tar.xz new file mode 100644 index 0000000..a1ce0bc Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-dracut-ukify-1.29-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-plymouth-theme-nier-a2-1.15-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-plymouth-theme-nier-a2-1.15-1-any.pkg.tar.xz new file mode 100644 index 0000000..d189467 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-plymouth-theme-nier-a2-1.15-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-refind-menu-generator-1.40-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-refind-menu-generator-1.40-1-any.pkg.tar.xz new file mode 100644 index 0000000..b264bdf Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-refind-menu-generator-1.40-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-refind-theme-nier-a2-1.12-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-refind-theme-nier-a2-1.12-1-any.pkg.tar.xz new file mode 100644 index 0000000..53584d7 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/melawy-refind-theme-nier-a2-1.12-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/os-prober-1.83-1-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/os-prober-1.83-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..43eaa04 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/os-prober-1.83-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/refind-0.14.2-1-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/refind-0.14.2-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..3005b61 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/refind-0.14.2-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/systemd-boot-dracut-1.9.1.19-1-any.pkg.tar.xz b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/systemd-boot-dracut-1.9.1.19-1-any.pkg.tar.xz new file mode 100644 index 0000000..c36e289 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/systemd-boot-dracut-1.9.1.19-1-any.pkg.tar.xz differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/update-grub-0.0.1-8-any.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/update-grub-0.0.1-8-any.pkg.tar.zst new file mode 100644 index 0000000..afdcf56 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/update-grub-0.0.1-8-any.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/xf86-video-intel-1:2.99.917+939+g4a64400e-1-x86_64.pkg.tar.zst b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/xf86-video-intel-1:2.99.917+939+g4a64400e-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..dbb4fe0 Binary files /dev/null and b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/share/packages/xf86-video-intel-1:2.99.917+939+g4a64400e-1-x86_64.pkg.tar.zst differ diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/var/lib/sddm/.config/kcminputrc b/Melawy-Linux-Developer-Edition-Custom/airootfs/var/lib/sddm/.config/kcminputrc index 03851aa..c57eb1a 100644 --- a/Melawy-Linux-Developer-Edition-Custom/airootfs/var/lib/sddm/.config/kcminputrc +++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/var/lib/sddm/.config/kcminputrc @@ -6,6 +6,7 @@ NumLock=0 [Mouse] X11LibInputXAccelProfileFlat=true +cursorTheme=Melawy-red-light-default-cursors [Tmp] update_info=delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize diff --git a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 9ea54d2..c4a76a5 100644 --- a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Open-Source Drivers) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 05efd9a..a1581f9 100644 --- a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Nvidia Drivers. Video card Nvidia GTX 900+) sort-key 02 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf index be97e77..4871116 100644 --- a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf +++ b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 03 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf index 57bf37d..e0e6d25 100644 --- a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf +++ b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 04 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf index 9e7a68a..3c03c34 100644 --- a/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf +++ b/Melawy-Linux-Developer-Edition-Custom/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Speech) sort-key 05 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap accessibility=on diff --git a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_and_developer_edition.py b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_and_developer_edition.py index 7b98fa9..b9a1598 100755 --- a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_and_developer_edition.py +++ b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_and_developer_edition.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_system.py b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_system.py index a15b1fa..79db6aa 100755 --- a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_system.py +++ b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_base_system.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall.py b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall.py index 53cdb1f..eaf8056 100755 --- a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall.py +++ b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall_only.py b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall_only.py index 3100212..f3eed8a 100755 --- a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall_only.py +++ b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64_from_netinstall_only.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition-Custom/grub/grub.cfg b/Melawy-Linux-Developer-Edition-Custom/grub/grub.cfg index a95bb7c..27ed5f7 100644 --- a/Melawy-Linux-Developer-Edition-Custom/grub/grub.cfg +++ b/Melawy-Linux-Developer-Edition-Custom/grub/grub.cfg @@ -91,35 +91,35 @@ fi menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility' { set gfxpayload=800x600,1024x768,1366x768,1920x1080 - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-Developer-Edition-Custom/grub/loopback.cfg b/Melawy-Linux-Developer-Edition-Custom/grub/loopback.cfg index 1792470..ec50db2 100644 --- a/Melawy-Linux-Developer-Edition-Custom/grub/loopback.cfg +++ b/Melawy-Linux-Developer-Edition-Custom/grub/loopback.cfg @@ -13,32 +13,32 @@ timeout_style=menu # Menu entries menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility on' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml b/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml index 0c792d4..9adb788 100644 --- a/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml +++ b/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -281,6 +278,7 @@ - tree - ttf-terminus-nerd - unace + - unifetch - unrar - unzip - usbutils @@ -362,6 +360,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +400,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +593,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +622,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +664,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +744,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +897,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +932,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +940,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +974,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1014,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1022,7 @@ description: "Add the mail applications" selected: true packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition-Custom/packages.x86_64 b/Melawy-Linux-Developer-Edition-Custom/packages.x86_64 new file mode 100644 index 0000000..b34bd26 --- /dev/null +++ b/Melawy-Linux-Developer-Edition-Custom/packages.x86_64 @@ -0,0 +1,776 @@ +accountsservice +adobe-source-code-pro-fonts +adobe-source-han-sans-cn-fonts +adobe-source-han-sans-jp-fonts +adobe-source-han-sans-kr-fonts +adw-gtk-theme +aic94xx-firmware +akonadi +akonadi-calendar +akonadi-calendar-tools +akonadi-contacts +akonadi-import-wizard +akonadi-search +akonadiconsole +alsa-firmware +alsa-lib +alsa-plugins +alsa-utils +amd-ucode +amneziavpn +amneziawg-dkms +amneziawg-go +amneziawg-tools +ananicy-cpp +android-emulator +android-ndk +android-platform +android-sdk +android-sdk-build-tools +android-sdk-cmdline-tools-latest +android-tools +ansible-language-server +anydesk-bin +apksigcopier +appimagelauncher +appstream +archiso +archlinux-keyring +arcolinux-keyring +arcolinux-mirrorlist-git +ark +aspell +aspell-en +aspell-ru +ast-firmware +audacious +audacity +audio-recorder +audiocd-kio +avahi +avidemux-cli +avidemux-qt +awesome-terminal-fonts +b43-fwcutter +base +base-devel +bash-completion +bash-language-server +bat +bcachefs-tools +beep +blueberry +bluedevil +bluetooth-support +bluez +bluez-hid2hci +bluez-libs +bluez-utils +boost +boost-libs +bpython +brave-bin +breeze +breeze-gtk +bridge-utils +brltty +broadcom-wl-dkms +btop +btrfs-assistant +btrfs-progs +btrfs-snapshots-git +btrfsmaintenance +buildtorrent +busybox +cachyos-ananicy-rules-git +cachyos-keyring +cachyos-mirrorlist +cachyos-settings +cantarell-fonts +ccache +chaotic-keyring +chaotic-mirrorlist +chwd +ckbcomp +clang +clonezilla +cloud-init +cmake +codelldb +colloid-cursors-git +colloid-gtk-theme-git +colloid-icon-theme-git +colloid-kde-theme-git +corectrl +cpupower +cronie +cryfs +cryptsetup +cups +cups-browsed +cups-filters +cups-pdf +darkhttpd +dbeaver +dbus-broker +ddrescue +device-mapper +dex +dhclient +dhcpcd +dialog +diffutils +dmidecode +dmraid +dnscrypt-proxy +dnsmasq +dnsutils +docker +docker-buildx +docker-compose +docker-machine +dolphin +dolphin-plugins +dosfstools +doublecmd-qt6 +downgrade +doxygen +dracut +dracut-luks-autounlock +drkonqi +duf +e2fsprogs +edk2-shell +efibootmgr +efitools +elisa +encfs +endeavouros-keyring +endeavouros-mirrorlist +eslint-language-server +espeak-ng +ethtool +exfatprogs +expac +expect +extra-cmake-modules +f2fs-tools +fakeroot +fastfetch +fatresize +feh +ffmpeg-obs +ffmpegthumbnailer +ffmpegthumbs +file-roller +filezilla +find-the-command +findutils +firefox +firefox-developer-edition +firefox-developer-edition-i18n-ru +firefox-i18n-ru +firewalld +flatpak +flatpak-kcm +flatpak-xdg-utils +flutter-bin +foomatic-db +foomatic-db-engine +foomatic-db-gutenprint-ppds +foomatic-db-nonfree +foomatic-db-nonfree-ppds +foomatic-db-ppds +freetype2 +fsarchiver +fwupd +fwupd-efi +galculator +gcc +gcc-libs +gdb +ghostscript +gimp +gimp-help-ru +git +git-lfs +github-cli +github-desktop +gksu +glances +glfw +gnome-firmware +gnome-keyring +gnome-settings-daemon +gnome-themes-extra +go +go-tools +gocryptfs +google-chrome +gpart +gparted +gpm +gptfdisk +green-tunnel-bin +grsync +grub +gsettings-desktop-schemas +gsettings-qt +gsfonts +gst-libav +gst-plugin-pipewire +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +gstreamer +gstreamer-meta +gtk-engine-murrine +gutenprint +gvfs +gvfs-afc +gvfs-goa +gvfs-google +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb +gwe +gwenview +hardcode-fixer-git +hardinfo2 +haveged +hdparm +hiddify-next-bin +hplip +htop +hunspell +hunspell-en_us +hunspell-ru +hw-probe +hwdetect +hwinfo +hypercorn +hyperv +ibus +ibus-typing-booster +icu69 +iftop +imwheel +inetutils +inkscape +input-devices-support +intel-ucode +intltool +inxi +iotop-c +ipset +iptables-nft +iw +iwd +jdk-openjdk +jfsutils +jq +karchive5 +kate +kcalc +kde-cli-tools +kde-gtk-config +kde-system-meta +kdeconnect +kdegraphics-thumbnailers +kdenetwork-filesharing +kdeplasma-addons +kdialog +keepassxc +kfind +kgamma +kimageformats +kimageformats5 +kinfocenter +kinit +kio +kio-admin +kio-extras +kio-fuse +klassy +klassy-qt5 +kleopatra +kmail +kmail-account-wizard +konsole +kpmcore +kscreen +ksshaskpass +ksystemlog +kvantum +kwallet-pam +kwalletmanager +kwayland-integration +laptop-detect +ldns +legcord +less +lftp +lib32-pipewire +libappindicator-gtk3 +libdvdcss +libfido2 +libgsf +libmicrohttpd +libmtp +libnetfilter_queue +libopenraw +libreoffice-extension-languagetool +libreoffice-fresh +libreoffice-fresh-ru +libusb-compat +libva-intel-driver +libva-utils +libvirt +libwnck3 +linux-api-headers +linux-atm +linux-firmware +linux-firmware-marvell +linux-xanmod-anbox +linux-xanmod-anbox-headers +lld +lldb +llvm +llvm-libs +logrotate +lolcat +lsb-release +lshw +lsscsi +lua-filesystem +lua-language-server +lua51 +luarocks +lvm2 +lxappearance-gtk3 +lynx +lyrebird-proxy +mailspring +make +malcontent +maliit-keyboard +man-db +man-pages +manjaro-keyring +mbedtls +mbedtls2 +mc +mdadm +media-downloader +melawy-branding +melawy-calamares +melawy-calamares-config +melawy-check-reboot-required +melawy-dracut-initramfs +melawy-dracut-ukify +melawy-etc-skel-std-powerman-kvantum +melawy-icon-theme-kde6 +melawy-kde-theme-fenek-kde6 +melawy-kde-theme-lera-sugar-kde6 +melawy-kde-theme-nier-a2-kde6 +melawy-kde-theme-win11-kde6 +melawy-kde-theme-win12-kde6 +melawy-linux-keyring +melawy-linux-mirrorlist +melawy-linux-updater +melawy-linux-updater-tray +melawy-linux-welcome +melawy-pamac-helper +melawy-plymouth-theme +melawy-plymouth-theme-fenek +melawy-plymouth-theme-hard-install-nier-a2 +melawy-plymouth-theme-lera-sugar +melawy-plymouth-theme-nier-a2 +melawy-purple-dark-cursors +melawy-purple-dark-default-cursors +melawy-purple-light-cursors +melawy-purple-light-default-cursors +melawy-red-dark-cursors +melawy-red-dark-default-cursors +melawy-red-light-cursors +melawy-red-light-default-cursors +melawy-refind-menu-generator +melawy-refind-theme +melawy-refind-theme-fenek +melawy-refind-theme-hard-install-nier-a2 +melawy-refind-theme-lera-sugar +melawy-refind-theme-nier-a2 +melawy-skel-liveuser +melawy-skel-root +melawy-theme-kde6 +melawy-win11-icon-theme +melawy-win11-icon-theme-special +melawy-win11-icon-theme-white +meld +memtest86+ +memtest86+-efi +mesa +mesa-utils +mintstick-git +mkinitcpio +mkinitcpio-archiso +mkinitcpio-firmware +mkinitcpio-nfs-utils +mkinitcpio-openswap +mktorrent +mlocate +mobile-broadband-provider-info +modemmanager +mold +most +mousetweaks +mtools +mtpfs +mypy +nano +nano-syntax-highlighting +nbd +ndisc6 +neovim +net-tools +netctl +network-manager-applet +networkmanager +networkmanager-l2tp +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-qt +networkmanager-qt5 +networkmanager-strongswan +networkmanager-vpnc +nfs-utils +nilfs-utils +nmap +nodejs +noto-color-emoji-fontconfig +noto-fonts +noto-fonts-cjk +noto-fonts-emoji +noto-fonts-extra +npm +nss-mdns +ntfs-3g +ntp +nvidia-dkms +nvidia-settings +nvidia-utils +nvme-cli +obfs4proxy +obs-studio-tytan652 +obsidian +ocs-url +okular +open-iscsi +open-vm-tools +openbsd-netcat +opencl-nvidia +openconnect +opendesktop-fonts +openssh +openvpn +opera +orca +os-prober +otf-fira-mono +otf-fira-sans +otf-firamono-nerd +p7zip +pace +packagekit-qt5 +packagekit-qt6 +paclast +pacman +pacman-contrib +pacman-mirrorlist +pacseek +pacutils +pamac +parallel +partclone +parted +partimage +partitionmanager +paru +pavucontrol +pcsclite +perl +picom +pipewire +pipewire-alsa +pipewire-jack +pipewire-pulse +pipewire-support +pkgfile +plasma +plasma-browser-integration +plasma-desktop +plasma-disks +plasma-firewall +plasma-integration +plasma-nm +plasma-pa +plasma-systemmonitor +plasma-thunderbolt +plasma-vault +plasma-wayland-protocols +plasma-workspace +plasma-workspace-wallpapers +plasma5-integration +plymouth +plymouth-kcm +polkit +polkit-kde-agent +polkit-qt5 +polkit-qt6 +poppler-glib +poppler-qt5 +poppler-qt6 +powerdevil +powerline +powerline-common +powerline-fonts +powersave-tweaks +ppp +pptpclient +preload +print-manager +printer-support +procps-ng +profile-sync-daemon +pv +pyenv +python +python-aiosqlite +python-capng +python-defusedxml +python-fastapi +python-lsp-server +python-packaging +python-pip +python-poetry +python-pylint-pydantic +python-pyparted +python-pyqt5 +python-pytest-ruff +python-python-multipart +python-reportlab +python-ruff +python-sqlalchemy +python-sqlalchemy-i18n +python-sqlalchemy-utils +qbittorrent +qemu-desktop +qemu-guest-agent +qt5-imageformats +qt5ct +qt6-imageformats +r8168-dkms +rate-mirrors-bin +realtime-privileges +rebuild-detector +refind +reflector +ripgrep +rp-pppoe +rsync +rtkit +rtl8821cu-morrownr-dkms-git +ruff +ruff-lsp +rust-analyzer +rust-musl +rustup +s-nail +samba-support +sbctl +sbsigntools +scanner-support +sccache +screen +screenfetch +sddm +sddm-kcm +sdparm +sed +sequoia-sq +sg3_utils +shadowsocks-electron-bin +simple-scan +smartmontools +smbclient +snapd +snapd-glib +snowflake-pt-client-git +sof-firmware +sofirem-git +solid +spectacle +spice-vdagent +splix +sqlitebrowser +squashfs-tools +sshguard +sshpass +sublime-text-4 +sudo +sysfsutils +syslinux +syslog-ng +system-config-printer +systemd-kcm +systemd-oomd-defaults +systemd-resolvconf +systemd-ukify +tailwindcss-language-server +tcpdump +teams-for-linux +telegram-desktop-bin +terminus-font +testdisk +texinfo +the_silver_searcher +thunderbird +thunderbird-i18n-ru +timeshift +timeshift-autosnap +tldr +tmux +topgrade +tor +tor-browser-bin +tor-router +tpm2-tools +tpm2-tss +traceroute +tracker3-miners +translate-shell +transmission-qt +tree +ttf-bitstream-vera +ttf-dejavu +ttf-dejavu-nerd +ttf-droid +ttf-fira-code +ttf-fira-sans +ttf-firacode-nerd +ttf-font-awesome +ttf-hack +ttf-hack-nerd +ttf-jetbrains-mono +ttf-jetbrains-mono-nerd +ttf-liberation +ttf-liberation-mono-nerd +ttf-ms-fonts +ttf-nerd-fonts-symbols +ttf-nerd-fonts-symbols-common +ttf-nerd-fonts-symbols-mono +ttf-noto-nerd +ttf-opensans +ttf-roboto +ttf-roboto-mono +ttf-roboto-mono-nerd +ttf-sourcecodepro-nerd +ttf-terminus-nerd +ttf-twemoji +ttf-ubuntu-font-family +ttf-ubuntu-mono-nerd +ttf-ubuntu-nerd +tumbler +tuned +tuned-ppd +typescript +typescript-language-server +udftools +udiskie +udisks2 +unace +unicorn +unifetch +unrar +unzip +upd72020x-fw +upower +usb_modeswitch +usbmuxd +usbutils +uv +uvicorn +v4l2loopback-dkms +variety +ventoy-bin +virt-firmware +virt-manager +virt-viewer +virtualbox-guest-utils +visual-studio-code-bin +vivaldi +vlc-luajit +vpnc +vscode-json-languageserver +vue-language-server +waydroid-git +waydroid-helper +waydroid-script-git +wd719x-firmware +webtunnel-git +weston +wget +wget2 +which +whois +wireguard-tools +wireless-regdb +wireless_tools +wireplumber +wl-clipboard +wpa_supplicant +wvdial +xcompmgr +xdg-desktop-portal +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +xdg-utils +xed +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-synaptics +xf86-input-vmmouse +xf86-input-void +xf86-video-amdgpu +xf86-video-fbdev +xf86-video-qxl +xfsprogs +xl2tpd +xmlstarlet +xorg-server +xorg-xdpyinfo +xorg-xhost +xorg-xinit +xorg-xinput +xorg-xkill +xorg-xrandr +xorg-xrdb +xsettingsd +xz +yad +yakuake +yaml-language-server +yandex-disk +yandex-disk-indicator +yarn +yay +zapret-git +zed +zenity +zoom +zram-generator diff --git a/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf b/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf index 03c93c6..fb63c62 100644 --- a/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf +++ b/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf @@ -1,41 +1,38 @@ -# # /etc/pacman.conf -# +# +# # See the pacman.conf(5) manpage for option and repository directives -# +# # GENERAL OPTIONS -# +# [options] # The following paths are commented out with their default values listed. # If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = base base-devel pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled +# RootDir = / +# DBPath = /var/lib/pacman/ +# CacheDir = /var/cache/pacman/pkg/ +# LogFile = /var/log/pacman.log +# GPGDir = /etc/pacman.d/gnupg/ +# HookDir = /etc/pacman.d/hooks/ +HoldPkg = base base-devel pacman glibc +# XferCommand = /usr/bin/curl -L -C - -f -o %o %u +# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# CleanMethod = KeepInstalled Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog +# IgnoreGroup = +# NoUpgrade = +# NoExtract = +# UseSyslog Color ILoveCandy -#NoProgressBar -#TotalDownload +# NoProgressBar +# TotalDownload # We cannot check disk space from within a chroot environment -#CheckSpace +# CheckSpace VerbosePkgLists DisableDownloadTimeout ParallelDownloads = 10 @@ -44,7 +41,7 @@ ParallelDownloads = 10 # trusts (see pacman-key and its man page), as well as unsigned packages. SigLevel = Required DatabaseOptional LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required +# RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux @@ -79,14 +76,20 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist [melawy-core] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[core-testing] -#Include = /etc/pacman.d/mirrorlist +# [cache] +# SigLevel = Optional +# Server = http://10.120.152.1/$repo/$arch +# Server = http://192.168.1.250/$repo/$arch +# Server = https://repo.melawy.ru/$repo/$arch + +# [core-testing] +# Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist +# [extra-testing] +# Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist @@ -94,8 +97,8 @@ Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +# [multilib-testing] +# Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist @@ -103,12 +106,6 @@ Include = /etc/pacman.d/mirrorlist [melawy-3party] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[cache] -#SigLevel = Optional -#Server = http://10.120.152.1/$repo/$arch -#Server = http://192.168.1.250/$repo/$arch -#Server = https://repo.melawy.ru/$repo/$arch - # [cachyos-iso] # Server = https://mirror.cachyos.org/repo/$arch/$repo # @@ -119,12 +116,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] @@ -135,6 +135,6 @@ Include = /etc/pacman.d/endeavouros-mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs +# [custom] +# SigLevel = Optional TrustAll +# Server = file:///home/custompkgs diff --git a/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_pxe-linux.cfg b/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_pxe-linux.cfg index fa2865d..bedf9cb 100644 --- a/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_pxe-linux.cfg +++ b/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium using NBD. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the Melawy Linux live medium using NFS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the Melawy Linux live medium using HTTP. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y SYSAPPEND 3 diff --git a/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_sys-linux.cfg b/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_sys-linux.cfg index 62ccdc7..da2d37e 100644 --- a/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_sys-linux.cfg +++ b/Melawy-Linux-Developer-Edition-Custom/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium on BIOS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium default (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Nvidia propritary (Non-Free) @@ -15,8 +15,8 @@ Boot the Melawy Linux install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium NVIDIA (latest cards, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Fallback (nomodeset) @@ -26,8 +26,8 @@ Boot the Melawy Linux install medium on Bios in fallback mode. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium Fallback (nomodeset, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes quiet splash bgrt_disable # Accessibility boot option @@ -37,6 +37,6 @@ Boot the Melawy Linux install medium on BIOS with speakup screen reader. It allows you to install Melawy Linux or perform system maintenance with speech feedback. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on diff --git a/Melawy-Linux-Developer-Edition-Custom/time.log b/Melawy-Linux-Developer-Edition-Custom/time.log index e69de29..11f9d58 100644 --- a/Melawy-Linux-Developer-Edition-Custom/time.log +++ b/Melawy-Linux-Developer-Edition-Custom/time.log @@ -0,0 +1,27 @@ + +clean Elapsed: 0hrs 0min 0sec + + +airootfs Elapsed: 0hrs 0min 1sec + + +check_internet Elapsed: 0hrs 0min 0sec + + +prepare Elapsed: 0hrs 0min 11sec + + +check_internet Elapsed: 0hrs 0min 0sec + + +build Elapsed: 4hrs 10min 31sec + + +sign Elapsed: 0hrs 0min 0sec + + +std_build Elapsed: 0hrs 0min 0sec + + +sign Elapsed: 0hrs 7min 37sec + diff --git a/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml b/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml index eaf7c4f..904b001 100644 --- a/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml +++ b/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition/_base_system.yaml b/Melawy-Linux-Developer-Edition/_base_system.yaml index d166d4b..b9c4a56 100644 --- a/Melawy-Linux-Developer-Edition/_base_system.yaml +++ b/Melawy-Linux-Developer-Edition/_base_system.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition/_netinstall_only.yaml b/Melawy-Linux-Developer-Edition/_netinstall_only.yaml index 6c95edd..f4563f3 100644 --- a/Melawy-Linux-Developer-Edition/_netinstall_only.yaml +++ b/Melawy-Linux-Developer-Edition/_netinstall_only.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: false packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/mkinitcpio.d/linux.preset b/Melawy-Linux-Developer-Edition/airootfs/etc/mkinitcpio.d/linux-xanmod.preset similarity index 58% rename from Melawy-Linux-Developer-Edition/airootfs/etc/mkinitcpio.d/linux.preset rename to Melawy-Linux-Developer-Edition/airootfs/etc/mkinitcpio.d/linux-xanmod.preset index 7c25186..3428b60 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/mkinitcpio.d/linux.preset +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/mkinitcpio.d/linux-xanmod.preset @@ -1,6 +1,6 @@ # mkinitcpio preset file for the 'Melawy Linux' package on archiso -KNAME="cachyos" +KNAME="xanmod" KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1) @@ -8,11 +8,11 @@ if [[ -z "$KVER" ]]; then exit fi -cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-cachyos" +cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-xanmod-anbox" PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux-cachyos' +ALL_kver='/boot/vmlinuz-xanmod-anbox' archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' -archiso_image="/boot/initramfs-linux-cachyos.img" +archiso_image="/boot/initramfs-xanmod-anbox.img" diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/motd b/Melawy-Linux-Developer-Edition/airootfs/etc/motd index 46bf986..e69de29 100755 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/motd +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/motd @@ -1,46 +0,0 @@ -Info: -This ISO is based on Arch-ISO modified hugely to provide Installation Environment for Melawy Linux. -https://melawy.ru - -Melawy Linux-archiso Sources: -https://gitlab.com/melawy - -Arch-ISO Source: -https://gitlab.archlinux.org/archlinux/archiso - -Calamares as our installer: -https://github.com/calamares/calamares - -Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. ------------------- - -News: -https://melawy.ru -https://en.melawy.ru - -https://techhub.social/@Melawy - -https://t.me/Melawy_Linux ------------------- - -Chat: -https://t.me/Melawy_Linux_Chat ------------------- - -Help: -https://melawy.ru -https://github.com/Melawy/Develop/wiki -https://github.com/Melawy/Develop/issues - -Bugs can be reported here: -https://github.com/Melawy/Develop/issues ------------------- - -Our journey wouldn't be made possible without the donates: -https://melawy.ru/donate ------------------- - -Thank you for donating your trust in us! - -Welcome to your Melawy Linux ------------------- diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf index 5dbd9c6..0870091 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf index e5958e1..305607f 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf index 9e11ad6..b81119d 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf @@ -105,12 +105,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.d/mirrorlist index 5c6ea02..15e0581 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2025-01-25 00:01:01 UTC +# When: 2025-06-15 16:15:31 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2025-01-25 00:00:07 UTC -# Last Check: 2025-01-24 23:44:23 UTC +# Retrieved: 2025-06-15 16:13:54 UTC +# Last Check: 2025-06-15 16:00:51 UTC -Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch -Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://cdnmirror.com/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch -Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch +Server = http://cdnmirror.com/archlinux/$repo/os/$arch Server = https://de.arch.niranjan.co/$repo/os/$arch -Server = http://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch +Server = https://mirror.pseudoform.org/$repo/os/$arch Server = http://de.arch.niranjan.co/$repo/os/$arch +Server = http://mirror.bakertelekom.fr/Arch/$repo/os/$arch +Server = https://taipei.mirror.pkgbuild.com/$repo/os/$arch +Server = https://mirror.lcarilla.de/archlinux/$repo/os/$arch +Server = rsync://mirror.lcarilla.de/archlinux/$repo/os/$arch +Server = https://nz.arch.niranjan.co/$repo/os/$arch +Server = rsync://de.arch.niranjan.co/archlinux/$repo/os/$arch +Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch +Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = https://berlin.mirror.pkgbuild.com/$repo/os/$arch +Server = https://singapore.mirror.pkgbuild.com/$repo/os/$arch +Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch Server = http://archlinux.thaller.ws/$repo/os/$arch Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = https://de.arch.mirror.kescher.at/$repo/os/$arch -Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch -Server = rsync://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch -Server = rsync://mirror.moson.org/arch/$repo/os/$arch diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf index ea90615..e654505 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf @@ -1,6 +1,7 @@ [General] -DisplayServer=x11-user +DisplayServer=wayland GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell +#InputMethod= [Wayland] CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1 --inputmethod maliit-keyboard diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/autologin.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/autologin.conf new file mode 100644 index 0000000..2ace995 --- /dev/null +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/autologin.conf @@ -0,0 +1,4 @@ +[Autologin] +Relogin=false +Session=plasma +User=liveuser diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/kde_settings.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/kde_settings.conf index ae8c334..94d6c8b 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/kde_settings.conf +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/kde_settings.conf @@ -1,8 +1,3 @@ -[Autologin] -Relogin=false -Session=plasmax11 -User=liveuser - [General] HaltCommand=/usr/bin/systemctl poweroff RebootCommand=/usr/bin/systemctl reboot diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/tor/torrc b/Melawy-Linux-Developer-Edition/airootfs/etc/tor/torrc index cc5249b..31d42ec 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/etc/tor/torrc +++ b/Melawy-Linux-Developer-Edition/airootfs/etc/tor/torrc @@ -47,7 +47,7 @@ Log notice syslog ## Uncomment this to start the process in the background... or use ## --runasdaemon 1 on the command line. This is ignored on Windows; ## see the FAQ entry if you want Tor to run as an NT service. -#RunAsDaemon 1 +RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. @@ -296,8 +296,15 @@ VirtualAddrNetwork 10.192.0.0/10 AutomapHostsOnResolve 1 TransPort 9040 DNSPort 6669 -ControlPort 9051 +# ControlPort 9051 ExcludeExitNodes {ru},{by},{cn},{??} ExitPolicy reject *:* HardwareAccel 1 NumCPUs 4 + +# Uncomment if your needed +# SocksPort 0.0.0.0:9050 +# SocksPolicy accept 192.168.1.0/24 +# SocksPolicy accept 127.0.0.0/8 +#SOCKSPolicy accept6 FC00::/7 +# SOCKSPolicy reject * diff --git a/Melawy-Linux-Developer-Edition/airootfs/usr/local/bin/remove-unneeded b/Melawy-Linux-Developer-Edition/airootfs/usr/local/bin/remove-unneeded index 9433bd6..e5c1d6f 100755 --- a/Melawy-Linux-Developer-Edition/airootfs/usr/local/bin/remove-unneeded +++ b/Melawy-Linux-Developer-Edition/airootfs/usr/local/bin/remove-unneeded @@ -17,6 +17,7 @@ _clean_packages() { mkinitcpio-archiso mkinitcpio-busybox mkinitcpio-nfs-utils + mkinitcpio-firmware qemu-arm-aarch64-static-bin syslinux yaml-cpp diff --git a/Melawy-Linux-Developer-Edition/airootfs/var/lib/sddm/.config/kcminputrc b/Melawy-Linux-Developer-Edition/airootfs/var/lib/sddm/.config/kcminputrc index 03851aa..c57eb1a 100644 --- a/Melawy-Linux-Developer-Edition/airootfs/var/lib/sddm/.config/kcminputrc +++ b/Melawy-Linux-Developer-Edition/airootfs/var/lib/sddm/.config/kcminputrc @@ -6,6 +6,7 @@ NumLock=0 [Mouse] X11LibInputXAccelProfileFlat=true +cursorTheme=Melawy-red-light-default-cursors [Tmp] update_info=delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize diff --git a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 9ea54d2..c4a76a5 100644 --- a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Open-Source Drivers) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 05efd9a..a1581f9 100644 --- a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Nvidia Drivers. Video card Nvidia GTX 900+) sort-key 02 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf index be97e77..4871116 100644 --- a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf +++ b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 03 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf index 57bf37d..e0e6d25 100644 --- a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf +++ b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 04 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf index 9e7a68a..3c03c34 100644 --- a/Melawy-Linux-Developer-Edition/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf +++ b/Melawy-Linux-Developer-Edition/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Speech) sort-key 05 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap accessibility=on diff --git a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_and_developer_edition.py b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_and_developer_edition.py index 7b98fa9..b9a1598 100755 --- a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_and_developer_edition.py +++ b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_and_developer_edition.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_system.py b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_system.py index a15b1fa..79db6aa 100755 --- a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_system.py +++ b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_base_system.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall.py b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall.py index 53cdb1f..eaf8056 100755 --- a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall.py +++ b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall_only.py b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall_only.py index 3100212..f3eed8a 100755 --- a/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall_only.py +++ b/Melawy-Linux-Developer-Edition/generate_packages.x86_64_from_netinstall_only.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-Developer-Edition/grub/grub.cfg b/Melawy-Linux-Developer-Edition/grub/grub.cfg index a95bb7c..27ed5f7 100644 --- a/Melawy-Linux-Developer-Edition/grub/grub.cfg +++ b/Melawy-Linux-Developer-Edition/grub/grub.cfg @@ -91,35 +91,35 @@ fi menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility' { set gfxpayload=800x600,1024x768,1366x768,1920x1080 - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-Developer-Edition/grub/loopback.cfg b/Melawy-Linux-Developer-Edition/grub/loopback.cfg index 1792470..ec50db2 100644 --- a/Melawy-Linux-Developer-Edition/grub/loopback.cfg +++ b/Melawy-Linux-Developer-Edition/grub/loopback.cfg @@ -13,32 +13,32 @@ timeout_style=menu # Menu entries menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility on' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-Developer-Edition/netinstall.yaml b/Melawy-Linux-Developer-Edition/netinstall.yaml index 0c792d4..9adb788 100644 --- a/Melawy-Linux-Developer-Edition/netinstall.yaml +++ b/Melawy-Linux-Developer-Edition/netinstall.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -281,6 +278,7 @@ - tree - ttf-terminus-nerd - unace + - unifetch - unrar - unzip - usbutils @@ -362,6 +360,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +400,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +593,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +622,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +664,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +744,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +897,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +932,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +940,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +974,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1014,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1022,7 @@ description: "Add the mail applications" selected: true packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-Developer-Edition/packages.x86_64 b/Melawy-Linux-Developer-Edition/packages.x86_64 new file mode 100644 index 0000000..b34bd26 --- /dev/null +++ b/Melawy-Linux-Developer-Edition/packages.x86_64 @@ -0,0 +1,776 @@ +accountsservice +adobe-source-code-pro-fonts +adobe-source-han-sans-cn-fonts +adobe-source-han-sans-jp-fonts +adobe-source-han-sans-kr-fonts +adw-gtk-theme +aic94xx-firmware +akonadi +akonadi-calendar +akonadi-calendar-tools +akonadi-contacts +akonadi-import-wizard +akonadi-search +akonadiconsole +alsa-firmware +alsa-lib +alsa-plugins +alsa-utils +amd-ucode +amneziavpn +amneziawg-dkms +amneziawg-go +amneziawg-tools +ananicy-cpp +android-emulator +android-ndk +android-platform +android-sdk +android-sdk-build-tools +android-sdk-cmdline-tools-latest +android-tools +ansible-language-server +anydesk-bin +apksigcopier +appimagelauncher +appstream +archiso +archlinux-keyring +arcolinux-keyring +arcolinux-mirrorlist-git +ark +aspell +aspell-en +aspell-ru +ast-firmware +audacious +audacity +audio-recorder +audiocd-kio +avahi +avidemux-cli +avidemux-qt +awesome-terminal-fonts +b43-fwcutter +base +base-devel +bash-completion +bash-language-server +bat +bcachefs-tools +beep +blueberry +bluedevil +bluetooth-support +bluez +bluez-hid2hci +bluez-libs +bluez-utils +boost +boost-libs +bpython +brave-bin +breeze +breeze-gtk +bridge-utils +brltty +broadcom-wl-dkms +btop +btrfs-assistant +btrfs-progs +btrfs-snapshots-git +btrfsmaintenance +buildtorrent +busybox +cachyos-ananicy-rules-git +cachyos-keyring +cachyos-mirrorlist +cachyos-settings +cantarell-fonts +ccache +chaotic-keyring +chaotic-mirrorlist +chwd +ckbcomp +clang +clonezilla +cloud-init +cmake +codelldb +colloid-cursors-git +colloid-gtk-theme-git +colloid-icon-theme-git +colloid-kde-theme-git +corectrl +cpupower +cronie +cryfs +cryptsetup +cups +cups-browsed +cups-filters +cups-pdf +darkhttpd +dbeaver +dbus-broker +ddrescue +device-mapper +dex +dhclient +dhcpcd +dialog +diffutils +dmidecode +dmraid +dnscrypt-proxy +dnsmasq +dnsutils +docker +docker-buildx +docker-compose +docker-machine +dolphin +dolphin-plugins +dosfstools +doublecmd-qt6 +downgrade +doxygen +dracut +dracut-luks-autounlock +drkonqi +duf +e2fsprogs +edk2-shell +efibootmgr +efitools +elisa +encfs +endeavouros-keyring +endeavouros-mirrorlist +eslint-language-server +espeak-ng +ethtool +exfatprogs +expac +expect +extra-cmake-modules +f2fs-tools +fakeroot +fastfetch +fatresize +feh +ffmpeg-obs +ffmpegthumbnailer +ffmpegthumbs +file-roller +filezilla +find-the-command +findutils +firefox +firefox-developer-edition +firefox-developer-edition-i18n-ru +firefox-i18n-ru +firewalld +flatpak +flatpak-kcm +flatpak-xdg-utils +flutter-bin +foomatic-db +foomatic-db-engine +foomatic-db-gutenprint-ppds +foomatic-db-nonfree +foomatic-db-nonfree-ppds +foomatic-db-ppds +freetype2 +fsarchiver +fwupd +fwupd-efi +galculator +gcc +gcc-libs +gdb +ghostscript +gimp +gimp-help-ru +git +git-lfs +github-cli +github-desktop +gksu +glances +glfw +gnome-firmware +gnome-keyring +gnome-settings-daemon +gnome-themes-extra +go +go-tools +gocryptfs +google-chrome +gpart +gparted +gpm +gptfdisk +green-tunnel-bin +grsync +grub +gsettings-desktop-schemas +gsettings-qt +gsfonts +gst-libav +gst-plugin-pipewire +gst-plugins-bad +gst-plugins-base +gst-plugins-good +gst-plugins-ugly +gstreamer +gstreamer-meta +gtk-engine-murrine +gutenprint +gvfs +gvfs-afc +gvfs-goa +gvfs-google +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb +gwe +gwenview +hardcode-fixer-git +hardinfo2 +haveged +hdparm +hiddify-next-bin +hplip +htop +hunspell +hunspell-en_us +hunspell-ru +hw-probe +hwdetect +hwinfo +hypercorn +hyperv +ibus +ibus-typing-booster +icu69 +iftop +imwheel +inetutils +inkscape +input-devices-support +intel-ucode +intltool +inxi +iotop-c +ipset +iptables-nft +iw +iwd +jdk-openjdk +jfsutils +jq +karchive5 +kate +kcalc +kde-cli-tools +kde-gtk-config +kde-system-meta +kdeconnect +kdegraphics-thumbnailers +kdenetwork-filesharing +kdeplasma-addons +kdialog +keepassxc +kfind +kgamma +kimageformats +kimageformats5 +kinfocenter +kinit +kio +kio-admin +kio-extras +kio-fuse +klassy +klassy-qt5 +kleopatra +kmail +kmail-account-wizard +konsole +kpmcore +kscreen +ksshaskpass +ksystemlog +kvantum +kwallet-pam +kwalletmanager +kwayland-integration +laptop-detect +ldns +legcord +less +lftp +lib32-pipewire +libappindicator-gtk3 +libdvdcss +libfido2 +libgsf +libmicrohttpd +libmtp +libnetfilter_queue +libopenraw +libreoffice-extension-languagetool +libreoffice-fresh +libreoffice-fresh-ru +libusb-compat +libva-intel-driver +libva-utils +libvirt +libwnck3 +linux-api-headers +linux-atm +linux-firmware +linux-firmware-marvell +linux-xanmod-anbox +linux-xanmod-anbox-headers +lld +lldb +llvm +llvm-libs +logrotate +lolcat +lsb-release +lshw +lsscsi +lua-filesystem +lua-language-server +lua51 +luarocks +lvm2 +lxappearance-gtk3 +lynx +lyrebird-proxy +mailspring +make +malcontent +maliit-keyboard +man-db +man-pages +manjaro-keyring +mbedtls +mbedtls2 +mc +mdadm +media-downloader +melawy-branding +melawy-calamares +melawy-calamares-config +melawy-check-reboot-required +melawy-dracut-initramfs +melawy-dracut-ukify +melawy-etc-skel-std-powerman-kvantum +melawy-icon-theme-kde6 +melawy-kde-theme-fenek-kde6 +melawy-kde-theme-lera-sugar-kde6 +melawy-kde-theme-nier-a2-kde6 +melawy-kde-theme-win11-kde6 +melawy-kde-theme-win12-kde6 +melawy-linux-keyring +melawy-linux-mirrorlist +melawy-linux-updater +melawy-linux-updater-tray +melawy-linux-welcome +melawy-pamac-helper +melawy-plymouth-theme +melawy-plymouth-theme-fenek +melawy-plymouth-theme-hard-install-nier-a2 +melawy-plymouth-theme-lera-sugar +melawy-plymouth-theme-nier-a2 +melawy-purple-dark-cursors +melawy-purple-dark-default-cursors +melawy-purple-light-cursors +melawy-purple-light-default-cursors +melawy-red-dark-cursors +melawy-red-dark-default-cursors +melawy-red-light-cursors +melawy-red-light-default-cursors +melawy-refind-menu-generator +melawy-refind-theme +melawy-refind-theme-fenek +melawy-refind-theme-hard-install-nier-a2 +melawy-refind-theme-lera-sugar +melawy-refind-theme-nier-a2 +melawy-skel-liveuser +melawy-skel-root +melawy-theme-kde6 +melawy-win11-icon-theme +melawy-win11-icon-theme-special +melawy-win11-icon-theme-white +meld +memtest86+ +memtest86+-efi +mesa +mesa-utils +mintstick-git +mkinitcpio +mkinitcpio-archiso +mkinitcpio-firmware +mkinitcpio-nfs-utils +mkinitcpio-openswap +mktorrent +mlocate +mobile-broadband-provider-info +modemmanager +mold +most +mousetweaks +mtools +mtpfs +mypy +nano +nano-syntax-highlighting +nbd +ndisc6 +neovim +net-tools +netctl +network-manager-applet +networkmanager +networkmanager-l2tp +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-qt +networkmanager-qt5 +networkmanager-strongswan +networkmanager-vpnc +nfs-utils +nilfs-utils +nmap +nodejs +noto-color-emoji-fontconfig +noto-fonts +noto-fonts-cjk +noto-fonts-emoji +noto-fonts-extra +npm +nss-mdns +ntfs-3g +ntp +nvidia-dkms +nvidia-settings +nvidia-utils +nvme-cli +obfs4proxy +obs-studio-tytan652 +obsidian +ocs-url +okular +open-iscsi +open-vm-tools +openbsd-netcat +opencl-nvidia +openconnect +opendesktop-fonts +openssh +openvpn +opera +orca +os-prober +otf-fira-mono +otf-fira-sans +otf-firamono-nerd +p7zip +pace +packagekit-qt5 +packagekit-qt6 +paclast +pacman +pacman-contrib +pacman-mirrorlist +pacseek +pacutils +pamac +parallel +partclone +parted +partimage +partitionmanager +paru +pavucontrol +pcsclite +perl +picom +pipewire +pipewire-alsa +pipewire-jack +pipewire-pulse +pipewire-support +pkgfile +plasma +plasma-browser-integration +plasma-desktop +plasma-disks +plasma-firewall +plasma-integration +plasma-nm +plasma-pa +plasma-systemmonitor +plasma-thunderbolt +plasma-vault +plasma-wayland-protocols +plasma-workspace +plasma-workspace-wallpapers +plasma5-integration +plymouth +plymouth-kcm +polkit +polkit-kde-agent +polkit-qt5 +polkit-qt6 +poppler-glib +poppler-qt5 +poppler-qt6 +powerdevil +powerline +powerline-common +powerline-fonts +powersave-tweaks +ppp +pptpclient +preload +print-manager +printer-support +procps-ng +profile-sync-daemon +pv +pyenv +python +python-aiosqlite +python-capng +python-defusedxml +python-fastapi +python-lsp-server +python-packaging +python-pip +python-poetry +python-pylint-pydantic +python-pyparted +python-pyqt5 +python-pytest-ruff +python-python-multipart +python-reportlab +python-ruff +python-sqlalchemy +python-sqlalchemy-i18n +python-sqlalchemy-utils +qbittorrent +qemu-desktop +qemu-guest-agent +qt5-imageformats +qt5ct +qt6-imageformats +r8168-dkms +rate-mirrors-bin +realtime-privileges +rebuild-detector +refind +reflector +ripgrep +rp-pppoe +rsync +rtkit +rtl8821cu-morrownr-dkms-git +ruff +ruff-lsp +rust-analyzer +rust-musl +rustup +s-nail +samba-support +sbctl +sbsigntools +scanner-support +sccache +screen +screenfetch +sddm +sddm-kcm +sdparm +sed +sequoia-sq +sg3_utils +shadowsocks-electron-bin +simple-scan +smartmontools +smbclient +snapd +snapd-glib +snowflake-pt-client-git +sof-firmware +sofirem-git +solid +spectacle +spice-vdagent +splix +sqlitebrowser +squashfs-tools +sshguard +sshpass +sublime-text-4 +sudo +sysfsutils +syslinux +syslog-ng +system-config-printer +systemd-kcm +systemd-oomd-defaults +systemd-resolvconf +systemd-ukify +tailwindcss-language-server +tcpdump +teams-for-linux +telegram-desktop-bin +terminus-font +testdisk +texinfo +the_silver_searcher +thunderbird +thunderbird-i18n-ru +timeshift +timeshift-autosnap +tldr +tmux +topgrade +tor +tor-browser-bin +tor-router +tpm2-tools +tpm2-tss +traceroute +tracker3-miners +translate-shell +transmission-qt +tree +ttf-bitstream-vera +ttf-dejavu +ttf-dejavu-nerd +ttf-droid +ttf-fira-code +ttf-fira-sans +ttf-firacode-nerd +ttf-font-awesome +ttf-hack +ttf-hack-nerd +ttf-jetbrains-mono +ttf-jetbrains-mono-nerd +ttf-liberation +ttf-liberation-mono-nerd +ttf-ms-fonts +ttf-nerd-fonts-symbols +ttf-nerd-fonts-symbols-common +ttf-nerd-fonts-symbols-mono +ttf-noto-nerd +ttf-opensans +ttf-roboto +ttf-roboto-mono +ttf-roboto-mono-nerd +ttf-sourcecodepro-nerd +ttf-terminus-nerd +ttf-twemoji +ttf-ubuntu-font-family +ttf-ubuntu-mono-nerd +ttf-ubuntu-nerd +tumbler +tuned +tuned-ppd +typescript +typescript-language-server +udftools +udiskie +udisks2 +unace +unicorn +unifetch +unrar +unzip +upd72020x-fw +upower +usb_modeswitch +usbmuxd +usbutils +uv +uvicorn +v4l2loopback-dkms +variety +ventoy-bin +virt-firmware +virt-manager +virt-viewer +virtualbox-guest-utils +visual-studio-code-bin +vivaldi +vlc-luajit +vpnc +vscode-json-languageserver +vue-language-server +waydroid-git +waydroid-helper +waydroid-script-git +wd719x-firmware +webtunnel-git +weston +wget +wget2 +which +whois +wireguard-tools +wireless-regdb +wireless_tools +wireplumber +wl-clipboard +wpa_supplicant +wvdial +xcompmgr +xdg-desktop-portal +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +xdg-utils +xed +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-synaptics +xf86-input-vmmouse +xf86-input-void +xf86-video-amdgpu +xf86-video-fbdev +xf86-video-qxl +xfsprogs +xl2tpd +xmlstarlet +xorg-server +xorg-xdpyinfo +xorg-xhost +xorg-xinit +xorg-xinput +xorg-xkill +xorg-xrandr +xorg-xrdb +xsettingsd +xz +yad +yakuake +yaml-language-server +yandex-disk +yandex-disk-indicator +yarn +yay +zapret-git +zed +zenity +zoom +zram-generator diff --git a/Melawy-Linux-Developer-Edition/pacman_sys.conf b/Melawy-Linux-Developer-Edition/pacman_sys.conf index 03c93c6..fb63c62 100644 --- a/Melawy-Linux-Developer-Edition/pacman_sys.conf +++ b/Melawy-Linux-Developer-Edition/pacman_sys.conf @@ -1,41 +1,38 @@ -# # /etc/pacman.conf -# +# +# # See the pacman.conf(5) manpage for option and repository directives -# +# # GENERAL OPTIONS -# +# [options] # The following paths are commented out with their default values listed. # If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = base base-devel pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled +# RootDir = / +# DBPath = /var/lib/pacman/ +# CacheDir = /var/cache/pacman/pkg/ +# LogFile = /var/log/pacman.log +# GPGDir = /etc/pacman.d/gnupg/ +# HookDir = /etc/pacman.d/hooks/ +HoldPkg = base base-devel pacman glibc +# XferCommand = /usr/bin/curl -L -C - -f -o %o %u +# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# CleanMethod = KeepInstalled Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog +# IgnoreGroup = +# NoUpgrade = +# NoExtract = +# UseSyslog Color ILoveCandy -#NoProgressBar -#TotalDownload +# NoProgressBar +# TotalDownload # We cannot check disk space from within a chroot environment -#CheckSpace +# CheckSpace VerbosePkgLists DisableDownloadTimeout ParallelDownloads = 10 @@ -44,7 +41,7 @@ ParallelDownloads = 10 # trusts (see pacman-key and its man page), as well as unsigned packages. SigLevel = Required DatabaseOptional LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required +# RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux @@ -79,14 +76,20 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist [melawy-core] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[core-testing] -#Include = /etc/pacman.d/mirrorlist +# [cache] +# SigLevel = Optional +# Server = http://10.120.152.1/$repo/$arch +# Server = http://192.168.1.250/$repo/$arch +# Server = https://repo.melawy.ru/$repo/$arch + +# [core-testing] +# Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist +# [extra-testing] +# Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist @@ -94,8 +97,8 @@ Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +# [multilib-testing] +# Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist @@ -103,12 +106,6 @@ Include = /etc/pacman.d/mirrorlist [melawy-3party] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[cache] -#SigLevel = Optional -#Server = http://10.120.152.1/$repo/$arch -#Server = http://192.168.1.250/$repo/$arch -#Server = https://repo.melawy.ru/$repo/$arch - # [cachyos-iso] # Server = https://mirror.cachyos.org/repo/$arch/$repo # @@ -119,12 +116,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] @@ -135,6 +135,6 @@ Include = /etc/pacman.d/endeavouros-mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs +# [custom] +# SigLevel = Optional TrustAll +# Server = file:///home/custompkgs diff --git a/Melawy-Linux-Developer-Edition/syslinux/archiso_pxe-linux.cfg b/Melawy-Linux-Developer-Edition/syslinux/archiso_pxe-linux.cfg index fa2865d..bedf9cb 100644 --- a/Melawy-Linux-Developer-Edition/syslinux/archiso_pxe-linux.cfg +++ b/Melawy-Linux-Developer-Edition/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium using NBD. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the Melawy Linux live medium using NFS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the Melawy Linux live medium using HTTP. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y SYSAPPEND 3 diff --git a/Melawy-Linux-Developer-Edition/syslinux/archiso_sys-linux.cfg b/Melawy-Linux-Developer-Edition/syslinux/archiso_sys-linux.cfg index 62ccdc7..da2d37e 100644 --- a/Melawy-Linux-Developer-Edition/syslinux/archiso_sys-linux.cfg +++ b/Melawy-Linux-Developer-Edition/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium on BIOS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium default (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Nvidia propritary (Non-Free) @@ -15,8 +15,8 @@ Boot the Melawy Linux install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium NVIDIA (latest cards, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Fallback (nomodeset) @@ -26,8 +26,8 @@ Boot the Melawy Linux install medium on Bios in fallback mode. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium Fallback (nomodeset, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes quiet splash bgrt_disable # Accessibility boot option @@ -37,6 +37,6 @@ Boot the Melawy Linux install medium on BIOS with speakup screen reader. It allows you to install Melawy Linux or perform system maintenance with speech feedback. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on diff --git a/Melawy-Linux-Developer-Edition/time.log b/Melawy-Linux-Developer-Edition/time.log index e69de29..0e5c26f 100644 --- a/Melawy-Linux-Developer-Edition/time.log +++ b/Melawy-Linux-Developer-Edition/time.log @@ -0,0 +1,3 @@ + +clean Elapsed: 0hrs 0min 0sec + diff --git a/Melawy-Linux-NetInstall/_base_and_developer_edition.yaml b/Melawy-Linux-NetInstall/_base_and_developer_edition.yaml index eaf7c4f..904b001 100644 --- a/Melawy-Linux-NetInstall/_base_and_developer_edition.yaml +++ b/Melawy-Linux-NetInstall/_base_and_developer_edition.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-NetInstall/_base_system.yaml b/Melawy-Linux-NetInstall/_base_system.yaml index d166d4b..b9c4a56 100644 --- a/Melawy-Linux-NetInstall/_base_system.yaml +++ b/Melawy-Linux-NetInstall/_base_system.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-NetInstall/_netinstall_only.yaml b/Melawy-Linux-NetInstall/_netinstall_only.yaml index 6c95edd..f4563f3 100644 --- a/Melawy-Linux-NetInstall/_netinstall_only.yaml +++ b/Melawy-Linux-NetInstall/_netinstall_only.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -362,6 +359,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +399,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +592,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +621,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +663,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +743,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +896,9 @@ description: "Add Code IDE and programming language package" selected: false packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +931,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +939,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +973,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1013,7 @@ description: "Add the mail applications" selected: false packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1021,7 @@ description: "Add the mail applications" selected: false packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux.preset b/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux-xanmod.preset similarity index 58% rename from Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux.preset rename to Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux-xanmod.preset index 7c25186..3428b60 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux.preset +++ b/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux-xanmod.preset @@ -1,6 +1,6 @@ # mkinitcpio preset file for the 'Melawy Linux' package on archiso -KNAME="cachyos" +KNAME="xanmod" KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1) @@ -8,11 +8,11 @@ if [[ -z "$KVER" ]]; then exit fi -cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-cachyos" +cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-xanmod-anbox" PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux-cachyos' +ALL_kver='/boot/vmlinuz-xanmod-anbox' archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' -archiso_image="/boot/initramfs-linux-cachyos.img" +archiso_image="/boot/initramfs-xanmod-anbox.img" diff --git a/Melawy-Linux-NetInstall/airootfs/etc/motd b/Melawy-Linux-NetInstall/airootfs/etc/motd index 46bf986..e69de29 100755 --- a/Melawy-Linux-NetInstall/airootfs/etc/motd +++ b/Melawy-Linux-NetInstall/airootfs/etc/motd @@ -1,46 +0,0 @@ -Info: -This ISO is based on Arch-ISO modified hugely to provide Installation Environment for Melawy Linux. -https://melawy.ru - -Melawy Linux-archiso Sources: -https://gitlab.com/melawy - -Arch-ISO Source: -https://gitlab.archlinux.org/archlinux/archiso - -Calamares as our installer: -https://github.com/calamares/calamares - -Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. ------------------- - -News: -https://melawy.ru -https://en.melawy.ru - -https://techhub.social/@Melawy - -https://t.me/Melawy_Linux ------------------- - -Chat: -https://t.me/Melawy_Linux_Chat ------------------- - -Help: -https://melawy.ru -https://github.com/Melawy/Develop/wiki -https://github.com/Melawy/Develop/issues - -Bugs can be reported here: -https://github.com/Melawy/Develop/issues ------------------- - -Our journey wouldn't be made possible without the donates: -https://melawy.ru/donate ------------------- - -Thank you for donating your trust in us! - -Welcome to your Melawy Linux ------------------- diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf index 5dbd9c6..0870091 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf index e5958e1..305607f 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf @@ -111,12 +111,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf index 9e11ad6..b81119d 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf @@ -105,12 +105,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist index 5c6ea02..15e0581 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2025-01-25 00:01:01 UTC +# When: 2025-06-15 16:15:31 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2025-01-25 00:00:07 UTC -# Last Check: 2025-01-24 23:44:23 UTC +# Retrieved: 2025-06-15 16:13:54 UTC +# Last Check: 2025-06-15 16:00:51 UTC -Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch -Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://cdnmirror.com/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch -Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch +Server = http://cdnmirror.com/archlinux/$repo/os/$arch Server = https://de.arch.niranjan.co/$repo/os/$arch -Server = http://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch +Server = https://mirror.pseudoform.org/$repo/os/$arch Server = http://de.arch.niranjan.co/$repo/os/$arch +Server = http://mirror.bakertelekom.fr/Arch/$repo/os/$arch +Server = https://taipei.mirror.pkgbuild.com/$repo/os/$arch +Server = https://mirror.lcarilla.de/archlinux/$repo/os/$arch +Server = rsync://mirror.lcarilla.de/archlinux/$repo/os/$arch +Server = https://nz.arch.niranjan.co/$repo/os/$arch +Server = rsync://de.arch.niranjan.co/archlinux/$repo/os/$arch +Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch +Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = https://berlin.mirror.pkgbuild.com/$repo/os/$arch +Server = https://singapore.mirror.pkgbuild.com/$repo/os/$arch +Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch Server = http://archlinux.thaller.ws/$repo/os/$arch Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = https://de.arch.mirror.kescher.at/$repo/os/$arch -Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch -Server = rsync://mirror.peeres-telecom.fr/archlinux/$repo/os/$arch -Server = rsync://mirror.moson.org/arch/$repo/os/$arch diff --git a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf index ea90615..e654505 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf @@ -1,6 +1,7 @@ [General] -DisplayServer=x11-user +DisplayServer=wayland GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell +#InputMethod= [Wayland] CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1 --inputmethod maliit-keyboard diff --git a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/autologin.conf b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/autologin.conf new file mode 100644 index 0000000..2ace995 --- /dev/null +++ b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/autologin.conf @@ -0,0 +1,4 @@ +[Autologin] +Relogin=false +Session=plasma +User=liveuser diff --git a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf index ae8c334..94d6c8b 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf @@ -1,8 +1,3 @@ -[Autologin] -Relogin=false -Session=plasmax11 -User=liveuser - [General] HaltCommand=/usr/bin/systemctl poweroff RebootCommand=/usr/bin/systemctl reboot diff --git a/Melawy-Linux-NetInstall/airootfs/etc/tor/torrc b/Melawy-Linux-NetInstall/airootfs/etc/tor/torrc index cc5249b..31d42ec 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/tor/torrc +++ b/Melawy-Linux-NetInstall/airootfs/etc/tor/torrc @@ -47,7 +47,7 @@ Log notice syslog ## Uncomment this to start the process in the background... or use ## --runasdaemon 1 on the command line. This is ignored on Windows; ## see the FAQ entry if you want Tor to run as an NT service. -#RunAsDaemon 1 +RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. @@ -296,8 +296,15 @@ VirtualAddrNetwork 10.192.0.0/10 AutomapHostsOnResolve 1 TransPort 9040 DNSPort 6669 -ControlPort 9051 +# ControlPort 9051 ExcludeExitNodes {ru},{by},{cn},{??} ExitPolicy reject *:* HardwareAccel 1 NumCPUs 4 + +# Uncomment if your needed +# SocksPort 0.0.0.0:9050 +# SocksPolicy accept 192.168.1.0/24 +# SocksPolicy accept 127.0.0.0/8 +#SOCKSPolicy accept6 FC00::/7 +# SOCKSPolicy reject * diff --git a/Melawy-Linux-NetInstall/airootfs/root/airootfs.img b/Melawy-Linux-NetInstall/airootfs/root/airootfs.img new file mode 100644 index 0000000..816e823 Binary files /dev/null and b/Melawy-Linux-NetInstall/airootfs/root/airootfs.img differ diff --git a/Melawy-Linux-NetInstall/airootfs/root/airootfs.tar.zst b/Melawy-Linux-NetInstall/airootfs/root/airootfs.tar.zst new file mode 100644 index 0000000..ba2cb66 Binary files /dev/null and b/Melawy-Linux-NetInstall/airootfs/root/airootfs.tar.zst differ diff --git a/Melawy-Linux-NetInstall/airootfs/usr/local/bin/remove-unneeded b/Melawy-Linux-NetInstall/airootfs/usr/local/bin/remove-unneeded index 9433bd6..e5c1d6f 100755 --- a/Melawy-Linux-NetInstall/airootfs/usr/local/bin/remove-unneeded +++ b/Melawy-Linux-NetInstall/airootfs/usr/local/bin/remove-unneeded @@ -17,6 +17,7 @@ _clean_packages() { mkinitcpio-archiso mkinitcpio-busybox mkinitcpio-nfs-utils + mkinitcpio-firmware qemu-arm-aarch64-static-bin syslinux yaml-cpp diff --git a/Melawy-Linux-NetInstall/airootfs/var/lib/sddm/.config/kcminputrc b/Melawy-Linux-NetInstall/airootfs/var/lib/sddm/.config/kcminputrc index 03851aa..c57eb1a 100644 --- a/Melawy-Linux-NetInstall/airootfs/var/lib/sddm/.config/kcminputrc +++ b/Melawy-Linux-NetInstall/airootfs/var/lib/sddm/.config/kcminputrc @@ -6,6 +6,7 @@ NumLock=0 [Mouse] X11LibInputXAccelProfileFlat=true +cursorTheme=Melawy-red-light-default-cursors [Tmp] update_info=delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 9ea54d2..c4a76a5 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Open-Source Drivers) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 05efd9a..a1581f9 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Nvidia Drivers. Video card Nvidia GTX 900+) sort-key 02 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf index be97e77..4871116 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-linux-nomodeset.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 03 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf index 57bf37d..e0e6d25 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-linux-nomodeset-2.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Safe mode graphics) sort-key 04 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf index 9e7a68a..3c03c34 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-speech.conf @@ -1,5 +1,5 @@ title Melawy Linux x86_64 UEFI (Speech) sort-key 05 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap accessibility=on diff --git a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_and_developer_edition.py b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_and_developer_edition.py index 7b98fa9..b9a1598 100755 --- a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_and_developer_edition.py +++ b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_and_developer_edition.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_system.py b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_system.py index a15b1fa..79db6aa 100755 --- a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_system.py +++ b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_base_system.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall.py b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall.py index 53cdb1f..eaf8056 100755 --- a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall.py +++ b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall_only.py b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall_only.py index 3100212..f3eed8a 100755 --- a/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall_only.py +++ b/Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall_only.py @@ -92,6 +92,9 @@ def get_packages(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() with open(filename, mode="rt") as f: lines = f.readlines() @@ -121,6 +124,10 @@ def get_packages_v2(filename): Returns: _type_: _description_ """ + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, "rt") as f: doc = yaml.safe_load(f) @@ -143,6 +150,10 @@ def get_packages_v2(filename): def write_new_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -154,6 +165,10 @@ def write_new_packages_x86_64(filename, packages_x86_64_new: list): def usort_packages(filename): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename3, "rt") as f: lines = f.readlines() @@ -174,6 +189,10 @@ def usort_packages(filename): def write_new_sorted_packages_x86_64(filename, packages_x86_64_new: list): + if not os.path.exists(filename): + with open(filename, 'w') as f: + f.close() + with open(filename, mode="wt+") as f: if isinstance(packages_x86_64_new, list): @@ -209,7 +228,7 @@ ddrescue edk2-shell gpart rsync -melawy-calamares-git +melawy-calamares melawy-calamares-config melawy-skel-liveuser memtest86+ diff --git a/Melawy-Linux-NetInstall/grub/grub.cfg b/Melawy-Linux-NetInstall/grub/grub.cfg index a95bb7c..27ed5f7 100644 --- a/Melawy-Linux-NetInstall/grub/grub.cfg +++ b/Melawy-Linux-NetInstall/grub/grub.cfg @@ -91,35 +91,35 @@ fi menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { load_video set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility' { set gfxpayload=800x600,1024x768,1366x768,1920x1080 - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-NetInstall/grub/loopback.cfg b/Melawy-Linux-NetInstall/grub/loopback.cfg index 1792470..ec50db2 100644 --- a/Melawy-Linux-NetInstall/grub/loopback.cfg +++ b/Melawy-Linux-NetInstall/grub/loopback.cfg @@ -13,32 +13,32 @@ timeout_style=menu # Menu entries menuentry "Melawy Linux (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Nvidia Drivers. Video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Safe mode graphics)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Without graphics options)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux without graphics options' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvme_load=yes add_efi_memmap quiet splash bgrt_disable + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } menuentry "Melawy Linux (Speech)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux accessibility on' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/Melawy-Linux-NetInstall/netinstall.yaml b/Melawy-Linux-NetInstall/netinstall.yaml index 0c792d4..9adb788 100644 --- a/Melawy-Linux-NetInstall/netinstall.yaml +++ b/Melawy-Linux-NetInstall/netinstall.yaml @@ -22,8 +22,8 @@ - linux-firmware - linux-firmware-marvell - linux-api-headers - - linux-cachyos - - linux-cachyos-headers + - linux-xanmod-anbox + - linux-xanmod-anbox-headers - base - base-devel @@ -121,7 +121,6 @@ - virtualbox-guest-utils - xf86-input-vmmouse - xf86-video-qxl - - xf86-video-vmware - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)" description: "Filesystem tools and applications" @@ -150,7 +149,6 @@ - nvme-cli - open-iscsi - pcsclite - - reiserfsprogs - samba-support - sbsigntools - smartmontools @@ -167,7 +165,7 @@ selected: true packages: - btrfs-assistant - - btrfs-snapshots + - btrfs-snapshots-git - btrfsmaintenance - timeshift - timeshift-autosnap @@ -245,7 +243,6 @@ - most - nano - nano-syntax-highlighting - - neofetch - neovim - nmap - ntp @@ -281,6 +278,7 @@ - tree - ttf-terminus-nerd - unace + - unifetch - unrar - unzip - usbutils @@ -362,6 +360,7 @@ - wpa_supplicant - wvdial - xl2tpd + - amneziavpn - amneziawg-dkms - amneziawg-go - amneziawg-tools @@ -401,6 +400,8 @@ - xorg-xrandr - xorg-xrdb - xsettingsd + - picom + - xcompmgr - name: "V4L2 drivers (base_system) (base_and_developer_edition) (full netinstall)" description: "V4L2 video, webcamera drivers" @@ -592,8 +593,8 @@ - name: "Updater (base_system) (base_and_developer_edition) (full netinstall)" selected: true packages: - - melawy-arch-linux-updater - - melawy-arch-linux-updater-tray + - melawy-linux-updater + - melawy-linux-updater-tray - name: "Desktop integration" description: "Useful helper tools and libs for desktop usage" @@ -621,6 +622,8 @@ description: "Desktop environment" selected: true packages: + - wl-clipboard + - weston - accountsservice - akonadi - akonadi-calendar @@ -661,6 +664,8 @@ - gstreamer - gstreamer-meta - gwenview + - ibus + - ibus-typing-booster - karchive5 - kate - kcalc @@ -739,7 +744,6 @@ - xdg-user-dirs - xdg-user-dirs-gtk - xdg-utils - - xwaylandvideobridge - name: "Package management (base_system) (base_and_developer_edition) (full netinstall)" description: "Packages tools" @@ -893,6 +897,9 @@ description: "Add Code IDE and programming language package" selected: true packages: + - waydroid-git + - waydroid-helper + - waydroid-script-git - android-emulator - android-ndk - android-platform @@ -925,6 +932,7 @@ - git-lfs - go - go-tools + - hypercorn - icu69 - jdk-openjdk - jq @@ -932,21 +940,29 @@ - lldb - llvm - llvm-libs + - lua-language-server - lua51 - luarocks - - lua-language-server - make - mold - mypy - nodejs - npm - perl + - pyenv - python + - python-aiosqlite + - python-fastapi - python-lsp-server - python-pip - python-poetry + - python-pylint-pydantic - python-pytest-ruff + - python-python-multipart - python-ruff + - python-sqlalchemy + - python-sqlalchemy-i18n + - python-sqlalchemy-utils - ruff - ruff-lsp - rust-analyzer @@ -958,7 +974,9 @@ - tailwindcss-language-server - typescript - typescript-language-server + - unicorn - uv + - uvicorn - visual-studio-code-bin - vscode-json-languageserver - vue-language-server @@ -996,7 +1014,7 @@ description: "Add the mail applications" selected: true packages: - - discord_arch_electron + - legcord - telegram-desktop-bin - zoom @@ -1004,7 +1022,7 @@ description: "Add the mail applications" selected: true packages: - - skypeforlinux-bin + - teams-for-linux - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)" description: "Add the mail applications" diff --git a/Melawy-Linux-NetInstall/packages.x86_64 b/Melawy-Linux-NetInstall/packages.x86_64 new file mode 100644 index 0000000..444ab9c --- /dev/null +++ b/Melawy-Linux-NetInstall/packages.x86_64 @@ -0,0 +1,427 @@ +accountsservice +adw-gtk-theme +aic94xx-firmware +alsa-firmware +alsa-lib +alsa-plugins +alsa-utils +amd-ucode +amneziavpn +amneziawg-dkms +amneziawg-go +amneziawg-tools +ananicy-cpp +archiso +archlinux-keyring +arcolinux-keyring +arcolinux-mirrorlist-git +ark +aspell +aspell-en +aspell-ru +ast-firmware +audiocd-kio +avahi +awesome-terminal-fonts +b43-fwcutter +base +base-devel +bash-completion +bat +bcachefs-tools +beep +blueberry +bluedevil +bluetooth-support +bluez +bluez-hid2hci +bluez-libs +bluez-utils +breeze +breeze-gtk +bridge-utils +brltty +broadcom-wl-dkms +btop +btrfs-progs +busybox +cachyos-ananicy-rules-git +cachyos-keyring +cachyos-mirrorlist +cachyos-settings +cantarell-fonts +chaotic-keyring +chaotic-mirrorlist +chwd +clonezilla +cpupower +cronie +cryfs +cryptsetup +dbus-broker +ddrescue +device-mapper +dex +dhclient +dhcpcd +dialog +diffutils +dmidecode +dmraid +dnscrypt-proxy +dnsmasq +dnsutils +dolphin +dolphin-plugins +dosfstools +doublecmd-qt6 +dracut +dracut-luks-autounlock +duf +e2fsprogs +edk2-shell +efibootmgr +efitools +encfs +endeavouros-keyring +endeavouros-mirrorlist +espeak-ng +ethtool +exfatprogs +expac +expect +f2fs-tools +fastfetch +fatresize +file-roller +find-the-command +findutils +firefox +firefox-i18n-ru +firewalld +freetype2 +fsarchiver +fwupd +fwupd-efi +git +glances +gnome-settings-daemon +gnome-themes-extra +gocryptfs +gpart +gparted +gpm +gptfdisk +grub +gsettings-desktop-schemas +gsettings-qt +gtk-engine-murrine +gwenview +hardcode-fixer-git +hardinfo2 +haveged +hdparm +htop +hunspell +hunspell-en_us +hunspell-ru +hw-probe +hwdetect +hwinfo +hyperv +iftop +imwheel +inetutils +intel-ucode +inxi +iotop-c +iptables-nft +iw +iwd +jfsutils +kate +kcalc +kde-gtk-config +kdeconnect +kdeplasma-addons +kgamma +kimageformats +kimageformats5 +kinfocenter +kinit +kio-fuse +klassy +klassy-qt5 +konsole +kpmcore +kscreen +kwallet-pam +laptop-detect +ldns +less +lftp +lib32-pipewire +libappindicator-gtk3 +libfido2 +libmicrohttpd +libmtp +libusb-compat +libva-intel-driver +libva-utils +libvirt +libwnck3 +linux-api-headers +linux-atm +linux-firmware +linux-firmware-marvell +linux-xanmod-anbox +linux-xanmod-anbox-headers +logrotate +lolcat +lsb-release +lshw +lsscsi +lua-filesystem +lvm2 +lxappearance-gtk3 +lynx +lyrebird-proxy +malcontent +maliit-keyboard +man-db +man-pages +manjaro-keyring +mbedtls +mbedtls2 +mc +mdadm +melawy-branding +melawy-calamares +melawy-calamares-config +melawy-check-reboot-required +melawy-dracut-initramfs +melawy-dracut-ukify +melawy-etc-skel-std-powerman-kvantum +melawy-icon-theme-kde6 +melawy-kde-theme-nier-a2-kde6 +melawy-linux-keyring +melawy-linux-mirrorlist +melawy-linux-updater +melawy-linux-updater-tray +melawy-linux-welcome +melawy-pamac-helper +melawy-plymouth-theme-hard-install-nier-a2 +melawy-plymouth-theme-nier-a2 +melawy-red-light-default-cursors +melawy-refind-menu-generator +melawy-refind-theme-hard-install-nier-a2 +melawy-skel-liveuser +melawy-skel-root +melawy-theme-kde6 +memtest86+ +memtest86+-efi +mesa +mesa-utils +mkinitcpio +mkinitcpio-archiso +mkinitcpio-firmware +mkinitcpio-nfs-utils +mkinitcpio-openswap +mlocate +mobile-broadband-provider-info +modemmanager +most +mousetweaks +mtools +mtpfs +nano +nano-syntax-highlighting +nbd +ndisc6 +neovim +net-tools +netctl +network-manager-applet +networkmanager +networkmanager-l2tp +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-qt +networkmanager-qt5 +networkmanager-strongswan +networkmanager-vpnc +nfs-utils +nilfs-utils +nmap +noto-color-emoji-fontconfig +noto-fonts +noto-fonts-cjk +noto-fonts-emoji +noto-fonts-extra +nss-mdns +ntfs-3g +ntp +nvme-cli +obfs4proxy +okular +open-iscsi +open-vm-tools +openbsd-netcat +openconnect +openssh +openvpn +orca +os-prober +p7zip +pacman +pacman-contrib +pacman-mirrorlist +partclone +parted +partimage +partitionmanager +pavucontrol +pipewire +pipewire-alsa +pipewire-jack +pipewire-pulse +pipewire-support +plasma-desktop +plasma-disks +plasma-firewall +plasma-nm +plasma-pa +plasma-systemmonitor +plymouth +powerdevil +powerline +powerline-common +powerline-fonts +powersave-tweaks +ppp +pptpclient +preload +procps-ng +pv +python-capng +python-defusedxml +python-packaging +python-pyparted +python-pyqt5 +qemu-guest-agent +r8168-dkms +rate-mirrors-bin +realtime-privileges +refind +reflector +ripgrep +rp-pppoe +rsync +rtkit +rtl8821cu-morrownr-dkms-git +s-nail +samba-support +sbctl +sbsigntools +screen +screenfetch +sddm +sddm-kcm +sdparm +sed +sg3_utils +smartmontools +snowflake-pt-client-git +sof-firmware +spectacle +spice-vdagent +squashfs-tools +sshpass +sudo +sysfsutils +syslinux +syslog-ng +systemd-oomd-defaults +systemd-resolvconf +systemd-ukify +tcpdump +terminus-font +testdisk +texinfo +tldr +tmux +tor +tor-browser-bin +tor-router +tpm2-tools +tpm2-tss +traceroute +tracker3-miners +tree +ttf-hack +ttf-hack-nerd +ttf-ms-fonts +ttf-noto-nerd +ttf-terminus-nerd +ttf-twemoji +tuned +tuned-ppd +udftools +udiskie +udisks2 +unace +unifetch +unrar +unzip +upd72020x-fw +upower +usb_modeswitch +usbmuxd +usbutils +ventoy-bin +virtualbox-guest-utils +vpnc +wd719x-firmware +webtunnel-git +wget +wget2 +which +whois +wireguard-tools +wireless-regdb +wireless_tools +wireplumber +wpa_supplicant +wvdial +xdg-desktop-portal +xdg-desktop-portal-kde +xdg-user-dirs +xdg-user-dirs-gtk +xdg-utils +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-synaptics +xf86-input-vmmouse +xf86-input-void +xf86-video-amdgpu +xf86-video-fbdev +xf86-video-qxl +xfsprogs +xl2tpd +xmlstarlet +xorg-server +xorg-xdpyinfo +xorg-xhost +xorg-xinit +xorg-xinput +xorg-xkill +xorg-xrandr +xorg-xrdb +xsettingsd +xz +yad +zapret-git +zenity +zram-generator diff --git a/Melawy-Linux-NetInstall/packages.x86_64_melawy b/Melawy-Linux-NetInstall/packages.x86_64_melawy index 093b2f9..444ab9c 100644 --- a/Melawy-Linux-NetInstall/packages.x86_64_melawy +++ b/Melawy-Linux-NetInstall/packages.x86_64_melawy @@ -6,6 +6,7 @@ alsa-lib alsa-plugins alsa-utils amd-ucode +amneziavpn amneziawg-dkms amneziawg-go amneziawg-tools @@ -89,7 +90,6 @@ ethtool exfatprogs expac expect -extra/kpmcore f2fs-tools fastfetch fatresize @@ -153,6 +153,7 @@ kio-fuse klassy klassy-qt5 konsole +kpmcore kscreen kwallet-pam laptop-detect @@ -171,10 +172,10 @@ libvirt libwnck3 linux-api-headers linux-atm -linux-cachyos -linux-cachyos-headers linux-firmware linux-firmware-marvell +linux-xanmod-anbox +linux-xanmod-anbox-headers logrotate lolcat lsb-release @@ -194,10 +195,9 @@ mbedtls mbedtls2 mc mdadm -melawy-arch-linux-updater -melawy-arch-linux-updater-tray melawy-branding -melawy-calamares-git +melawy-calamares +melawy-calamares-config melawy-check-reboot-required melawy-dracut-initramfs melawy-dracut-ukify @@ -206,6 +206,10 @@ melawy-icon-theme-kde6 melawy-kde-theme-nier-a2-kde6 melawy-linux-keyring melawy-linux-mirrorlist +melawy-linux-updater +melawy-linux-updater-tray +melawy-linux-welcome +melawy-pamac-helper melawy-plymouth-theme-hard-install-nier-a2 melawy-plymouth-theme-nier-a2 melawy-red-light-default-cursors @@ -234,7 +238,6 @@ nano nano-syntax-highlighting nbd ndisc6 -neofetch neovim net-tools netctl @@ -312,7 +315,6 @@ rate-mirrors-bin realtime-privileges refind reflector -reiserfsprogs ripgrep rp-pppoe rsync @@ -369,6 +371,7 @@ udftools udiskie udisks2 unace +unifetch unrar unzip upd72020x-fw @@ -405,7 +408,6 @@ xf86-input-void xf86-video-amdgpu xf86-video-fbdev xf86-video-qxl -xf86-video-vmware xfsprogs xl2tpd xmlstarlet @@ -420,5 +422,6 @@ xorg-xrdb xsettingsd xz yad +zapret-git zenity zram-generator diff --git a/Melawy-Linux-NetInstall/pacman_sys.conf b/Melawy-Linux-NetInstall/pacman_sys.conf index 03c93c6..fb63c62 100644 --- a/Melawy-Linux-NetInstall/pacman_sys.conf +++ b/Melawy-Linux-NetInstall/pacman_sys.conf @@ -1,41 +1,38 @@ -# # /etc/pacman.conf -# +# +# # See the pacman.conf(5) manpage for option and repository directives -# +# # GENERAL OPTIONS -# +# [options] # The following paths are commented out with their default values listed. # If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = base base-devel pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled +# RootDir = / +# DBPath = /var/lib/pacman/ +# CacheDir = /var/cache/pacman/pkg/ +# LogFile = /var/log/pacman.log +# GPGDir = /etc/pacman.d/gnupg/ +# HookDir = /etc/pacman.d/hooks/ +HoldPkg = base base-devel pacman glibc +# XferCommand = /usr/bin/curl -L -C - -f -o %o %u +# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# CleanMethod = KeepInstalled Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog +# IgnoreGroup = +# NoUpgrade = +# NoExtract = +# UseSyslog Color ILoveCandy -#NoProgressBar -#TotalDownload +# NoProgressBar +# TotalDownload # We cannot check disk space from within a chroot environment -#CheckSpace +# CheckSpace VerbosePkgLists DisableDownloadTimeout ParallelDownloads = 10 @@ -44,7 +41,7 @@ ParallelDownloads = 10 # trusts (see pacman-key and its man page), as well as unsigned packages. SigLevel = Required DatabaseOptional LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required +# RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux @@ -79,14 +76,20 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist [melawy-core] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[core-testing] -#Include = /etc/pacman.d/mirrorlist +# [cache] +# SigLevel = Optional +# Server = http://10.120.152.1/$repo/$arch +# Server = http://192.168.1.250/$repo/$arch +# Server = https://repo.melawy.ru/$repo/$arch + +# [core-testing] +# Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist +# [extra-testing] +# Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist @@ -94,8 +97,8 @@ Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +# [multilib-testing] +# Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist @@ -103,12 +106,6 @@ Include = /etc/pacman.d/mirrorlist [melawy-3party] Include = /etc/pacman.d/melawy-linux-mirrorlist -#[cache] -#SigLevel = Optional -#Server = http://10.120.152.1/$repo/$arch -#Server = http://192.168.1.250/$repo/$arch -#Server = https://repo.melawy.ru/$repo/$arch - # [cachyos-iso] # Server = https://mirror.cachyos.org/repo/$arch/$repo # @@ -119,12 +116,15 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist Include = /etc/pacman.d/chaotic-mirrorlist [arcolinux_repo] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist -[arcolinux_repo_xlarge] -Include = /etc/pacman.d/arcolinux-mirrorlist +#[arcolinux_repo_xlarge] +#SigLevel = Never +#Include = /etc/pacman.d/arcolinux-mirrorlist [arcolinux_repo_3party] +SigLevel = Never Include = /etc/pacman.d/arcolinux-mirrorlist [garuda] @@ -135,6 +135,6 @@ Include = /etc/pacman.d/endeavouros-mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs +# [custom] +# SigLevel = Optional TrustAll +# Server = file:///home/custompkgs diff --git a/Melawy-Linux-NetInstall/syslinux/archiso_pxe-linux.cfg b/Melawy-Linux-NetInstall/syslinux/archiso_pxe-linux.cfg index fa2865d..bedf9cb 100644 --- a/Melawy-Linux-NetInstall/syslinux/archiso_pxe-linux.cfg +++ b/Melawy-Linux-NetInstall/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium using NBD. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the Melawy Linux live medium using NFS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the Melawy Linux live medium using HTTP. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y SYSAPPEND 3 diff --git a/Melawy-Linux-NetInstall/syslinux/archiso_sys-linux.cfg b/Melawy-Linux-NetInstall/syslinux/archiso_sys-linux.cfg index 62ccdc7..da2d37e 100644 --- a/Melawy-Linux-NetInstall/syslinux/archiso_sys-linux.cfg +++ b/Melawy-Linux-NetInstall/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the Melawy Linux install medium on BIOS. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium default (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Nvidia propritary (Non-Free) @@ -15,8 +15,8 @@ Boot the Melawy Linux install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium NVIDIA (latest cards, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable # Fallback (nomodeset) @@ -26,8 +26,8 @@ Boot the Melawy Linux install medium on Bios in fallback mode. It allows you to install Melawy Linux or perform system maintenance. ENDTEXT MENU LABEL Melawy Linux install medium Fallback (nomodeset, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes quiet splash bgrt_disable # Accessibility boot option @@ -37,6 +37,6 @@ Boot the Melawy Linux install medium on BIOS with speakup screen reader. It allows you to install Melawy Linux or perform system maintenance with speech feedback. ENDTEXT MENU LABEL Melawy Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-xanmod-anbox +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-xanmod-anbox.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on diff --git a/Melawy-Linux-NetInstall/time.log b/Melawy-Linux-NetInstall/time.log index e69de29..3b0ea19 100644 --- a/Melawy-Linux-NetInstall/time.log +++ b/Melawy-Linux-NetInstall/time.log @@ -0,0 +1,24 @@ + +clean Elapsed: 0hrs 0min 0sec + + +airootfs Elapsed: 0hrs 0min 1sec + + +check_internet Elapsed: 0hrs 0min 0sec + + +prepare Elapsed: 0hrs 0min 10sec + + +check_internet Elapsed: 0hrs 0min 0sec + + +build Elapsed: 1hrs 45min 19sec + + +sign Elapsed: 0hrs 2min 7sec + + +std_build Elapsed: 0hrs 0min 0sec + diff --git a/make.sh b/make.sh index d1bcac3..c824426 100755 --- a/make.sh +++ b/make.sh @@ -73,6 +73,8 @@ function clean() { rm -v airootfs/root/packages/*.pkg.tar.* rm -v airootfs/usr/share/packages/*.pkg.tar.* + find /var/cache/pacman/pkg/ -name "*calamares*" -exec rm -v {} \; + ELAPSED="Elapsed: $(($SECONDS / 3600))hrs $((($SECONDS / 60) % 60))min $(($SECONDS % 60))sec" echo -e "\n$FUNCNAME $ELAPSED\n" > "$CWD/$dir/time.log" @@ -130,7 +132,9 @@ function airootfs() { losetup -f "$airootfs_img" airootfs_device=$(losetup -a | grep "$airootfs_img" | cut -d: -f1) - mkdir "$airootfs_img_dir" + if [ ! -d "$airootfs_img_dir" ]; then + mkdir "$airootfs_img_dir" + fi mount $airootfs_device "$airootfs_img_dir" success_mount=$(mount | grep "$airootfs_img") @@ -139,6 +143,11 @@ function airootfs() { fi umount $airootfs_device + if [[ "$?" -ne 0 ]]; then + echo "Need unmount manual $airootfs_device $airootfs_img_dir" + fi + + losetup -D if [[ "$?" -ne 0 ]]; then echo "Need unmount manual $airootfs_device $airootfs_img_dir" exit @@ -193,8 +202,8 @@ function prepare() { systemd-boot-dracut libxvmc linux-api-headers - linux-cachyos - linux-cachyos-headers + linux-xanmod-anbox + linux-xanmod-anbox-headers melawy-dracut-initramfs melawy-dracut-ukify melawy-refind-menu-generator diff --git a/pwd.txt b/pwd.txt index 9c49fbd..26ea645 100644 --- a/pwd.txt +++ b/pwd.txt @@ -1 +1 @@ -/data/data/melawy-archiso-config \ No newline at end of file +/data/github/active/Melawy/Melawy-Dev/MELAWY/Installer/melawy-archiso-config \ No newline at end of file diff --git a/rsync_to_home_on_server.sh b/rsync_to_home_on_server.sh new file mode 100755 index 0000000..8ccade8 --- /dev/null +++ b/rsync_to_home_on_server.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +echo "Sending" + +rsync -avP --delete-after --progress "./sf/" "/var/www/www/transmission/downloads/" + +for i in $(find "./sf/" -name "*.torrent") +do + rsync -avP --delete-after --progress "$i" "/var/www/www/transmission/torrents/" +done