diff options
Diffstat (limited to 'raveos-calamares-theme/etc/calamares/modules')
11 files changed, 99 insertions, 6 deletions
diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh index 0596232..cc85727 100644 --- a/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh +++ b/raveos-calamares-theme/etc/calamares/modules/calamares-gpu-drivers.sh @@ -15,7 +15,7 @@ install_pkgs mesa libglvnd vulkan-icd-loader if echo "$GPU_INFO" | grep -qi "Intel"; then echo ">>> [gpu] Installing Intel stack..." - install_pkgs mesa vulkan-intel intel-media-driver + install_pkgs mesa lib32-mesa vulkan-intel lib32-vulkan-intel intel-media-driver fi if echo "$GPU_INFO" | grep -qi "AMD\|ATI"; then diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-snapper-setup.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-snapper-setup.sh new file mode 100644 index 0000000..3ed64f3 --- /dev/null +++ b/raveos-calamares-theme/etc/calamares/modules/calamares-snapper-setup.sh @@ -0,0 +1,55 @@ +#!/bin/bash +set -e + +echo ">>> [snapper-setup] Running INSIDE target system" + +if [ "$(findmnt -no FSTYPE /)" != "btrfs" ]; then + echo ">>> [snapper-setup] Root is not btrfs, skipping." + exit 0 +fi + +if ! command -v snapper >/dev/null 2>&1; then + echo ">>> [snapper-setup] snapper is not installed, skipping." + exit 0 +fi + +if ! findmnt -no SOURCE /.snapshots >/dev/null 2>&1; then + echo ">>> [snapper-setup] /.snapshots is not mounted, skipping." + exit 0 +fi + +SABLON=/usr/share/snapper/config-templates/default +[ -f "$SABLON" ] || { echo ">>> [snapper-setup] Missing template $SABLON"; exit 1; } + +install -d -m 755 /etc/snapper/configs +sed -e 's/^SUBVOLUME=.*/SUBVOLUME="\/"/' \ + -e 's/^FSTYPE=.*/FSTYPE="btrfs"/' \ + -e 's/^ALLOW_GROUPS=.*/ALLOW_GROUPS="wheel"/' \ + -e 's/^SYNC_ACL=.*/SYNC_ACL="yes"/' \ + -e 's/^NUMBER_CLEANUP=.*/NUMBER_CLEANUP="yes"/' \ + -e 's/^NUMBER_LIMIT=.*/NUMBER_LIMIT="10"/' \ + -e 's/^NUMBER_LIMIT_IMPORTANT=.*/NUMBER_LIMIT_IMPORTANT="5"/' \ + -e 's/^TIMELINE_CREATE=.*/TIMELINE_CREATE="no"/' \ + -e 's/^TIMELINE_CLEANUP=.*/TIMELINE_CLEANUP="yes"/' \ + -e 's/^EMPTY_PRE_POST_CLEANUP=.*/EMPTY_PRE_POST_CLEANUP="yes"/' \ + "$SABLON" > /etc/snapper/configs/root +chmod 640 /etc/snapper/configs/root + +if [ -f /etc/conf.d/snapper ]; then + sed -i 's/^SNAPPER_CONFIGS=.*/SNAPPER_CONFIGS="root"/' /etc/conf.d/snapper +else + install -d /etc/conf.d + echo 'SNAPPER_CONFIGS="root"' > /etc/conf.d/snapper +fi + +chmod 750 /.snapshots +chown root:wheel /.snapshots + +systemctl enable snapper-cleanup.timer +systemctl disable snapper-timeline.timer 2>/dev/null || true + +snapper --no-dbus -c root create --type single --cleanup-algorithm number \ + --userdata important=yes --description "Telepítés utáni állapot" + +echo ">>> [snapper-setup] Done." +snapper --no-dbus -c root list diff --git a/raveos-calamares-theme/etc/calamares/modules/finishedq.conf b/raveos-calamares-theme/etc/calamares/modules/finishedq.conf index e8729d6..38b5020 100644 --- a/raveos-calamares-theme/etc/calamares/modules/finishedq.conf +++ b/raveos-calamares-theme/etc/calamares/modules/finishedq.conf @@ -4,6 +4,6 @@ # hivja a config.doRestart(true) fuggvenyt, ezert itt a user-unchecked # a helyes ertek: a "Close installer" gomb NEM indit ujra. --- -restartNowMode: user-unchecked +restartNowMode: user-checked restartNowCommand: "systemctl -i reboot" notifyOnFinished: false diff --git a/raveos-calamares-theme/etc/calamares/modules/keyboard.conf b/raveos-calamares-theme/etc/calamares/modules/keyboardq.conf index 91137fa..91137fa 100644 --- a/raveos-calamares-theme/etc/calamares/modules/keyboard.conf +++ b/raveos-calamares-theme/etc/calamares/modules/keyboardq.conf diff --git a/raveos-calamares-theme/etc/calamares/modules/locale.conf b/raveos-calamares-theme/etc/calamares/modules/localeq.conf index 102c957..102c957 100644 --- a/raveos-calamares-theme/etc/calamares/modules/locale.conf +++ b/raveos-calamares-theme/etc/calamares/modules/localeq.conf diff --git a/raveos-calamares-theme/etc/calamares/modules/raveos-hwinfo.sh b/raveos-calamares-theme/etc/calamares/modules/raveos-hwinfo.sh new file mode 100755 index 0000000..edeccc4 --- /dev/null +++ b/raveos-calamares-theme/etc/calamares/modules/raveos-hwinfo.sh @@ -0,0 +1,24 @@ +#!/bin/bash +export LC_ALL=C +echo "=== RaveOS hardver osszefoglalo ===" +echo "kernel: $(uname -r)" +if [ -d /sys/firmware/efi ]; then + echo "boot mod: UEFI" +else + echo "boot mod: BIOS" +fi +echo "secure boot: $(mokutil --sb-state 2>/dev/null || echo ismeretlen)" +echo "virtualizacio: $(systemd-detect-virt 2>/dev/null || true)" +echo "processzor: $(lscpu 2>/dev/null | sed -n 's/^Model name: *//p' | head -1)" +echo "szalak: $(nproc)" +echo "memoria: $(free -h 2>/dev/null | awk '/^Mem:/ {print $2}')" +echo "alaplap: $(cat /sys/class/dmi/id/board_vendor /sys/class/dmi/id/board_name 2>/dev/null | tr '\n' ' ')" +echo "bios: $(cat /sys/class/dmi/id/bios_version 2>/dev/null) ($(cat /sys/class/dmi/id/bios_date 2>/dev/null))" +echo "videokartya:" +lspci -nn 2>/dev/null | grep -E "VGA|3D|Display" | sed 's/^/ /' +echo "betoltott gpu driver: $(lsmod 2>/dev/null | awk '/^(amdgpu|radeon|nvidia|nouveau|i915|xe|virtio_gpu|vmwgfx|qxl|bochs) / {print $1}' | tr '\n' ' ')" +echo "halozati eszkozok:" +lspci -nn 2>/dev/null | grep -iE "ethernet|network|wireless" | sed 's/^/ /' +echo "lemezek:" +lsblk -d -n -e 7,11 -o NAME,SIZE,MODEL,TRAN,ROTA 2>/dev/null | sed 's/^/ /' +echo "=== Calamares naplo ===" diff --git a/raveos-calamares-theme/etc/calamares/modules/ravewelcome.conf b/raveos-calamares-theme/etc/calamares/modules/ravewelcome.conf new file mode 100644 index 0000000..4995080 --- /dev/null +++ b/raveos-calamares-theme/etc/calamares/modules/ravewelcome.conf @@ -0,0 +1,6 @@ +--- +languages: + - hu + - en + - en_GB + - de diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf index ddc3ef1..b3daa54 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf @@ -19,5 +19,5 @@ script: - command: "systemctl disable hibernate.target hybrid-sleep.target geoclue.service || true" - command: "systemctl mask hibernate.target hybrid-sleep.target geoclue.service || true" - command: "systemctl enable reflector-once.service || true" - - command: "if pacman -Qq dbus-broker-units >/dev/null 2>&1 && pacman -Qq gnome-session >/dev/null 2>&1; then pacman -Rdd --noconfirm dbus-broker-units dbus-broker && pacman -S --noconfirm dbus-daemon-units; fi" + - command: "if pacman -Qq dbus-broker-units >/dev/null 2>&1 && pacman -Qq gnome-session >/dev/null 2>&1; then pacman -Rdd --noconfirm dbus-broker-units dbus-broker && pacman -S --noconfirm dbus-daemon-units; fi || true" name: "Enabling services and Display Managers" diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf index a65c6ef..32a117d 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf @@ -12,6 +12,9 @@ script: - command: "install -Dm755 /etc/calamares/modules/calamares-create-snapshots-subvol.sh ${ROOT}/root/calamares-create-snapshots-subvol.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-create-snapshots-subvol.sh" - command: "-rm ${ROOT}/root/calamares-create-snapshots-subvol.sh" + - command: "install -Dm755 /etc/calamares/modules/calamares-snapper-setup.sh ${ROOT}/root/calamares-snapper-setup.sh" + - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-snapper-setup.sh" + - command: "-rm ${ROOT}/root/calamares-snapper-setup.sh" diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-pacstrap.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-pacstrap.conf index eae9c9f..a6aa062 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-pacstrap.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-pacstrap.conf @@ -4,5 +4,5 @@ timeout: 3600 script: - command: "/usr/bin/pacman-key --init && /usr/bin/pacman-key --populate" name: "Initializing package signing keys..." - - command: "pacstrap ${ROOT} base base-devel btrfs-progs raveos-keyring chaotic-keyring chaotic-mirrorlist linux-cachyos linux-cachyos-headers linux-firmware networkmanager iwd broadcom-wl-dkms wireless-regdb nano vim grub grub-btrfs rsync efibootmgr bash-completion dkms lsb-release mkinitcpio-openswap" + - command: "pacstrap ${ROOT} base base-devel btrfs-progs raveos-keyring chaotic-keyring chaotic-mirrorlist linux-cachyos linux-cachyos-headers linux-firmware networkmanager iwd broadcom-wl-dkms wireless-regdb nano vim grub snapper snap-pac rsync efibootmgr bash-completion dkms lsb-release mkinitcpio-openswap" name: "Bootstrapping Arch Linux (Netinstall)..." diff --git a/raveos-calamares-theme/etc/calamares/modules/welcome.conf b/raveos-calamares-theme/etc/calamares/modules/welcomeq.conf index 206cbb4..544f1c9 100644 --- a/raveos-calamares-theme/etc/calamares/modules/welcome.conf +++ b/raveos-calamares-theme/etc/calamares/modules/welcomeq.conf @@ -9,6 +9,8 @@ # In addition to displaying the welcome page, this module # can check requirements for installation. --- +qmlSearch: both + # Display settings for various buttons on the welcome page. # The URLs themselves come from `branding.desc`. Each button # is show if the corresponding *show<buttonname>* setting @@ -42,7 +44,9 @@ requirements: # Use a privacy-respecting URL here, preferably in your distro's domain. # # The URL is only used if "internet" is in the *check* list below. - internetCheckUrl: http://example.com + internetCheckUrl: + - https://page.rp1.hu/supporters.js + - https://rp1.hu/ # # This may be a single URL, or a list or URLs, in which case the # URLs will be checked one-by-one; if any of them returns data, @@ -79,6 +83,7 @@ requirements: required: - storage - ram + - internet # - root # GeoIP checking @@ -103,7 +108,7 @@ requirements: # data. Timezone, city, or other data will not be recognized. # geoip: - style: "json" + style: "none" url: "https://geoip.kde.org/v1/calamares" selector: "" |