From 802a4e9e2a0cc3081bcde285a8a5748735ea1f4f Mon Sep 17 00:00:00 2001 From: CGH0S7 <776459475@qq.com> Date: Mon, 13 Apr 2026 11:47:42 +0800 Subject: [PATCH] update 20260413 --- config | 88 ++++++----- config.backup | 324 +++++++++++++++++++++++++++++++++++++++++ power-management.md | 56 +++++++ scripts/lid-handler.sh | 9 ++ xwayland-hidpi.sh | 5 + 5 files changed, 448 insertions(+), 34 deletions(-) create mode 100644 config.backup create mode 100644 power-management.md create mode 100755 scripts/lid-handler.sh create mode 100755 xwayland-hidpi.sh diff --git a/config b/config index 1eeef7a..d5e4439 100644 --- a/config +++ b/config @@ -2,6 +2,9 @@ # # Read `man 5 sway` for a complete reference. +# XWayland scaling fix for fractional scaling +exec systemctl --user set-environment XCURSOR_SIZE=24 + # Set default font for sway and monospace font font pango:Clear Sans 10 font pango:Maple Mono NF CN 10 @@ -18,24 +21,26 @@ set $right l # Your preferred terminal emulator set $term foot # Your preferred application launcher -#set $menu wmenu-run -set $menu "wofi -show drun" +set $menu /home/gh0s7/.local/bin/wofi-fcitx --show drun set $browser firefox-developer-edition +set $vscode code # ... (previous config) -### Appearance +### Appearance (optimized for battery) # -# Gaps -gaps inner 10 -gaps outer 5 -smart_gaps on +# Minimal gaps for reduced compositor work +gaps inner 0 +gaps outer 0 -# Borders -default_border pixel 2 -default_floating_border pixel 2 +# Minimal borders - hide titlebar by default +default_border pixel 1 +default_floating_border pixel 1 hide_edge_borders smart +# Toggle titlebar with Alt+t +bindsym Mod1+t border toggle + # Colors (Catppuccin Mocha Inspired) set $rosewater #f5e0dc set $flamingo #f2cdcd @@ -77,8 +82,11 @@ client.background $base # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) #output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill #output * bg /home/gh0s7/Pictures/Wallpapers/130036304_p21.png fill -output * bg /home/gh0s7/Pictures/Wallpapers/ThinkPad/TP1024.BMP fill +#output * bg /home/gh0s7/Pictures/Wallpapers/ThinkPad/TP1024.BMP fill +output * bg /home/gh0s7/Pictures/Wallpapers/linus-wallpaper.jpeg fill output eDP-1 scale 1.5 +# Fix XWayland blurry apps with fractional scaling +xwayland enable # # Example configuration: # @@ -144,6 +152,8 @@ input * xkb_options caps:escape_shifted_capslock bindsym Ctrl+Alt+f exec $browser bindsym Ctrl+Alt+l exec swaylock -i /home/gh0s7/Pictures/Wallpapers/ThinkPad/IBM1024R.BMP -s fill bindsym Ctrl+Alt+e exec dolphin + bindsym Ctrl+Shift+y exec code + # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -153,7 +163,7 @@ input * xkb_options caps:escape_shifted_capslock floating_modifier $mod normal # Reload the configuration file - bindsym $mod+Shift+c exec pkill waybar && swaymsg reload + bindsym $mod+Shift+c reload # Exit sway (logs you out of your Wayland session) bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' @@ -187,6 +197,7 @@ input * xkb_options caps:escape_shifted_capslock # Workspaces: # # Switch to workspace +# bindsym $mod+Alt+0 workspace number 0 bindsym $mod+1 workspace number 1 bindsym $mod+2 workspace number 2 bindsym $mod+3 workspace number 3 @@ -198,6 +209,7 @@ input * xkb_options caps:escape_shifted_capslock bindsym $mod+9 workspace number 9 bindsym $mod+0 workspace number 10 # Move focused container to workspace +# bindsym $mod+Shift+Alt+0 move container to workspace number 0 bindsym $mod+Shift+1 move container to workspace number 1 bindsym $mod+Shift+2 move container to workspace number 2 bindsym $mod+Shift+3 move container to workspace number 3 @@ -207,7 +219,7 @@ input * xkb_options caps:escape_shifted_capslock bindsym $mod+Shift+7 move container to workspace number 7 bindsym $mod+Shift+8 move container to workspace number 8 bindsym $mod+Shift+9 move container to workspace number 9 - bindsym $mod+Shift+0 move container to workspace number 0 + bindsym $mod+Shift+0 move container to workspace number 10 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. # @@ -279,6 +291,10 @@ bindsym $mod+r mode "resize" bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle + # Media player controls + bindsym Ctrl+Alt+Left exec playerctl previous + bindsym Ctrl+Alt+0 exec playerctl play-pause + bindsym Ctrl+Alt+Right exec playerctl next # Special keys to adjust brightness via brightnessctl bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ @@ -289,33 +305,34 @@ bindsym $mod+r mode "resize" # # Status Bar: # -# Read `man 5 sway-bar` for more information about this section. -#bar { -# status_command i3status -# position top +# Minimal built-in bar for battery efficiency +bar { + position top + status_command while LC_TIME=en_US.UTF-8 date +'%y/%m/%d %a | %H:%M | BAT: '$(cat /sys/class/power_supply/BAT*/capacity 2>/dev/null || echo "AC")'%'; do sleep 60; done + tray_output none - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. -# status_command while date +'%Y-%m-%d %X'; do sleep 1; done + colors { + background #1e1e2e + statusline #cdd6f4 + separator #45475a -# colors { -# background #00000090 -# statusline #ffffff -# separator #666666 -# # background #323232 -# focused_workspace #4c7899 #285577 #ffffff -# active_workspace #333333 #5f676a #ffffff -# inactive_workspace #333333 #222222 #888888 -# urgent_workspace #2f343a #900000 #ffffff -# inactive_workspace #32323200 #32323200 #5c5c5c -# } -#} -exec_always waybar + focused_workspace #cba6f7 #cba6f7 #1e1e2e + active_workspace #45475a #45475a #cdd6f4 + inactive_workspace #1e1e2e #1e1e2e #6c7086 + urgent_workspace #f38ba8 #f38ba8 #1e1e2e + } +} +#exec_always waybar include /etc/sway/config.d/* #exec_always fcixt5 -d --replace exec --no-startup-id fcitx5 -d -exec --no-startup-id brightnessctl set 16000 +exec --no-startup-id brightnessctl set 18000 +exec swaync +exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec systemctl --user import-environment GDK_SCALE GDK_DPI_SCALE QT_AUTO_SCREEN_SCALE_FACTOR +exec dbus-update-activation-environment --systemd GDK_SCALE=2 GDK_DPI_SCALE=0.5 QT_AUTO_SCREEN_SCALE_FACTOR=1 #exec --no-startup-id /usr/libexec/pipewire-launcher # Idle configuration exec swayidle -w \ @@ -323,4 +340,7 @@ exec swayidle -w \ timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ before-sleep 'swaylock -f -c 000000' +# Lid switch handler +bindswitch --reload --locked lid:on exec ~/.config/sway/scripts/lid-handler.sh + seat * hide_cursor 5000 diff --git a/config.backup b/config.backup new file mode 100644 index 0000000..79b131a --- /dev/null +++ b/config.backup @@ -0,0 +1,324 @@ +# Default config for sway +# +# Read `man 5 sway` for a complete reference. + +# Set default font for sway and monospace font +font pango:Clear Sans 10 +font pango:Maple Mono NF CN 10 + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term ghostty +# Your preferred application launcher +set $menu wofi --show drun +set $browser firefox-developer-edition + +# ... (previous config) + +### Appearance (optimized for battery) +# +# Minimal gaps for reduced compositor work +gaps inner 0 +gaps outer 0 + +# Minimal borders +default_border pixel 1 +default_floating_border pixel 1 +hide_edge_borders smart + +# Colors (Catppuccin Mocha Inspired) +set $rosewater #f5e0dc +set $flamingo #f2cdcd +set $pink #f5c2e7 +set $mauve #cba6f7 +set $red #f38ba8 +set $maroon #eba0ac +set $peach #fab387 +set $yellow #f9e2af +set $green #a6e3a1 +set $teal #94e2d5 +set $sky #89dceb +set $sapphire #74c7ec +set $blue #89b4fa +set $lavender #b4befe +set $text #cdd6f4 +set $subtext1 #bac2de +set $subtext0 #a6adc8 +set $overlay2 #9399b2 +set $overlay1 #7f849c +set $overlay0 #6c7086 +set $surface2 #585b70 +set $surface1 #45475a +set $surface0 #313244 +set $base #1e1e2e +set $mantle #181825 +set $crust #11111b + +# class border backgr. text indicator child_border +client.focused $mauve $base $text $rosewater $mauve +client.focused_inactive $overlay0 $base $text $rosewater $overlay0 +client.unfocused $overlay0 $base $text $rosewater $overlay0 +client.urgent $red $base $peach $overlay0 $red +client.placeholder $overlay0 $base $text $overlay0 $overlay0 +client.background $base + +### Output configuration +# +# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) +#output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +#output * bg /home/gh0s7/Pictures/Wallpapers/130036304_p21.png fill +output * bg /home/gh0s7/Pictures/Wallpapers/ThinkPad/TP1024.BMP fill +output eDP-1 scale 1.5 +# Fix XWayland blurry apps with fractional scaling +xwayland force +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +### Input configuration +# +# Example configuration: +# +# input type:touchpad { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# input type:keyboard { +# xkb_layout "eu" +# } +# +# You can also configure each device individually. +# Read `man 5 sway-input` for more information about this section. +input "2:10:TPPS/2_IBM_TrackPoint" { + dwt enabled + tap enabled + accel_profile adaptive + pointer_accel 0.4 +} + +input * xkb_options caps:escape_shifted_capslock + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+Return exec $term + bindsym Ctrl+Alt+T exec $term + + # Kill focused window + bindsym $mod+Shift+q kill + bindsym Alt+F4 kill + + # Start your launcher + bindsym $mod+d exec $menu + bindsym Alt+Space exec $menu + + bindsym Ctrl+Alt+f exec $browser + bindsym Ctrl+Alt+l exec swaylock -i /home/gh0s7/Pictures/Wallpapers/ThinkPad/IBM1024R.BMP -s fill + bindsym Ctrl+Alt+e exec dolphin + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # Reload the configuration file + bindsym $mod+Shift+c reload + + # Exit sway (logs you out of your Wayland session) + bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + bindsym Alt+Tab focus right + bindsym Alt+Shift+Tab focus left + # Or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # Move the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # Ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # Switch to workspace + bindsym $mod+1 workspace number 1 + bindsym $mod+2 workspace number 2 + bindsym $mod+3 workspace number 3 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 0 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # Move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # Ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+r mode "resize" +# +# Utilities: +# + # Special keys to adjust volume via PulseAudio + bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle + bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% + bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% + bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle + # Special keys to adjust brightness via brightnessctl + bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- + bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ + # Special key to take a screenshot with grim + bindsym Print exec grim + bindsym $mod+Shift+S exec grim -g "$(slurp)" + +# +# Status Bar: +# +# Minimal built-in bar for battery efficiency +bar { + position top + status_command while LC_TIME=en_US.UTF-8 date +'%y/%m/%d %a | %H:%M | BAT: '$(cat /sys/class/power_supply/BAT*/capacity 2>/dev/null || echo "AC")'%'; do sleep 60; done + tray_output none + + colors { + background #1e1e2e + statusline #cdd6f4 + separator #45475a + + focused_workspace #cba6f7 #cba6f7 #1e1e2e + active_workspace #45475a #45475a #cdd6f4 + inactive_workspace #1e1e2e #1e1e2e #6c7086 + urgent_workspace #f38ba8 #f38ba8 #1e1e2e + } +} +#exec_always waybar + +include /etc/sway/config.d/* +#exec_always fcixt5 -d --replace +exec --no-startup-id fcitx5 -d +exec --no-startup-id brightnessctl set 16000 +exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +#exec --no-startup-id /usr/libexec/pipewire-launcher +# Idle configuration +exec swayidle -w \ + timeout 300 'swaylock -f -c 000000' \ + timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ + before-sleep 'swaylock -f -c 000000' + +seat * hide_cursor 5000 diff --git a/power-management.md b/power-management.md new file mode 100644 index 0000000..9e10472 --- /dev/null +++ b/power-management.md @@ -0,0 +1,56 @@ +# Sway 电源自动管理配置 + +## 功能说明 + +实现 Sway 环境下根据电源状态自动切换性能模式： +- **插电源**：`throughput-performance` (高性能) +- **用电池**：`laptop-battery-powersave` (节能降频) + +仅在 Sway 会话生效，不影响 Plasma 的电源管理。 + +## 实现方式 + +### 1. 自动切换脚本 +`/usr/local/bin/tuned-auto-switch.sh` +```bash +#!/bin/bash +# Only run if Sway is running +pgrep -x sway > /dev/null || exit 0 + +if [ "$(cat /sys/class/power_supply/AC*/online)" = "1" ]; then + tuned-adm profile throughput-performance +else + tuned-adm profile laptop-battery-powersave +fi +``` + +### 2. Systemd 服务 +`/etc/systemd/system/tuned-power-switch@.service` +```ini +[Unit] +Description=Switch tuned profile on power change + +[Service] +Type=oneshot +ExecStart=/usr/local/bin/tuned-auto-switch.sh +``` + +### 3. Udev 规则 +`/etc/udev/rules.d/99-tuned-power.rules` +``` +SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", TAG+="systemd", ENV{SYSTEMD_WANTS}="tuned-power-switch@$kernel.service" +SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}="tuned-power-switch@$kernel.service" +``` + +## 验证 + +查看当前配置： +```bash +tuned-adm active +cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor +``` + +监控切换日志： +```bash +journalctl -f +``` diff --git a/scripts/lid-handler.sh b/scripts/lid-handler.sh new file mode 100755 index 0000000..df1b18e --- /dev/null +++ b/scripts/lid-handler.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# 检查是否插电 +if cat /sys/class/power_supply/AC*/online 2>/dev/null | grep -q 1; then + # 插电：锁屏 + swaylock -i /home/gh0s7/Pictures/Wallpapers/ThinkPad/IBM1024R.BMP -s fill +else + # 不插电：睡眠 + systemctl suspend +fi diff --git a/xwayland-hidpi.sh b/xwayland-hidpi.sh new file mode 100755 index 0000000..3bc11e3 --- /dev/null +++ b/xwayland-hidpi.sh @@ -0,0 +1,5 @@ +#!/bin/sh +export GDK_SCALE=2 +export GDK_DPI_SCALE=0.5 +export QT_AUTO_SCREEN_SCALE_FACTOR=1 +export XCURSOR_SIZE=32