Config: Resolve .pacnew files

etc/systemd/journald.conf

@@ -6,16 +6,18 @@
 #  any later version.
 #
 # Entries in this file show the compile time defaults. Local configuration
-# should be created by either modifying this file, or by creating "drop-ins" in
+# should be created by either modifying this file (or a copy of it placed in
-# the journald.conf.d/ subdirectory. The latter is generally recommended.
+# /etc/ if the original file is shipped in /usr/), or by creating "drop-ins" in
-# Defaults can be restored by simply deleting this file and all drop-ins.
+# the /etc/systemd/journald.conf.d/ directory. The latter is generally
+# recommended. Defaults can be restored by simply deleting the main
+# configuration file and all drop-ins located in /etc/.
 #
 # Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
 #
 # See journald.conf(5) for details.
 
 [Journal]
-#Storage=auto
+#Storage=persistent
 #Compress=yes
 #Seal=yes
 #SplitMode=uid
@@ -30,7 +32,7 @@ SystemMaxUse=256M
 #RuntimeKeepFree=
 #RuntimeMaxFileSize=
 #RuntimeMaxFiles=100
-#MaxRetentionSec=
+#MaxRetentionSec=0
 MaxFileSec=2week
 #ForwardToSyslog=no
 #ForwardToKMsg=no
@@ -42,6 +44,7 @@ MaxFileSec=2week
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
 #MaxLevelWall=emerg
+#MaxLevelSocket=debug
 #LineMax=48K
 #ReadKMsg=yes
 #Audit=yes

etc/systemd/logind.conf

@@ -6,9 +6,11 @@
 #  any later version.
 #
 # Entries in this file show the compile time defaults. Local configuration
-# should be created by either modifying this file, or by creating "drop-ins" in
+# should be created by either modifying this file (or a copy of it placed in
-# the logind.conf.d/ subdirectory. The latter is generally recommended.
+# /etc/ if the original file is shipped in /usr/), or by creating "drop-ins" in
-# Defaults can be restored by simply deleting this file and all drop-ins.
+# the /etc/systemd/logind.conf.d/ directory. The latter is generally
+# recommended. Defaults can be restored by simply deleting the main
+# configuration file and all drop-ins located in /etc/.
 #
 # Use 'systemd-analyze cat-config systemd/logind.conf' to display the full config.
 #
@@ -22,14 +24,19 @@
 #KillExcludeUsers=root
 #InhibitDelayMaxSec=5
 #UserStopDelaySec=10
+#SleepOperation=suspend-then-hibernate suspend
 HandlePowerKey=ignore
+#HandlePowerKeyLongPress=ignore
+#HandleRebootKey=reboot
+#HandleRebootKeyLongPress=poweroff
 #HandleSuspendKey=suspend
+#HandleSuspendKeyLongPress=hibernate
 #HandleHibernateKey=hibernate
+#HandleHibernateKeyLongPress=ignore
 #HandleLidSwitch=suspend
 #HandleLidSwitchExternalPower=suspend
 #HandleLidSwitchDocked=ignore
-#HandleRebootKey=reboot
+#HandleSecureAttentionKey=secure-attention-key
-#HandleRebootKeyLongPress=poweroff
 #PowerKeyIgnoreInhibited=no
 #SuspendKeyIgnoreInhibited=no
 #HibernateKeyIgnoreInhibited=no
@@ -39,7 +46,10 @@ HandlePowerKey=ignore
 #IdleAction=ignore
 #IdleActionSec=30min
 #RuntimeDirectorySize=10%
-#RuntimeDirectoryInodesMax=400k
+#RuntimeDirectoryInodesMax=
 #RemoveIPC=yes
 #InhibitorsMax=8192
 #SessionsMax=8192
+#StopIdleSessionSec=infinity
+#DesignatedMaintenanceTime=
+#WallMessages=yes

etc/tlp.conf

@@ -1,8 +1,8 @@
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-# /etc/tlp.conf - TLP user configuration (version 1.7.0)
+# /etc/tlp.conf - TLP user configuration (version 1.9.0)
 # See full explanation: https://linrunner.de/tlp/settings
 #
-# Copyright (c) 2024 Thomas Koch <linrunner at gmx.net> and others.
+# Copyright (c) 2025 Thomas Koch <linrunner at gmx.net> and others.
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Settings are read in the following order:
@@ -11,22 +11,37 @@
 # 2. /etc/tlp.d/*.conf - Drop-in customization snippets
 # 3. /etc/tlp.conf     - User configuration (this file)
 #
