From 1e122dd8a636e583523eb0fc444f289dccd2bbef Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 14:04:36 -0400 Subject: [PATCH 01/20] Init config updates for ClockworkPi uConsole --- alacritty/.config/alacritty/alacritty.toml | 2 +- desktop-base/.config/kdeglobals | 2 +- sway/.config/environment.d/qt.conf | 1 + sway/.config/sway/config | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 sway/.config/environment.d/qt.conf diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index f120194..1c61d5c 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -39,7 +39,7 @@ family = "Fira Code" [window] dynamic_padding = true -opacity = 1 +opacity = 0.95 decorations_theme_variant = "Dark" [window.dimensions] diff --git a/desktop-base/.config/kdeglobals b/desktop-base/.config/kdeglobals index d7d9da8..8ce325e 100644 --- a/desktop-base/.config/kdeglobals +++ b/desktop-base/.config/kdeglobals @@ -97,7 +97,7 @@ Name=Gruvbox shadeSortColumn=true [Icons] -Theme=gruvbox-dark-icons-gtk +Theme=Gruvbox-Dark [KDE] contrast=4 diff --git a/sway/.config/environment.d/qt.conf b/sway/.config/environment.d/qt.conf new file mode 100644 index 0000000..57547ee --- /dev/null +++ b/sway/.config/environment.d/qt.conf @@ -0,0 +1 @@ +QT_QPA_PLATFORMTHEME=qt6ct diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 8126639..d771dce 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -7,14 +7,14 @@ ### Variables # # Logo key. Use Mod1 for Alt. -set $mod Mod4 +set $mod Mod1 # Home row direction keys, like vim set $left h set $down j set $up k set $right l # Your preferred terminal emulator -set $term alacritty +set $term systemd-run --user alacritty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. @@ -67,7 +67,7 @@ set $wallpaper /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png bindsym $mod+Return exec $term # Kill focused window - bindsym $mod+Shift+q kill + bindsym $mod+q kill # Start your launcher bindsym $mod+d exec $menu @@ -292,5 +292,4 @@ exec_always "systemctl --user is-active kanshi && systemctl --user restart kansh # Floating window rules for_window [app_id="pavucontrol"] floating enable -for_window [app_id="qalculate-qt"] floating enable, resize set width 800 px height 800 px, opacity 1 for_window [app_id="thunderbird" title="Write.*"] floating enable, resize set width 800 px height 800 px From 93ec3b68230ba620022a8b817a26d442ebf62c29 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 14:32:49 -0400 Subject: [PATCH 02/20] Remove reboot and lock --- desktop-base/.config/nwg-bar/bar.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/desktop-base/.config/nwg-bar/bar.json b/desktop-base/.config/nwg-bar/bar.json index 6c456e7..b5438c8 100644 --- a/desktop-base/.config/nwg-bar/bar.json +++ b/desktop-base/.config/nwg-bar/bar.json @@ -1,22 +1,12 @@ [ - { - "label": "Lock", - "exec": "swaylock -f -c 000000", - "icon": "/usr/share/nwg-bar/images/system-lock-screen.svg" - }, { "label": "Logout", "exec": "swaymsg exit", "icon": "/usr/share/nwg-bar/images/system-log-out.svg" }, - { - "label": "Reboot", - "exec": "systemctl reboot", - "icon": "/usr/share/nwg-bar/images/system-reboot.svg" - }, { "label": "Shutdown", "exec": "systemctl -i poweroff", "icon": "/usr/share/nwg-bar/images/system-shutdown.svg" } -] \ No newline at end of file +] From 741de306603b757fd5db967e3672d16334a1c5fc Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 14:32:59 -0400 Subject: [PATCH 03/20] Add uconsole-rootfs and scripts for audio patch --- .../system/clockworkpi-audio-patch.service | 9 +++++ .../usr/local/bin/clockworkpi-audio-patch | 38 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service create mode 100755 uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch diff --git a/uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service b/uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service new file mode 100644 index 0000000..3b2b6ca --- /dev/null +++ b/uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service @@ -0,0 +1,9 @@ +[Unit] +Description=ClockworkPi Audio Service (3.5mm / speaker switching) + +[Service] +Type=simple +ExecStart=/usr/local/bin/clockworkpi-audio-patch + +[Install] +WantedBy=default.target diff --git a/uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch b/uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch new file mode 100755 index 0000000..5247944 --- /dev/null +++ b/uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +set -e + +if [ $UID -ne 0 ]; then + echo "Please run as root!" + exit 1 +fi + +if ! which pinctrl; then + echo "Please install pinctrl (raspberrypi-utils)!" + exit 1 +fi + +cleanup() { + echo "Disabling speaker before exitting" + # Disable speaker when this script exits + pinctrl set 11 dl +} + +trap cleanup EXIT + +# Initialize GPIO pin 10 (3.5mm sense) +pinctrl set 10 ip pn +# Pin 11 (speaker) +pinctrl set 11 op + +while true; do + if pinctrl 10 | grep -q "lo"; then + echo "Enabling speaker" + pinctrl set 11 op dh + else + echo "Disabling speaker" + pinctrl set 11 op dl + fi + sleep 1 +done + From 9b267a003bbc2e7f3a4824f0436d60e01609830a Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 14:39:27 -0400 Subject: [PATCH 04/20] Fix uid used in ssh agent --- bash/.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/.bashrc b/bash/.bashrc index aa8f5cd..5b8faa7 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -149,7 +149,7 @@ export PATH="$PATH:~/.local/bin" export PASSWORD_STORE_ENABLE_EXTENSIONS=true # Use gpg-agent-ssh -export SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh +export SSH_AUTH_SOCK=/run/user/$(id -u)/gnupg/S.gpg-agent.ssh # Miscellaneous utilities function clamp_filename() { From f95e38d9d28bd1803694f9d3344a01a87908a679 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 16:25:06 -0400 Subject: [PATCH 05/20] Tune waybar layout --- desktop-base/.config/waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-base/.config/waybar/config b/desktop-base/.config/waybar/config index 592b12d..1b36cfa 100644 --- a/desktop-base/.config/waybar/config +++ b/desktop-base/.config/waybar/config @@ -3,7 +3,7 @@ "position": "bottom", "modules-left": ["custom/power", "niri/workspaces", "sway/workspaces", "sway/mode"], "modules-center": [], - "margin": "0px 10px 10px 10px", + "margin": "5px 10px 5px 10px", "include": [ "$HOME/.config/waybar/local" ], From 3efe1293c18fb4e8f57e1d05d57cb981a0c32584 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 16:26:13 -0400 Subject: [PATCH 06/20] Delete unused from sway --- sway/.config/sway/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index d771dce..0e5b9ad 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -229,8 +229,6 @@ swaybg_command /home/peter/.local/bin/swaybg-systemd-wrapper output "*" bg $wallpaper fill -# Lockscreen - requires jirutka/swaylock-effects -bindsym Ctrl+Mod1+l exec "PASSWORD_STORE_ENABLE_EXTENSIONS=true pass gocrypt close; systemctl --user stop gpg-agent; swaylock -S --effect-pixelate 30 --effect-vignette 0.4:1 --clock --indicator --indicator-thickness 6 --ring-color ebdbb2 --inside-color 00000055 --ring-ver-color 458588 --inside-ver-color 45858855 --text-ver-color 83a598 --ring-wrong-color cc241d --inside-wrong-color cc241d55 --text-wrong-color fb4934 --key-hl-color 4d4d4d --line-uses-ring --separator-color 00000000 --text-color ebdbb2 --timestr '%H:%M'" bindsym $mod+x exec bemenu-run | xargs swaymsg exec -- bindsym Print exec grimshot --notify save area @@ -286,10 +284,6 @@ exec_always "systemctl --user import-environment; systemctl --user start sway-se # Import environment to D-Bus as well for xdg-desktop-portals etc exec_always dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway -# Restart kanshi if it is running -# This restores monitor configuration on reload -exec_always "systemctl --user is-active kanshi && systemctl --user restart kanshi" - # Floating window rules for_window [app_id="pavucontrol"] floating enable for_window [app_id="thunderbird" title="Write.*"] floating enable, resize set width 800 px height 800 px From a9ce6d475038e286ec8f5210ab2a7e51c8032e78 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 17:45:35 -0400 Subject: [PATCH 07/20] Fixup brightness control on uconsole and add swayidle --- sway/.config/sway/config | 5 +++++ sway/.config/sway/shared.d/brightness_ctl | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 0e5b9ad..f8c8558 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -221,6 +221,7 @@ bindsym $mod+r mode "resize" include /etc/sway/config.d/* include /home/peter/.config/sway/local.d/* +include /home/peter/.config/sway/shared.d/brightness_ctl # Wrap swaybg in systemd-run to allow swaybg to be automatically restarted # if it ever crashes. The wrapper script will also automatically purge old @@ -241,6 +242,10 @@ bindsym Shift+F10 exec grimshot --notify save screen bindsym Ctrl+Tab workspace next bindsym Ctrl+grave workspace prev +bindsym Ctrl+l exec swaylock -f -c 000000 && pkill -SIGUSR1 swayidle + +exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' + # Audio volume (WirePlumber) bindsym --locked XF86AudioRaiseVolume exec "wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+" bindsym --locked XF86AudioLowerVolume exec "wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-" diff --git a/sway/.config/sway/shared.d/brightness_ctl b/sway/.config/sway/shared.d/brightness_ctl index 62b415d..aa5fd5b 100644 --- a/sway/.config/sway/shared.d/brightness_ctl +++ b/sway/.config/sway/shared.d/brightness_ctl @@ -1,4 +1,2 @@ -# set brightness logarithmically by factor 1.4 -# .72 is just slightly bigger than 1 / 1.4 -bindsym --locked XF86MonBrightnessUp exec light -S "$(light -G | awk '{ print int(($1 + .72) * 1.4) }')" -bindsym --locked XF86MonBrightnessDown exec light -S "$(light -G | awk '{ print int($1 / 1.4) }')" +bindsym --locked XF86MonBrightnessUp exec light -S "$(light -G | awk '{ print (int($1 / 10) + 2) * 10 }')" +bindsym --locked XF86MonBrightnessDown exec light -S "$(light -G | awk '{ if (int($1 - 10) > 20) { print (int($1 / 10) - 1) * 10 } else { print 20 } }')" From d6594a06e80c781072a78ec3bc1706f8b3f364ea Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 17:47:11 -0400 Subject: [PATCH 08/20] Sleep 1s before triggering swayidle Otherwise we "resume" almost immediately --- sway/.config/sway/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index f8c8558..aa515e1 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -242,7 +242,7 @@ bindsym Shift+F10 exec grimshot --notify save screen bindsym Ctrl+Tab workspace next bindsym Ctrl+grave workspace prev -bindsym Ctrl+l exec swaylock -f -c 000000 && pkill -SIGUSR1 swayidle +bindsym Ctrl+l exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' From 615d47fc9d1e6289ff4abad2867f6f98cecc3f74 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 17:50:31 -0400 Subject: [PATCH 09/20] Move scale to main config --- sway/.config/sway/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index aa515e1..1ba4094 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -266,6 +266,8 @@ input type:touchpad { tap enabled } +output "DSI-2" scale 1.2 + font "Noto Sans Mono" 13px default_border pixel 2 From 5b05b76b9593b3596a420fcc380c520689787b42 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 17:56:43 -0400 Subject: [PATCH 10/20] Enable scrolling with button 2 --- sway/.config/sway/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 1ba4094..7241ffd 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -266,6 +266,11 @@ input type:touchpad { tap enabled } +input type:pointer { + scroll_button button3 + scroll_method on_button_down +} + output "DSI-2" scale 1.2 font "Noto Sans Mono" 13px From 64d018a03b4ee5b5ffd93e41245847665d692a29 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 20:07:05 -0400 Subject: [PATCH 11/20] Use pause instead of ralt as compose key --- sway/.config/sway/config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 7241ffd..e761239 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -259,7 +259,7 @@ input "*" { repeat_rate 30 repeat_delay 300 # Input letters with diacritics - xkb_options compose:ralt + xkb_options compose:paus } input type:touchpad { @@ -299,3 +299,8 @@ exec_always dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR # Floating window rules for_window [app_id="pavucontrol"] floating enable for_window [app_id="thunderbird" title="Write.*"] floating enable, resize set width 800 px height 800 px + +# When firefox is full screen, don't idle +for_window [app_id="firefox"] inhibit_idle fullscreen +# Same for mpv +for_window [app_id="mpv"] inhibit_idle fullscreen From f5a683dfb852cdcaa6e107e4cc011a141c19182a Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 21:14:30 -0400 Subject: [PATCH 12/20] Configure the power key for locking / unlocking --- sway/.config/sway/config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index e761239..795beb5 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -244,7 +244,12 @@ bindsym Ctrl+grave workspace prev bindsym Ctrl+l exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle -exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' +exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 300 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled"' +# When unlocked, lock & trigger swayidle +bindsym XF86PowerOff exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle +# When locked, do nothing. Note that the power key is not disabled in the swayidle command, +# so it'll wake the device up and trigger swayidle to re-enable all inputs +bindsym --locked XF86PowerOff exec yes # Audio volume (WirePlumber) bindsym --locked XF86AudioRaiseVolume exec "wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+" From a23e937c3fc7c962b2c8f49ba4715d664ee8f0f5 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 21:18:27 -0400 Subject: [PATCH 13/20] Reduce swayidle screen off timeout --- sway/.config/sway/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 795beb5..2805fd2 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -244,7 +244,7 @@ bindsym Ctrl+grave workspace prev bindsym Ctrl+l exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle -exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 300 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled"' +exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 130 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled"' # When unlocked, lock & trigger swayidle bindsym XF86PowerOff exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle # When locked, do nothing. Note that the power key is not disabled in the swayidle command, From ee6a22948c0c5fc73c6d82ca321879fae38d624a Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 21:43:53 -0400 Subject: [PATCH 14/20] Add lowpower mode and enable when locked --- sway/.config/sway/config | 4 ++-- uconsole-rootfs/usr/local/bin/clockworkpi-lowpower | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 uconsole-rootfs/usr/local/bin/clockworkpi-lowpower diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 2805fd2..fd6d1e9 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -244,12 +244,12 @@ bindsym Ctrl+grave workspace prev bindsym Ctrl+l exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle -exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 130 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled"' +exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 130 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled && sudo clockworkpi-lowpower on' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled" && sudo clockworkpi-lowpower off' # When unlocked, lock & trigger swayidle bindsym XF86PowerOff exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle # When locked, do nothing. Note that the power key is not disabled in the swayidle command, # so it'll wake the device up and trigger swayidle to re-enable all inputs -bindsym --locked XF86PowerOff exec yes +bindsym --locked XF86PowerOff exec sleep 0.1 # Audio volume (WirePlumber) bindsym --locked XF86AudioRaiseVolume exec "wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+" diff --git a/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower b/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower new file mode 100755 index 0000000..5133764 --- /dev/null +++ b/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if [ "$1" == "on" ]; then + cpupower frequency-set -u 400MHz +else + cpupower frequency-set -u 2400MHz +fi From 8fd1867492ce60e261cdb31ceb0bf25f11d45dbc Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 24 Mar 2025 22:08:20 -0400 Subject: [PATCH 15/20] Disable dsi power when low power --- uconsole-rootfs/usr/local/bin/clockworkpi-lowpower | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower b/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower index 5133764..7a5ceb1 100755 --- a/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower +++ b/uconsole-rootfs/usr/local/bin/clockworkpi-lowpower @@ -2,6 +2,8 @@ if [ "$1" == "on" ]; then cpupower frequency-set -u 400MHz + pinctrl 9 op dl # dsi power else cpupower frequency-set -u 2400MHz + pinctrl 9 op dh fi From 64db1a3ceb8412ee955b135c64f16f3f051783b5 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 25 Mar 2025 20:04:24 -0400 Subject: [PATCH 16/20] Remove thunderbird write floating rule --- sway/.config/sway/config | 1 - 1 file changed, 1 deletion(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index fd6d1e9..cfe3f5c 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -303,7 +303,6 @@ exec_always dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR # Floating window rules for_window [app_id="pavucontrol"] floating enable -for_window [app_id="thunderbird" title="Write.*"] floating enable, resize set width 800 px height 800 px # When firefox is full screen, don't idle for_window [app_id="firefox"] inhibit_idle fullscreen From 73a8387ae710fab196faf52a58e2801e21906f5b Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 25 Mar 2025 20:45:56 -0400 Subject: [PATCH 17/20] Show wallpaper on swaylock --- sway/.config/sway/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index cfe3f5c..0e1774d 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -242,11 +242,11 @@ bindsym Shift+F10 exec grimshot --notify save screen bindsym Ctrl+Tab workspace next bindsym Ctrl+grave workspace prev -bindsym Ctrl+l exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle +bindsym Ctrl+l exec swaylock -f -i "$wallpaper" && sleep 1 && pkill -SIGUSR1 swayidle -exec_always swayidle -w timeout 120 'swaylock -f -c 000000' timeout 130 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled && sudo clockworkpi-lowpower on' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled" && sudo clockworkpi-lowpower off' +exec_always swayidle -w timeout 120 "swaylock -f -i $wallpaper" timeout 130 'swaymsg "output * dpms off" && swaymsg input "7855:36:ClockworkPI_uConsole_Keyboard" events disabled && swaymsg input "7855:36:ClockworkPI_uConsole_Mouse" events disabled && sudo clockworkpi-lowpower on' resume 'swaymsg "output * dpms on" && swaymsg "input * events enabled" && sudo clockworkpi-lowpower off' # When unlocked, lock & trigger swayidle -bindsym XF86PowerOff exec swaylock -f -c 000000 && sleep 1 && pkill -SIGUSR1 swayidle +bindsym XF86PowerOff exec swaylock -f -i "$wallpaper" && sleep 1 && pkill -SIGUSR1 swayidle # When locked, do nothing. Note that the power key is not disabled in the swayidle command, # so it'll wake the device up and trigger swayidle to re-enable all inputs bindsym --locked XF86PowerOff exec sleep 0.1 From 240764957932e982de8b61100df181f8b3dce64e Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 25 Mar 2025 22:16:29 -0400 Subject: [PATCH 18/20] Remove screenshot window shortcut and use Ctrl + Print for screen --- sway/.config/sway/config | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 0e1774d..602b1f7 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -233,11 +233,7 @@ output "*" bg $wallpaper fill bindsym $mod+x exec bemenu-run | xargs swaymsg exec -- bindsym Print exec grimshot --notify save area -bindsym Ctrl+Print exec grimshot --notify save window -bindsym Shift+Print exec grimshot --notify save screen -# Use F10 too since on GPD WM2, Fn and Shift / Ctrl conflict -bindsym Ctrl+F10 exec grimshot --notify save window -bindsym Shift+F10 exec grimshot --notify save screen +bindsym Ctrl+Print exec grimshot --notify save screen bindsym Ctrl+Tab workspace next bindsym Ctrl+grave workspace prev From 342b1169f9e17516765a81f5879c00f65b07c4c7 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 30 Mar 2025 20:37:31 -0400 Subject: [PATCH 19/20] Add kwalletd autostart dbus service --- .../share/dbus-1/services/org.freedesktop.secrets.service | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 desktop-base/.local/share/dbus-1/services/org.freedesktop.secrets.service diff --git a/desktop-base/.local/share/dbus-1/services/org.freedesktop.secrets.service b/desktop-base/.local/share/dbus-1/services/org.freedesktop.secrets.service new file mode 100644 index 0000000..027a156 --- /dev/null +++ b/desktop-base/.local/share/dbus-1/services/org.freedesktop.secrets.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.secrets +Exec=/usr/bin/kwalletd6 From afe1ccd1fc7d22d51b962fb1f940ea2ffe26cc6e Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Thu, 10 Apr 2025 20:55:37 -0400 Subject: [PATCH 20/20] Delete ad-hoc "audio patch" --- .../system/clockworkpi-audio-patch.service | 9 ----- .../usr/local/bin/clockworkpi-audio-patch | 38 ------------------- 2 files changed, 47 deletions(-) delete mode 100644 uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service delete mode 100755 uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch diff --git a/uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service b/uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service deleted file mode 100644 index 3b2b6ca..0000000 --- a/uconsole-rootfs/etc/systemd/system/clockworkpi-audio-patch.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=ClockworkPi Audio Service (3.5mm / speaker switching) - -[Service] -Type=simple -ExecStart=/usr/local/bin/clockworkpi-audio-patch - -[Install] -WantedBy=default.target diff --git a/uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch b/uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch deleted file mode 100755 index 5247944..0000000 --- a/uconsole-rootfs/usr/local/bin/clockworkpi-audio-patch +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [ $UID -ne 0 ]; then - echo "Please run as root!" - exit 1 -fi - -if ! which pinctrl; then - echo "Please install pinctrl (raspberrypi-utils)!" - exit 1 -fi - -cleanup() { - echo "Disabling speaker before exitting" - # Disable speaker when this script exits - pinctrl set 11 dl -} - -trap cleanup EXIT - -# Initialize GPIO pin 10 (3.5mm sense) -pinctrl set 10 ip pn -# Pin 11 (speaker) -pinctrl set 11 op - -while true; do - if pinctrl 10 | grep -q "lo"; then - echo "Enabling speaker" - pinctrl set 11 op dh - else - echo "Disabling speaker" - pinctrl set 11 op dl - fi - sleep 1 -done -