diff --git a/install.sh b/install.sh index 847b4d95..20eaccd1 100755 --- a/install.sh +++ b/install.sh @@ -19,7 +19,6 @@ source $OMARCHY_INSTALL/preflight/migrations.sh source $OMARCHY_INSTALL/config/config.sh source $OMARCHY_INSTALL/config/branding.sh source $OMARCHY_INSTALL/config/network.sh -source $OMARCHY_INSTALL/config/power.sh source $OMARCHY_INSTALL/config/git.sh source $OMARCHY_INSTALL/config/gpg.sh source $OMARCHY_INSTALL/config/usb-autosuspend.sh diff --git a/install/config/power.sh b/install/config/power.sh deleted file mode 100644 index d973fb33..00000000 --- a/install/config/power.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Setting the performance profile can make a big difference. By default, most systems seem to start in balanced mode, -# even if they're not running off a battery. So let's make sure that's changed to performance. -sudo pacman -S --noconfirm python-gobject power-profiles-daemon - -# FIXME: Can't set powerprofilesctl during CHROOT, must do it afterwards -if [ -z "${OMARCHY_CHROOT_INSTALL:-}" ]; then - if ls /sys/class/power_supply/BAT* &>/dev/null; then - # This computer runs on a battery - powerprofilesctl set balanced || true - - # Enable battery monitoring timer for low battery notifications - systemctl --user enable --now omarchy-battery-monitor.timer - else - # This computer runs on power outlet - powerprofilesctl set performance || true - fi -fi diff --git a/install/desktop/desktop.sh b/install/desktop/desktop.sh index 4c02c15a..932ef4fa 100644 --- a/install/desktop/desktop.sh +++ b/install/desktop/desktop.sh @@ -4,6 +4,7 @@ sudo pacman -S --noconfirm --needed \ brightnessctl playerctl pamixer wiremix wireplumber \ fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \ nautilus sushi ffmpegthumbnailer gvfs-mtp \ + python-gobject power-profiles-daemon \ slurp satty wf-recorder wl-screenrec \ mpv evince imv \ walker-bin omarchy-chromium diff --git a/install/first-run/battery-monitor.sh b/install/first-run/battery-monitor.sh new file mode 100644 index 00000000..8f49e117 --- /dev/null +++ b/install/first-run/battery-monitor.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +if ls /sys/class/power_supply/BAT* &>/dev/null; then + # This computer runs on a battery + powerprofilesctl set balanced || true + + # Enable battery monitoring timer for low battery notifications + systemctl --user enable --now omarchy-battery-monitor.timer +else + # This computer runs on power outlet + powerprofilesctl set performance || true +fi