mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Install updates
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
run_logged $OMARCHY_INSTALL/config/theme.sh
|
||||
run_logged $OMARCHY_INSTALL/config/git.sh
|
||||
run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh
|
||||
run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
|
||||
run_logged $OMARCHY_INSTALL/config/xcompose.sh
|
||||
run_logged $OMARCHY_INSTALL/config/mise-work.sh
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
1password-beta
|
||||
1password-cli
|
||||
aether
|
||||
alacritty
|
||||
asdcontrol
|
||||
avahi
|
||||
bash-completion
|
||||
@@ -12,7 +11,7 @@ bat
|
||||
blueberry
|
||||
brightnessctl
|
||||
btop
|
||||
cargo
|
||||
rust
|
||||
clang
|
||||
cups
|
||||
cups-browsed
|
||||
@@ -33,6 +32,7 @@ fd
|
||||
ffmpegthumbnailer
|
||||
fontconfig
|
||||
fzf
|
||||
ghostty
|
||||
github-cli
|
||||
gnome-calculator
|
||||
gnome-keyring
|
||||
@@ -64,12 +64,12 @@ less
|
||||
libsecret
|
||||
libyaml
|
||||
libqalculate
|
||||
libreoffice
|
||||
libreoffice-fresh
|
||||
llvm
|
||||
localsend
|
||||
luarocks
|
||||
mako
|
||||
man
|
||||
man-db
|
||||
mariadb-libs
|
||||
mise
|
||||
mpv
|
||||
|
||||
@@ -35,7 +35,7 @@ pipewire
|
||||
pipewire-alsa
|
||||
pipewire-jack
|
||||
pipewire-pulse
|
||||
qt5-remoteobjects
|
||||
# qt5-remoteobjects # REMOVED: Package no longer exists in repos
|
||||
qt6-wayland
|
||||
sassc
|
||||
snapper
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
run_logged $OMARCHY_INSTALL/packaging/base.sh
|
||||
# Skip base package installation if running from archinstall wrapper
|
||||
# The wrapper already installed base packages before user creation
|
||||
if [[ -z "$OMARCHY_ARCHINSTALL_WRAPPER" ]]; then
|
||||
run_logged $OMARCHY_INSTALL/packaging/base.sh
|
||||
fi
|
||||
|
||||
run_logged $OMARCHY_INSTALL/packaging/apps.sh
|
||||
run_logged $OMARCHY_INSTALL/packaging/fonts.sh
|
||||
run_logged $OMARCHY_INSTALL/packaging/nvim.sh
|
||||
run_logged $OMARCHY_INSTALL/packaging/icons.sh
|
||||
run_logged $OMARCHY_INSTALL/packaging/webapps.sh
|
||||
run_logged $OMARCHY_INSTALL/packaging/tuis.sh
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
# Handle chroot install completion (non-interactive)
|
||||
if [[ -n "${OMARCHY_CHROOT_INSTALL:-}" ]]; then
|
||||
echo "[finished] Chroot installation completed, creating marker file"
|
||||
if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
|
||||
sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
|
||||
fi
|
||||
touch /var/tmp/omarchy-install-completed
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Normal (non-chroot) finish
|
||||
stop_install_log
|
||||
|
||||
echo_in_style() {
|
||||
@@ -28,11 +39,5 @@ fi
|
||||
if gum confirm --padding "0 0 0 $((PADDING_LEFT + 32))" --show-help=false --default --affirmative "Reboot Now" --negative "" ""; then
|
||||
# Clear screen to hide any shutdown messages
|
||||
clear
|
||||
|
||||
if [[ -n "${OMARCHY_CHROOT_INSTALL:-}" ]]; then
|
||||
touch /var/tmp/omarchy-install-completed
|
||||
exit 0
|
||||
else
|
||||
sudo reboot 2>/dev/null
|
||||
fi
|
||||
sudo reboot 2>/dev/null
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user