-# Notes:
+# Power Profiles: a part of TLP's parameters is divided into two or three
-# - In case of identical parameters, the last occurence has precedence
+# groups:
-# - This also means, parameters enabled here will override anything else
+# - performance: parameters ending in _AC are used when AC power is
-# - However you may append values to a parameter already defined as intrinsic
+#   connected or when the command 'tlp performance' is run.
-#   default or in a previously read file: use PARAMETER+="add values"
+# - balanced: parameters ending in _BAT are used when operating
-# - IMPORTANT: all parameters here are disabled; remove the leading '#' if you
+#   on battery power or when the command 'tlp balanced' is run.
-#   like to enable a feature without default or have a value different from the
+# - power-saver: parameters ending in _SAV are used when the command
-#   default
+#   'tlp power-saver' is run. If there is no _SAV parameter available
-# - Default *: intrinsic default that is effective when the parameter is missing
+#   for a feature, the _BAT parameter will be used instead.
-#   or disabled by a leading '#'; use PARAM="" to disable an intrinsic default
+# - Any remaining parameters not divided apply to all power profiles.
-# - Default <none>: do nothing or use kernel/hardware defaults
+#
-# - IMPORTANT: parameters must always be specified pairwise i.e. for
+# Please note:
-#   both AC and BAT. Omitting one of the two makes the set value effective for
+# - If parameters are specified more than once, the last occurrence takes
-#   both power sources, since a change only occurs when different values are
+#   precedence. This also means that any parameters defined here will take
-#   defined.
+#   precedence over any drop-ins.
-# ------------------------------------------------------------------------------
+# - You can however, append values to a parameter already defined as intrinsic
+#   default or in a previously read file: use PARAMETER+="add values".
+# - Important: all parameters are disabled here. Remove the leading '#' if you
+#   want to enable a feature without a default or if you want to set a value
+#   other than the default.
+# - Parameters must always be specified for all power profiles, i.e. in the
+#   AC, BAT and SAV category (where applicable). If you omit one of them,
+#   the missing profile will receive its value from another profile, since
+#   a change will only occur if different values are defined.
+# - To completely disable a parameter, use PARAMETER="".
+# Legend for defaults:
+# - Default *: intrinsic default that is effective when the parameter is
+#   missing or the line has a leading #'.
+# - Default <none>: do nothing or use kernel/hardware defaults.
+#
+# ----------------------------------------------------------------------------
 # tlp - Parameters for power saving
 
 # Set to 0 to disable, 1 to enable TLP.
@@ -34,10 +49,19 @@
 
 #TLP_ENABLE=1
 
+# Set to 1 to deactivate all intrinsic defaults of TLP. This means that
+# TLP only applies settings that have been explicitly activated i.e.
+# parameters without a leading '#'.
+# Notes:
+# - Helpful if one wants to use only selected features of TLP
+# - After activation, use tlp-stat -c to display your effective configuration
+
+#TLP_DISABLE_DEFAULTS=1
+
 # Control how warnings about invalid settings are issued:
-#   0=disabled,
+#   0=disabled
-#   1=background tasks (boot, resume, change of power source) report to syslog,
+#   1=background tasks (boot, resume, change of power source) report to syslog
-#   2=shell commands report to the terminal (stderr),
+#   2=shell commands report to the terminal (stderr)
 #   3=combination of 1 and 2
 # Default: 3
 
@@ -49,34 +73,54 @@
 #   96=cyan, 97=white.
 # Other colors are possible, refer to:
 #   https://en.wikipedia.org/wiki/ANSI_escape_code#3-bit_and_4-bit
-# Colors must be specified in the order "<error> <warning> <notice> <success>".
+# Colors must be specified in the order
+#   "<error> <warning> <notice> <success>".
 # By default, errors are shown in red, warnings in yellow, notices in bold
 # and success in green.
 # Default: "91 93 1 92"
 
 #TLP_MSG_COLORS="91 93 1 92"
 
