Trim over-commented Chunk 3+/4 work
A pass over the install scripts, dev-tools commands, and Hyprland Lua files that I had stuffed with explain-everything preambles. Most of those rationales (which files ship where, why hyprctl setenv doesn't suffice, etc.) belong in commit messages or PR descriptions, not in code people have to read forever. Kept the few comments that document genuinely non-obvious behaviour: the keybind-env reason for hl.env in envs.lua, why the runtime PAM seds stay scripted in increase-lockout-limit, the chroot/--now distinction in chroot.sh, and the dev-pkg-test split-install reason.
This commit is contained in:
Ryan Hughes
@@ -1,7 +1,3 @@
|
||||
# Docker config files ship via omarchy-settings. This script only handles
|
||||
# runtime side: reload systemd-resolved so the new drop-in takes effect and
|
||||
# add the current user to the docker group. docker.socket enable lives in
|
||||
# install/config/enable-services.sh.
|
||||
sudo systemctl restart systemd-resolved
|
||||
sudo usermod -aG docker ${USER}
|
||||
sudo systemctl daemon-reload
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
# Central place for unconditional service enables. Services that should NOT
|
||||
# be started during install (sddm, ufw) live in their own scripts. Hardware-
|
||||
# gated services (t2fanrd, intel_lpmd, thermald, omarchy-nvme-suspend-fix)
|
||||
# also live with their detection.
|
||||
#
|
||||
# Two variants:
|
||||
# chrootable_systemctl_enable -> enable + start now (safe to start)
|
||||
# chrootable_systemctl_enable_only -> enable only (don't risk starting during
|
||||
# install)
|
||||
# _only variant skips --now to avoid starting iwd/docker/power-profiles-daemon
|
||||
# during install (existing iwd would be interrupted; the others should defer
|
||||
# to first boot). sddm, ufw, and hardware-gated services stay in their own
|
||||
# scripts.
|
||||
chrootable_systemctl_enable bluetooth.service
|
||||
chrootable_systemctl_enable cups.service
|
||||
chrootable_systemctl_enable cups-browsed.service
|
||||
|
||||
@@ -1,5 +1 @@
|
||||
# The two faster-shutdown drop-ins
|
||||
# (etc/systemd/system.conf.d/10-faster-shutdown.conf,
|
||||
# etc/systemd/system/user@.service.d/10-faster-shutdown.conf)
|
||||
# ship via omarchy-settings. Reload systemd so the new drop-ins take effect.
|
||||
sudo systemctl daemon-reload
|
||||
|
||||
@@ -1,4 +1,2 @@
|
||||
# etc/gnupg/dirmngr.conf ships via omarchy-settings. Restart dirmngr so it
|
||||
# picks up the new keyserver list and timeout.
|
||||
sudo gpgconf --kill dirmngr || true
|
||||
sudo gpgconf --launch dirmngr || true
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# bluetooth.service enable lives in install/config/enable-services.sh.
|
||||
|
||||
# Persist last power state across reboots (default AutoEnable=true overrides it)
|
||||
sudo sed -i 's/^#\?AutoEnable=.*/AutoEnable=false/' /etc/bluetooth/main.conf
|
||||
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
# etc/sysctl.d/90-omarchy-file-watchers.conf ships via omarchy-settings.
|
||||
# Apply the new sysctl values immediately.
|
||||
sudo sysctl --system >/dev/null 2>&1
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
# The faillock.conf side ships via the omarchy-settings etc-overrides
|
||||
# (deny = 10). The two PAM file edits below remain a script because
|
||||
# /etc/pam.d/system-auth and /etc/pam.d/sddm-autologin are upstream-owned
|
||||
# and the changes are insertions, not full-file overrides.
|
||||
|
||||
# Increase lockout limit to 10 and decrease timeout to 2 minutes
|
||||
# /etc/pam.d/{system-auth,sddm-autologin} are upstream-owned and the changes
|
||||
# are insertions, not full-file overrides, so they stay scripted.
|
||||
sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
|
||||
sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
|
||||
|
||||
# Ensure lockout limit is reset on restart.
|
||||
# Delete BOTH the preauth and authsucc pam_faillock lines before re-adding
|
||||
# authsucc, so re-running the installer doesn't duplicate the authsucc line.
|
||||
# Drop both lines before re-adding authsucc so reruns don't duplicate it.
|
||||
sudo sed -i '/pam_faillock\.so preauth/d' /etc/pam.d/sddm-autologin
|
||||
sudo sed -i '/pam_faillock\.so authsucc/d' /etc/pam.d/sddm-autologin
|
||||
sudo sed -i '/auth.*pam_permit\.so/a auth required pam_faillock.so authsucc' /etc/pam.d/sddm-autologin
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
# Most MIME default mappings now ship as config/mimeapps.list (via /etc/skel
|
||||
# for new users; existing users keep their own). This script handles the
|
||||
# runtime side: refresh applications, set Chromium as the system default web
|
||||
# browser (omarchy-install-browser overrides if the user picks something
|
||||
# else later), and wire HEY.desktop as the mailto handler — HEY.desktop is
|
||||
# generated by install/packaging/webapps.sh at install time so it can't
|
||||
# live in /etc/skel/.config/mimeapps.list.
|
||||
omarchy-refresh-applications
|
||||
xdg-settings set default-web-browser chromium.desktop
|
||||
# HEY.desktop is generated by install/packaging/webapps.sh, so the mapping
|
||||
# can't ship as a static /etc/skel/.config/mimeapps.list entry.
|
||||
xdg-mime default HEY.desktop x-scheme-handler/mailto
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
# The udev rule (/etc/udev/rules.d/99-omarchy-power-profile.rules) ships via
|
||||
# omarchy-settings. power-profiles-daemon.service enable lives in
|
||||
# install/config/enable-services.sh. This script just reloads udev so the
|
||||
# rule takes effect and removes the pre-rename legacy path (idempotent for
|
||||
# re-install/downgrade tests).
|
||||
# Remove the pre-rename legacy path on every run (idempotent vs the one-shot
|
||||
# migration, which only fires once per user).
|
||||
sudo rm -f /etc/udev/rules.d/99-power-profile.rules
|
||||
sudo udevadm control --reload 2>/dev/null
|
||||
sudo udevadm trigger --subsystem-match=power_supply 2>/dev/null
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
# The udev rule (/etc/udev/rules.d/99-omarchy-wifi-powersave.rules) ships via
|
||||
# omarchy-settings. This script just reloads udev so the rule takes effect
|
||||
# without waiting for a reboot.
|
||||
# Also remove the pre-rename legacy path in case the old installer ran since
|
||||
# the one-shot migration completed (idempotency for re-install/downgrade tests).
|
||||
# Remove the pre-rename legacy path on every run (idempotent vs the one-shot
|
||||
# migration, which only fires once per user).
|
||||
sudo rm -f /etc/udev/rules.d/99-wifi-powersave.rules
|
||||
sudo udevadm control --reload
|
||||
sudo udevadm trigger --subsystem-match=power_supply
|
||||
|
||||
@@ -7,14 +7,12 @@ chrootable_systemctl_enable() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Like chrootable_systemctl_enable but never passes --now, so the service is
|
||||
# only enabled for the next boot. Use for services that are either already
|
||||
# running (and re-starting would interrupt the install — iwd) or that shouldn't
|
||||
# auto-start during install (docker, power-profiles-daemon).
|
||||
# Like chrootable_systemctl_enable but never passes --now. Use for services
|
||||
# we shouldn't (re)start mid-install (iwd interrupts the network; docker and
|
||||
# power-profiles-daemon should defer to first boot).
|
||||
chrootable_systemctl_enable_only() {
|
||||
sudo systemctl enable $1
|
||||
}
|
||||
|
||||
# Export the functions so they're available in subshells
|
||||
export -f chrootable_systemctl_enable
|
||||
export -f chrootable_systemctl_enable_only
|
||||
|
||||
Reference in New Issue
Block a user