Compare commits

..

No commits in common. "d05eb3ad898cf71e1371e5213b5acd0b3beca264" and "39f31f9d469cf268e08c1ca6c45351c0d01b6e4e" have entirely different histories.

15 changed files with 2 additions and 128 deletions

View File

@ -3,8 +3,8 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
DOTFILES_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)" DOTFILES_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
WORK_DIR="${WORK_DIR:-/tmp/m-archy-build}" WORK_DIR="/tmp/m-archy-build"
OUT_DIR="${1:-${OUT_DIR:-/tmp/m-archy-out}}" OUT_DIR="${1:-/tmp/m-archy-out}"
PROFILE="$WORK_DIR/profile" PROFILE="$WORK_DIR/profile"
RELENG="/usr/share/archiso/configs/releng" RELENG="/usr/share/archiso/configs/releng"

View File

@ -130,17 +130,6 @@ count_steps() {
[[ "$sel" == *"python"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$sel" == *"python"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"zfs"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$sel" == *"zfs"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"wprs"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$sel" == *"wprs"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"chromium"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"firefox-browser"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"zen-browser"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"nyxt"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"librewolf"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"min-browser"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"vscodium"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"zed-ide"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"geany"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"codeblocks"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$sel" == *"kate"* ]] && TOTAL=$(( TOTAL + 1 ))
} }
[[ $EUID -eq 0 ]] && die "Run as your normal user (not root)." [[ $EUID -eq 0 ]] && die "Run as your normal user (not root)."
@ -214,19 +203,6 @@ SELECTED=$(dialog --backtitle "$BACKTITLE" \
"python" "Python tools pyright · pipx · pynvim" off \ "python" "Python tools pyright · pipx · pynvim" off \
"zfs" "ZFS zfs-dkms kernel module" off \ "zfs" "ZFS zfs-dkms kernel module" off \
"wprs" "WPRS wprs-git (AUR)" off \ "wprs" "WPRS wprs-git (AUR)" off \
\
"chromium" "Chromium open-source browser (official)" off \
"firefox-browser" "Firefox Mozilla browser (official)" off \
"zen-browser" "Zen Browser Firefox-based privacy browser (AUR)" off \
"nyxt" "Nyxt keyboard-driven browser (AUR)" off \
"librewolf" "LibreWolf hardened Firefox fork (AUR)" off \
"min-browser" "Min minimal Electron browser (AUR)" off \
\
"vscodium" "VSCodium telemetry-free VS Code (AUR)" off \
"zed-ide" "Zed high-performance Rust IDE (official)" off \
"geany" "Geany lightweight IDE + plugins (official)" off \
"codeblocks" "Code::Blocks C/C++ IDE (official)" off \
"kate" "Kate KDE advanced text editor (official)" off \
3>&1 1>&2 2>&3) || { clear; echo "Aborted."; exit 0; } 3>&1 1>&2 2>&3) || { clear; echo "Aborted."; exit 0; }
[[ -z "$SELECTED" ]] && { clear; echo "Nothing selected."; exit 0; } [[ -z "$SELECTED" ]] && { clear; echo "Nothing selected."; exit 0; }
@ -278,17 +254,6 @@ SUMMARY=""
[[ "$SELECTED" == *"python"* ]] && SUMMARY+=" ✦ Python tools\n" [[ "$SELECTED" == *"python"* ]] && SUMMARY+=" ✦ Python tools\n"
[[ "$SELECTED" == *"zfs"* ]] && SUMMARY+=" ✦ ZFS\n" [[ "$SELECTED" == *"zfs"* ]] && SUMMARY+=" ✦ ZFS\n"
[[ "$SELECTED" == *"wprs"* ]] && SUMMARY+=" ✦ WPRS\n" [[ "$SELECTED" == *"wprs"* ]] && SUMMARY+=" ✦ WPRS\n"
[[ "$SELECTED" == *"chromium"* ]] && SUMMARY+=" ✦ Chromium\n"
[[ "$SELECTED" == *"firefox-browser"* ]] && SUMMARY+=" ✦ Firefox\n"
[[ "$SELECTED" == *"zen-browser"* ]] && SUMMARY+=" ✦ Zen Browser\n"
[[ "$SELECTED" == *"nyxt"* ]] && SUMMARY+=" ✦ Nyxt\n"
[[ "$SELECTED" == *"librewolf"* ]] && SUMMARY+=" ✦ LibreWolf\n"
[[ "$SELECTED" == *"min-browser"* ]] && SUMMARY+=" ✦ Min Browser\n"
[[ "$SELECTED" == *"vscodium"* ]] && SUMMARY+=" ✦ VSCodium\n"
[[ "$SELECTED" == *"zed-ide"* ]] && SUMMARY+=" ✦ Zed IDE\n"
[[ "$SELECTED" == *"geany"* ]] && SUMMARY+=" ✦ Geany\n"
[[ "$SELECTED" == *"codeblocks"* ]] && SUMMARY+=" ✦ Code::Blocks\n"
[[ "$SELECTED" == *"kate"* ]] && SUMMARY+=" ✦ Kate\n"
dialog --backtitle "$BACKTITLE" \ dialog --backtitle "$BACKTITLE" \
--title " Confirm " \ --title " Confirm " \
@ -344,17 +309,6 @@ DE_DIR="$MODULES/Desktop-Environments"
[[ "$SELECTED" == *"python"* ]] && run_module "Python Tools" "$MODULES/optional-Modules/python.sh" [[ "$SELECTED" == *"python"* ]] && run_module "Python Tools" "$MODULES/optional-Modules/python.sh"
[[ "$SELECTED" == *"zfs"* ]] && run_module "ZFS" "$MODULES/optional-Modules/zfs.sh" [[ "$SELECTED" == *"zfs"* ]] && run_module "ZFS" "$MODULES/optional-Modules/zfs.sh"
[[ "$SELECTED" == *"wprs"* ]] && run_module "WPRS" "$MODULES/optional-Modules/wprs.sh" [[ "$SELECTED" == *"wprs"* ]] && run_module "WPRS" "$MODULES/optional-Modules/wprs.sh"
[[ "$SELECTED" == *"chromium"* ]] && run_module "Chromium" "$APPS/chromium.sh"
[[ "$SELECTED" == *"firefox-browser"* ]] && run_module "Firefox" "$APPS/firefox.sh"
[[ "$SELECTED" == *"zen-browser"* ]] && run_module "Zen Browser" "$APPS/zen-browser.sh"
[[ "$SELECTED" == *"nyxt"* ]] && run_module "Nyxt" "$APPS/nyxt.sh"
[[ "$SELECTED" == *"librewolf"* ]] && run_module "LibreWolf" "$APPS/librewolf.sh"
[[ "$SELECTED" == *"min-browser"* ]] && run_module "Min Browser" "$APPS/min-browser.sh"
[[ "$SELECTED" == *"vscodium"* ]] && run_module "VSCodium" "$APPS/vscodium.sh"
[[ "$SELECTED" == *"zed-ide"* ]] && run_module "Zed IDE" "$APPS/zed.sh"
[[ "$SELECTED" == *"geany"* ]] && run_module "Geany" "$APPS/geany.sh"
[[ "$SELECTED" == *"codeblocks"* ]] && run_module "Code::Blocks" "$APPS/codeblocks.sh"
[[ "$SELECTED" == *"kate"* ]] && run_module "Kate" "$APPS/kate.sh"
dialog --backtitle "$BACKTITLE" \ dialog --backtitle "$BACKTITLE" \
--title " Done " \ --title " Done " \