-# Operation mode when no power supply can be detected: AC, BAT.
+# Control automatic switching of the power profile when connecting or removing
-# Concerns some desktop and embedded hardware only.
+# the charger, when booting the system or when executing 'tlp start':
+#   0=disabled - never switch, use TLP_DEFAULT_MODE if configured
+#   1=auto  - always switch, select performance on AC and
+#             balanced on battery power.
+#   2=smart - do not switch if the following profiles were active previously:
+#             power-saver or balanced on AC resp.
+#             power-saver or performance on battery power.
+# Note: the same applies if the charger was connected/removed during suspend.
+# Default: 2
+
+#TLP_AUTO_SWITCH=2
+
+# Power profile to use when automatic switching is disabled
+# (TLP_AUTO_SWITCH=0), profile is locked (TLP_PERSISTENT_DEFAULT=1)
+# or no power supply is detected:
+#   PRF=performance, BAL=balanced, SAV=power-saver.
+# Note: legacy values AC and BAT continue to work. They are mapped to
+# PRF and BAL, respectively.
 # Default: <none>
 
-#TLP_DEFAULT_MODE=AC
+#TLP_DEFAULT_MODE=BAL
 
-# Operation mode select: 0=depend on power source, 1=always use TLP_DEFAULT_MODE
+# Lock power profile:
-# Note: use in conjunction with TLP_DEFAULT_MODE=BAT for BAT settings on AC.
+#   0=profile depends on automatic switching,
+#   1=profile is locked to TLP_DEFAULT_MODE (TLP_AUTO_SWITCH is ignored).
 # Default: 0
 
 #TLP_PERSISTENT_DEFAULT=0
 
-# Power supply classes to ignore when determining operation mode: AC, USB, BAT.
+# Power supply classes to ignore when determining power profile:
+#  AC, USB, BAT.
 # Separate multiple classes with spaces.
 # Note: try on laptops where operation mode AC/BAT is incorrectly detected.
 # Default: <none>
 
 #TLP_PS_IGNORE="BAT"
 
-# Seconds laptop mode has to wait after the disk goes idle before doing a sync.
+# Seconds laptop mode has to wait after the disk goes idle before doing a
-# Non-zero value enables, zero disables laptop mode.
+# sync. Non-zero value enables, zero disables laptop mode.
 # Default: 0 (AC), 2 (BAT)
 
 #DISK_IDLE_SECS_ON_AC=0
@@ -96,6 +140,7 @@
 # Default: <none>
 #CPU_DRIVER_OPMODE_ON_AC=active
 #CPU_DRIVER_OPMODE_ON_BAT=active
+#CPU_DRIVER_OPMODE_ON_SAV=active
 
 # Select a CPU frequency scaling governor.
 # Intel CPU with intel_pstate driver or
@@ -104,7 +149,7 @@
 # Intel CPU with intel_pstate driver in passive mode ('intel_cpufreq') or
 # AMD CPU with amd-pstate driver in passive or guided mode ('amd-pstate') or
 # Intel, AMD and other CPU brands with acpi-cpufreq driver:
-#   conservative, ondemand(*), userspace, powersave, performance, schedutil(*).
+#   conservative, ondemand(*), userspace, powersave, performance, schedutil(*)
 # Use tlp-stat -p to show the active driver and available governors.
 # Important:
 #   Governors marked (*) above are power efficient for *almost all* workloads
@@ -113,8 +158,9 @@
 #   changing the governor.
 # Default: <none>
 
-#CPU_SCALING_GOVERNOR_ON_AC=powersave
+#CPU_SCALING_GOVERNOR_ON_AC=performance
 #CPU_SCALING_GOVERNOR_ON_BAT=powersave
+#CPU_SCALING_GOVERNOR_ON_SAV=powersave
 
 # Set the min/max frequency available for the scaling governor.
 # Possible values depend on your CPU. For available frequencies see
@@ -129,6 +175,8 @@
 #CPU_SCALING_MAX_FREQ_ON_AC=0
 #CPU_SCALING_MIN_FREQ_ON_BAT=0
 #CPU_SCALING_MAX_FREQ_ON_BAT=0
+#CPU_SCALING_MIN_FREQ_ON_SAV=0
+#CPU_SCALING_MAX_FREQ_ON_SAV=0
 
 # Set CPU energy/performance policies EPP and EPB:
 #   performance, balance_performance, default, balance_power, power.
@@ -141,10 +189,11 @@
 #   will not honor EPB. Only the matching feature will be applied by TLP.
 # * AMD Zen 2 or newer CPU
 #   EPP: amd-pstate driver in active mode ('amd-pstate-epp') as of kernel 6.3
