mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 19:07:04 +01:00
Krzysztof kuhy Rudnicki
08aac8d7d1
i3 config was filed under periodic_background, which it never was. It is now linux_configuration/i3/ (config + installer) and linux_configuration/i3blocks/ (the status scripts), both at depth 2. misc/testsAndMisc-bash/ was a directory named after the repo it already lived in, so its contents moved up to misc/. Its stray .gitignore came along, keeping the media rules working from the new location; its .vscode/tasks.json did not, because it invoked Bash/transcribe.sh, a path this repo dropped long ago. Most of this commit is the references the previous flatten missed. Its regex skipped anything with a variable prefix, which left 16 files -- including check_and_enable_services.sh and install_core_system.sh, the orchestrators -- still naming $CONFIG_DIR/scripts/periodic_background/... It had also rewritten three i3 paths into scripts/i3blocks/, a directory that has never existed; the i3blocks suites caught that by failing. 13 more symlinks broke on the i3 move. Repointed, and cpu_monitor/volume/ disk were run again to confirm the bar still reports. Depth 139 -> 104. Roughly 47 of the remainder sit in digital_wellbeing and hosts, still deferred. The rest encode real structure -- a C project, Python package directories, artgate's routes/styles, systemd unit dirs -- so flattening them further would destroy information rather than taxonomy. Verified: 1798 tests at 100%, both i3blocks suites pass, the shell coverage gate is clean, and the relocated media rules still ignore what they should while test_fw.srt stays tracked. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
124 lines
3.6 KiB
Bash
Executable File
124 lines
3.6 KiB
Bash
Executable File
#!/bin/bash
|
|
# Journal, NetworkManager and media-organizer performance fixes.
|
|
#
|
|
# Sourced by fix_arch_performance.sh; split out to keep it under the 250-line cap.
|
|
# Sourced rather than run, so it inherits the caller's strict mode and
|
|
# the helper functions and variables defined above the source line.
|
|
|
|
# ===================================================================
|
|
# Fix 3: Journal vacuum + permanent size cap
|
|
# ===================================================================
|
|
fix_journal() {
|
|
local usage_line
|
|
usage_line=$(journalctl --disk-usage 2>/dev/null || true)
|
|
|
|
local needs_vacuum=false
|
|
# Optional space before the unit: journalctl prints "305.5M in the file
|
|
# system", with no separator, so requiring one made this dead code.
|
|
if [[ $usage_line =~ ([0-9]+\.?[0-9]*)\ ?G ]]; then
|
|
needs_vacuum=true
|
|
fi
|
|
|
|
if [[ $needs_vacuum == "true" ]]; then
|
|
journalctl --vacuum-size=300M
|
|
else
|
|
log_ok "Journal is already under 1GiB."
|
|
fi
|
|
|
|
# Create permanent size cap via drop-in
|
|
local dropin_dir="${JOURNALD_CONF_DIR:-/etc/systemd/journald.conf.d}"
|
|
local dropin_file="$dropin_dir/size-limit.conf"
|
|
|
|
if [[ -f $dropin_file ]] && grep -q 'SystemMaxUse=300M' "$dropin_file"; then
|
|
log_ok "Journal size cap already configured."
|
|
else
|
|
mkdir -p "$dropin_dir"
|
|
cat >"$dropin_file" <<'JOURNALEOF'
|
|
[Journal]
|
|
SystemMaxUse=300M
|
|
JOURNALEOF
|
|
systemctl restart systemd-journald
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Fix 4: Disable NetworkManager-wait-online
|
|
# ===================================================================
|
|
fix_nm_wait_online() {
|
|
if ! systemctl is-enabled NetworkManager-wait-online.service >/dev/null 2>&1; then
|
|
log_ok "NetworkManager-wait-online is already disabled — skipping."
|
|
return 0
|
|
fi
|
|
|
|
systemctl disable NetworkManager-wait-online.service
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Fix 5: media-organizer.service
|
|
# ===================================================================
|
|
fix_media_organizer() {
|
|
local service_file="${SYSTEMD_UNIT_DIR:-/etc/systemd/system}/media-organizer.service"
|
|
|
|
# Find the organize_downloads.sh script
|
|
local script_path=""
|
|
local candidates=(
|
|
"${ORGANIZE_SCRIPT_CANDIDATES:-/home/kuhy/testsAndMisc/linux_configuration/utils/organize_downloads.sh}"
|
|
"/home/kuhy/linux-configuration/utils/organize_downloads.sh"
|
|
)
|
|
for candidate in "${candidates[@]}"; do
|
|
if [[ -f $candidate ]]; then
|
|
script_path="$candidate"
|
|
break
|
|
fi
|
|
done
|
|
|
|
if [[ -z $script_path ]]; then
|
|
log_warn "organize_downloads.sh not found — skipping media-organizer fix."
|
|
return 0
|
|
fi
|
|
|
|
local target_user="${SUDO_USER:-kuhy}"
|
|
|
|
# Check if already correct
|
|
if [[ -f $service_file ]]; then
|
|
if grep -q "User=$target_user" "$service_file" &&
|
|
grep -q "ExecStart=$script_path" "$service_file"; then
|
|
log_ok "media-organizer.service is already correctly configured — skipping."
|
|
return 0
|
|
fi
|
|
fi
|
|
|
|
systemctl stop media-organizer.service 2>/dev/null || true
|
|
|
|
cat >"$service_file" <<EOF
|
|
[Unit]
|
|
Description=Media File Organizer
|
|
After=graphical-session.target
|
|
Wants=graphical-session.target
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
User=$target_user
|
|
Group=$target_user
|
|
ExecStart=$script_path
|
|
StandardOutput=journal
|
|
StandardError=journal
|
|
RemainAfterExit=no
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
|
|
systemctl daemon-reload
|
|
systemctl reset-failed media-organizer.service 2>/dev/null || true
|
|
systemctl enable media-organizer.service
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Apply all fixes
|
|
# ===================================================================
|