View File

@ -9,7 +9,6 @@ sudo pacman -Syu --noconfirm --needed \
e2fsprogs fail2ban fastfetch fd fdupes ffmpeg firefox flatpak fzf \ e2fsprogs fail2ban fastfetch fd fdupes ffmpeg firefox flatpak fzf \
gcc git glib2 greetd-tuigreet grub \ gcc git glib2 greetd-tuigreet grub \
hdparm htop inetutils iputils iwd jq ldns less libpulse linux linux-firmware lshw lsof \ hdparm htop inetutils iputils iwd jq ldns less libpulse linux linux-firmware lshw lsof \
lynx \
man-db mc nano neovim networkmanager \ man-db mc nano neovim networkmanager \
onefetch openbsd-netcat openssh parted pciutils pipewire \ onefetch openbsd-netcat openssh parted pciutils pipewire \
python python-pip qrencode ripgrep rsync ruby-pkg-config rust rustup \ python python-pip qrencode ripgrep rsync ruby-pkg-config rust rustup \

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
sudo pacman -S --noconfirm --needed chromium

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
sudo pacman -S --noconfirm --needed codeblocks

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
sudo pacman -S --noconfirm --needed firefox

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
sudo pacman -S --noconfirm --needed geany geany-plugins

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
sudo pacman -S --noconfirm --needed kate

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
yay -S --answerdiff None --answerclean All --noconfirm librewolf-bin

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
yay -S --answerdiff None --answerclean All --noconfirm min

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
yay -S --answerdiff None --answerclean All --noconfirm nyxt

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
yay -S --answerdiff None --answerclean All --noconfirm vscodium-bin

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
sudo pacman -S --noconfirm --needed zed