-# Default: balance_performance (AC), balance_power (BAT)
+# Default: balance_performance (AC), balance_power (BAT), power (SAV)
 
 #CPU_ENERGY_PERF_POLICY_ON_AC=balance_performance
 #CPU_ENERGY_PERF_POLICY_ON_BAT=balance_power
+#CPU_ENERGY_PERF_POLICY_ON_SAV=power
 
 # Set Intel CPU P-state performance: 0..100 (%).
 # Limit the max/min P-state to control the power dissipation of the CPU.
@@ -155,9 +204,11 @@
 #CPU_MIN_PERF_ON_AC=0
 #CPU_MAX_PERF_ON_AC=100
 #CPU_MIN_PERF_ON_BAT=0
-#CPU_MAX_PERF_ON_BAT=30
+#CPU_MAX_PERF_ON_BAT=80
+#CPU_MIN_PERF_ON_SAV=0
+#CPU_MAX_PERF_ON_SAV=60
 
-# Set the CPU "turbo boost" (Intel) or "turbo core" (AMD) feature:
+# Set the CPU "turbo boost" (Intel) or "core performance boost" (AMD) feature:
 #   0=disable, 1=allow.
 # Allows to raise the maximum frequency/P-state of some cores if the
 # CPU chip is not fully utilized and below it's intended thermal budget.
@@ -165,18 +216,21 @@
 # Default: <none>
 
 #CPU_BOOST_ON_AC=1
-#CPU_BOOST_ON_BAT=0
+#CPU_BOOST_ON_BAT=1
+#CPU_BOOST_ON_SAV=0
 
 # Set CPU dynamic boost feature:
 #   0=disable, 1=enable.
 # Improve performance by increasing minimum P-state limit dynamically
 # whenever a task previously waiting on I/O is selected to run.
-# Requires Intel Core i  6th gen. or newer CPU: intel_pstate driver in active mode.
+# Requires Intel Core i  6th gen. or newer CPU with intel_pstate driver
+# in active mode.
 # Note: AMD CPUs currently have no tunable for this.
 # Default: <none>
 
 #CPU_HWP_DYN_BOOST_ON_AC=1
-#CPU_HWP_DYN_BOOST_ON_BAT=0
+#CPU_HWP_DYN_BOOST_ON_BAT=1
+#CPU_HWP_DYN_BOOST_ON_SAV=0
 
 # Kernel NMI Watchdog:
 #   0=disable (default, saves power), 1=enable (for kernel debugging only).
@@ -190,10 +244,11 @@
 # thermal and fan speed. Values are given in order of increasing power saving.
 # Note: check the output of tlp-stat -p to determine availability on your
 # hardware and additional profiles such as: balanced-performance, quiet, cool.
-# Default: <none>
+# Default: performance (AC), balanced (BAT), low-power (SAV)
 
 #PLATFORM_PROFILE_ON_AC=performance
-#PLATFORM_PROFILE_ON_BAT=low-power
+#PLATFORM_PROFILE_ON_BAT=balanced
+#PLATFORM_PROFILE_ON_SAV=low-power
 
 # System suspend mode:
 #   s2idle: Idle standby - a pure software, light-weight, system sleep state,
@@ -283,8 +338,8 @@
 # Runtime Power Management for NVMe, SATA, ATA and USB disks
 # as well as SATA ports:
 #   on=disable, auto=enable.
-# Note: SATA controllers are PCIe bus devices and handled by RUNTIME_PM further
+# Note: SATA controllers are PCIe bus devices and handled by RUNTIME_PM
-# down.
+# further down.
 
 # Default: on (AC), auto (BAT)
 
@@ -338,24 +393,17 @@
 #RADEON_DPM_STATE_ON_AC=performance
 #RADEON_DPM_STATE_ON_BAT=battery
 
-# Graphics clock speed (profile method): low, mid, high, auto, default;
-# auto = mid on BAT, high on AC.
-# Note: radeon driver on legacy ATI hardware only (where DPM is not available).
-# Default: default
-
-#RADEON_POWER_PROFILE_ON_AC=default
-#RADEON_POWER_PROFILE_ON_BAT=default
-
 # Display panel adaptive backlight modulation (ABM) level: 0(off), 1..4.
 # Values 1..4 control the maximum brightness reduction allowed by the ABM
 # algorithm, where 1 represents the least and 4 the most power saving.
 # Notes:
 # - Requires AMD Vega or newer GPU with amdgpu driver as of kernel 6.9
 # - Savings are made at the expense of color balance
