guillm/atlas-desktop
guillm/atlas-desktop
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge conflict

Browse source
This commit is contained in:
Gu://em_ 2026-08-06 12:17:16 +02:00
commit 5ca5d28363
4 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/.zshrc
View file

@ -86,9 +86,9 @@ alias icat='kitten icat'
alias power-draw="cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print \$1*\$2/1e12 \" W\"}\'" alias power-draw="cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print \$1*\$2/1e12 \" W\"}\'"
alias battery='cat /sys/class/power_supply/BAT1/capacity' alias battery='cat /sys/class/power_supply/BAT1/capacity'
# Override some default commands with more practical alternatives # Override some default commands with more practical alternatives
alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes --sort=modified' alias ls='eza --icons=auto --tree --level=1 --follow-symlinks --no-quotes --sort=modified'
alias lsa='ls -a' alias lsa='ls -a'
alias lsl='eza --icons=automatic --long --header --group -M --sort=modified' alias lsl='eza --icons=auto --long --header --group -M --sort=modified'
alias tree='ls --level=3' alias tree='ls --level=3'
# Keep default commands accessible # Keep default commands accessible
alias lsd='/usr/bin/ls --color' alias lsd='/usr/bin/ls --color'

1
packages/cli-dev-tools.pkgs
View file

@ -5,6 +5,7 @@ fzf
git git
gnome-keyring gnome-keyring
helix helix
less
openssh openssh
wget wget
zoxide zoxide

3
packages/core.pkgs
View file

@ -1,4 +1,3 @@
apparmor
efibootmgr efibootmgr
grub grub
htop htop
@ -11,7 +10,5 @@ os-prober
sof-firmware sof-firmware
stow stow
sudo sudo
ufw
vim vim
zram-generator
zsh zsh

13
scripts/install.sh
View file

@ -519,7 +519,6 @@ install_packages() {
if [[ $group == aur ]]; then if [[ $group == aur ]]; then
for pkg in "${pkgs[@]}"; do for pkg in "${pkgs[@]}"; do
local tmp; tmp=$(mktemp) local tmp; tmp=$(mktemp)
if [[ $IS_TTY == true ]]; then
spinner_start " [aur] $pkg" spinner_start " [aur] $pkg"
if paru -S --needed --noconfirm "$pkg" >"$tmp" 2>&1; then if paru -S --needed --noconfirm "$pkg" >"$tmp" 2>&1; then
spinner_stop ok "[aur] $pkg"; succeeded+=("$pkg") spinner_stop ok "[aur] $pkg"; succeeded+=("$pkg")
@ -527,15 +526,6 @@ install_packages() {
spinner_stop fail "[aur] $pkg" spinner_stop fail "[aur] $pkg"
warn "paru output:"; cat "$tmp" | indent; failed+=("$pkg") warn "paru output:"; cat "$tmp" | indent; failed+=("$pkg")
fi fi
else
printf " ... [aur] %s\n" "$pkg"
if paru -S --needed --noconfirm "$pkg" >"$tmp" 2>&1; then
ok "[aur] $pkg"; succeeded+=("$pkg")
else
err "[aur] $pkg"
warn "paru output:"; cat "$tmp" | indent; failed+=("$pkg")
fi
fi
rm -f "$tmp" rm -f "$tmp"
done done
else else
@ -824,6 +814,9 @@ enable_services() {
systemctl --user enable --now pipewire-pulse.service &>/dev/null && ok "pipewire-pulse.service" || warn "pipewire-pulse not found" systemctl --user enable --now pipewire-pulse.service &>/dev/null && ok "pipewire-pulse.service" || warn "pipewire-pulse not found"
systemctl --user enable --now wireplumber.service &>/dev/null && ok "wireplumber.service" || warn "wireplumber not found" systemctl --user enable --now wireplumber.service &>/dev/null && ok "wireplumber.service" || warn "wireplumber not found"
# HyprPolkitAgent (autentication)
systemctl --user enable --now hyprpolkitagent.service &>/dev/null && ok "wireplumber.service" || warn "wireplumber not found"
phase_done phase_done
} }