View File

@ -1,3 +0,0 @@
#!/bin/bash
set -euo pipefail
yay -S --answerdiff None --answerclean All --noconfirm zen-browser-bin

View File

@ -135,17 +135,6 @@ count_steps() {
[[ "$a" == *"python"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"python"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"zfs"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"zfs"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"wprs"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"wprs"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"chromium"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"firefox-browser"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"zen-browser"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"nyxt"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"librewolf"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"min-browser"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"vscodium"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"zed-ide"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"geany"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"codeblocks"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"kate"* ]] && TOTAL=$(( TOTAL + 1 ))
} }
# ── Preflight ───────────────────────────────────────────────────────────────── # ── Preflight ─────────────────────────────────────────────────────────────────
@ -252,19 +241,6 @@ SELECTED_APPS=$(dialog --backtitle "$BACKTITLE" \
"python" "Python tools pyright · pipx · pynvim" off \ "python" "Python tools pyright · pipx · pynvim" off \
"zfs" "ZFS zfs-dkms kernel module" off \ "zfs" "ZFS zfs-dkms kernel module" off \
"wprs" "WPRS wprs-git (AUR)" off \ "wprs" "WPRS wprs-git (AUR)" off \
\
"chromium" "Chromium open-source browser (official)" off \
"firefox-browser" "Firefox Mozilla browser (official)" off \
"zen-browser" "Zen Browser Firefox-based privacy browser (AUR)" off \
"nyxt" "Nyxt keyboard-driven browser (AUR)" off \
"librewolf" "LibreWolf hardened Firefox fork (AUR)" off \
"min-browser" "Min minimal Electron browser (AUR)" off \
\
"vscodium" "VSCodium telemetry-free VS Code (AUR)" off \
"zed-ide" "Zed high-performance Rust IDE (official)" off \
"geany" "Geany lightweight IDE + plugins (official)" off \
"codeblocks" "Code::Blocks C/C++ IDE (official)" off \
"kate" "Kate KDE advanced text editor (official)" off \
3>&1 1>&2 2>&3) || SELECTED_APPS="" 3>&1 1>&2 2>&3) || SELECTED_APPS=""
# ── Confirmation ────────────────────────────────────────────────────────────── # ── Confirmation ──────────────────────────────────────────────────────────────
@ -318,17 +294,6 @@ if [[ -n "$SELECTED_APPS" ]]; then
[[ "$SELECTED_APPS" == *"python"* ]] && SUMMARY+=" ✦ Python tools\n" [[ "$SELECTED_APPS" == *"python"* ]] && SUMMARY+=" ✦ Python tools\n"
[[ "$SELECTED_APPS" == *"zfs"* ]] && SUMMARY+=" ✦ ZFS\n" [[ "$SELECTED_APPS" == *"zfs"* ]] && SUMMARY+=" ✦ ZFS\n"
[[ "$SELECTED_APPS" == *"wprs"* ]] && SUMMARY+=" ✦ WPRS\n" [[ "$SELECTED_APPS" == *"wprs"* ]] && SUMMARY+=" ✦ WPRS\n"
[[ "$SELECTED_APPS" == *"chromium"* ]] && SUMMARY+=" ✦ Chromium\n"
[[ "$SELECTED_APPS" == *"firefox-browser"* ]] && SUMMARY+=" ✦ Firefox\n"
[[ "$SELECTED_APPS" == *"zen-browser"* ]] && SUMMARY+=" ✦ Zen Browser\n"
[[ "$SELECTED_APPS" == *"nyxt"* ]] && SUMMARY+=" ✦ Nyxt\n"
[[ "$SELECTED_APPS" == *"librewolf"* ]] && SUMMARY+=" ✦ LibreWolf\n"
[[ "$SELECTED_APPS" == *"min-browser"* ]] && SUMMARY+=" ✦ Min Browser\n"
[[ "$SELECTED_APPS" == *"vscodium"* ]] && SUMMARY+=" ✦ VSCodium\n"
[[ "$SELECTED_APPS" == *"zed-ide"* ]] && SUMMARY+=" ✦ Zed IDE\n"
[[ "$SELECTED_APPS" == *"geany"* ]] && SUMMARY+=" ✦ Geany\n"
[[ "$SELECTED_APPS" == *"codeblocks"* ]] && SUMMARY+=" ✦ Code::Blocks\n"
[[ "$SELECTED_APPS" == *"kate"* ]] && SUMMARY+=" ✦ Kate\n"
fi fi
dialog --backtitle "$BACKTITLE" \ dialog --backtitle "$BACKTITLE" \
@ -398,17 +363,6 @@ fi
[[ "$SELECTED_APPS" == *"python"* ]] && run_module "Python Tools" "$MODULES/optional-Modules/python.sh" [[ "$SELECTED_APPS" == *"python"* ]] && run_module "Python Tools" "$MODULES/optional-Modules/python.sh"
[[ "$SELECTED_APPS" == *"zfs"* ]] && run_module "ZFS" "$MODULES/optional-Modules/zfs.sh" [[ "$SELECTED_APPS" == *"zfs"* ]] && run_module "ZFS" "$MODULES/optional-Modules/zfs.sh"
[[ "$SELECTED_APPS" == *"wprs"* ]] && run_module "WPRS" "$MODULES/optional-Modules/wprs.sh" [[ "$SELECTED_APPS" == *"wprs"* ]] && run_module "WPRS" "$MODULES/optional-Modules/wprs.sh"
[[ "$SELECTED_APPS" == *"chromium"* ]] && run_module "Chromium" "$APPS/chromium.sh"
[[ "$SELECTED_APPS" == *"firefox-browser"* ]] && run_module "Firefox" "$APPS/firefox.sh"
[[ "$SELECTED_APPS" == *"zen-browser"* ]] && run_module "Zen Browser" "$APPS/zen-browser.sh"
[[ "$SELECTED_APPS" == *"nyxt"* ]] && run_module "Nyxt" "$APPS/nyxt.sh"
[[ "$SELECTED_APPS" == *"librewolf"* ]] && run_module "LibreWolf" "$APPS/librewolf.sh"
[[ "$SELECTED_APPS" == *"min-browser"* ]] && run_module "Min Browser" "$APPS/min-browser.sh"
[[ "$SELECTED_APPS" == *"vscodium"* ]] && run_module "VSCodium" "$APPS/vscodium.sh"
[[ "$SELECTED_APPS" == *"zed-ide"* ]] && run_module "Zed IDE" "$APPS/zed.sh"
[[ "$SELECTED_APPS" == *"geany"* ]] && run_module "Geany" "$APPS/geany.sh"
[[ "$SELECTED_APPS" == *"codeblocks"* ]] && run_module "Code::Blocks" "$APPS/codeblocks.sh"
[[ "$SELECTED_APPS" == *"kate"* ]] && run_module "Kate" "$APPS/kate.sh"
# ── Done ────────────────────────────────────────────────────────────────────── # ── Done ──────────────────────────────────────────────────────────────────────
dialog --backtitle "$BACKTITLE" \ dialog --backtitle "$BACKTITLE" \