-# Default: 0 (AC), 1 (BAT)
+# Default: 0 (AC), 1 (BAT), 3 (SAV)
 
 #AMDGPU_ABM_LEVEL_ON_AC=0
-#AMDGPU_ABM_LEVEL_ON_BAT=3
+#AMDGPU_ABM_LEVEL_ON_BAT=1
+#AMDGPU_ABM_LEVEL_ON_SAV=3
 
 # Wi-Fi power saving mode: on=enable, off=disable.
 # Default: off (AC), on (BAT)
@@ -518,23 +566,23 @@ SOUND_POWER_SAVE_ON_BAT=1
 # Charging starts when the charger is connected and the charge level
 # is below the start threshold. Charging stops when the charge level
 # is above the stop threshold.
-# Required hardware: Lenovo ThinkPads and select other laptop brands
+# Required hardware: Lenovo ThinkPads and other laptop brands are driven
-# are driven via specific plugins
+#   via specific plugins:
-# - Active plugin and support status are shown by tlp-stat -b
+# - Use the tlp-stat -b command to see if a plugin for your hardware is
-# - Vendor specific threshold levels are shown by tlp-stat -b, some
+#   active and to look up vendor-specific threshold values. Some
-#   laptops support only 1 (on)/ 0 (off) instead of a percentage level
+#   laptops support only 1 (on)/0 (off) instead of a percentage level.
-# - When your hardware supports a start *and* a stop threshold, you must
+# - If your hardware supports a start *and* a stop threshold, you must
-#   specify both, otherwise TLP will refuse to apply the single threshold
+#   specify both, otherwise TLP will refuse to apply the single threshold.
-# - When your hardware supports only a stop threshold, set the start
+# - If your hardware supports only a stop threshold, set the start
-#   value to 0
+#   value to 0.
-# - Older ThinkPads may require an external kernel module, refer to the
+# - The names of the batteries shown by tlp-stat -b don't have to match
-#   output of tlp-stat -b
+#   the _BAT0 or _BAT1 parameter qualifiers. Please refer to [2]
-# For further explanation and vendor specific details refer to
+#   to see which qualifier applies to which battery.
-# - https://linrunner.de/tlp/settings/battery.html
+# For further explanation and all vendor specific details refer to
-# - https://linrunner.de/tlp/settings/bc-vendors.html
+# [1] https://linrunner.de/tlp/settings/battery.html
-
+# [2] https://linrunner.de/tlp/settings/bc-vendors.html
-# BAT0: Primary / Main / Internal battery
+
-# Note: also use for batteries BATC, BATT and CMB0
+# BAT0: Main battery
 # Default: <none>
 
 # Battery charge level below which charging will begin.
@@ -542,8 +590,7 @@ SOUND_POWER_SAVE_ON_BAT=1
 # Battery charge level above which charging will stop.
 #STOP_CHARGE_THRESH_BAT0=80
 
-# BAT1: Secondary / Ultrabay / Slice / Replaceable battery
+# BAT1: Secondary battery (primary on some laptops)
-# Note: primary on some laptops
 # Default: <none>
 
 # Battery charge level below which charging will begin.
@@ -556,8 +603,9 @@ SOUND_POWER_SAVE_ON_BAT=1
 
 #RESTORE_THRESHOLDS_ON_BAT=1
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-# tlp-rdw - Parameters for the radio device wizard
+# tlp-rdw - Radio Device Wizard
+# Note: requires installation of the optional package tlp-rdw.
 
 # Possible devices: bluetooth, wifi, wwan.
 # Separate multiple radio devices with spaces.
@@ -576,6 +624,9 @@ SOUND_POWER_SAVE_ON_BAT=1
 #DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
 
 # Radio devices to enable/disable when docked.
+# Note: not all docks can be recognized, especially USB-C docks. If a LAN
+# cable is connected to the dock, use DEVICES_TO_DISABLE_ON_LAN_CONNECT
+# and DEVICES_TO_ENABLE_ON_LAN_DISCONNECT instead.
 
 #DEVICES_TO_ENABLE_ON_DOCK=""
 #DEVICES_TO_DISABLE_ON_DOCK=""