diff --git a/README.md b/README.md index 9bc573c..c3000dc 100644 --- a/README.md +++ b/README.md @@ -282,6 +282,8 @@ doas apk add element-desktop ### Sleep +**TODO 2024** + With default settings, laptop goes to sleep after some idle period. When it wakes up, the root fs is readonly, meaning that I have to restart the laptop. Adding `acpiphp.disable=1` and `pcie_aspm=off` to grub config does not solve the issue. @@ -322,7 +324,7 @@ Otherwise, alpine wiki describes how to configure WiFi using `iwd`. ### Backlight -***TODO 2024** +**TODO 2024** ``` doas apk add light @@ -370,10 +372,8 @@ riverctl input 2:10:TPPS/2_Elan_TrackPoint pointer-accel -0.5 Based on https://wiki.alpinelinux.org/wiki/PipeWire ``` -doas apk add pipewire wireplumber rtkit alsa-utils pipewire-alsa -doas addgroup YOURUSER rtkit -doas addgroup root audio -alsamixer +doas apk add pipewire wireplumber rtkit pipewire-alsa +#doas addgroup YOURUSER rtkit ``` Then @@ -398,27 +398,28 @@ riverctl map $mode None XF86AudioMute spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ ``` Note that the internal microphone does not work and is not detected by pipewire. +(This still holds on P14s G4 in 2024.) Only external microphones work. -Mic in browser didn't work, but then it started to work at some point, -without me seemingly changing anything. - #### Mic mute button -Create `/etc/acpi/events/lenovo-mutemic` with the following content: ``` -event=button/micmute MICMUTE 00000080 00000000 K -action=amixer --card 1 set 'Capture' toggle +doas apk add alsa-tools +``` + +Add the following to the river config: + +``` +riverctl map $mode None XF86AudioMicMute spawn 'amixer --card 1 set "Capture" toggle' ``` -where card number is the one obtained in previous section; and event could be determined by running `acpi_listen` and pressing mic button. -Then, after `doas rc-service acpid restart`, mic button should control internal mic capture in alsa and switch internal mic led on and off. +(Editing ACPI hooks no longer needed on P14s G4 in 2024.) ### Webcam Should work after following the steps for "Audio". -Can be tested in https://webrtc.github.io/test-pages +Can be tested in https://webrtc.github.io/samples ## Additional diff --git a/dotfiles/.config/river/init b/dotfiles/.config/river/init index 43de6f8..11cbea3 100755 --- a/dotfiles/.config/river/init +++ b/dotfiles/.config/river/init @@ -133,7 +133,7 @@ do riverctl map -repeat $mode None XF86AudioRaiseVolume spawn "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 1%+" riverctl map -repeat $mode None XF86AudioLowerVolume spawn "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 1%-" riverctl map $mode None XF86AudioMute spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle' - riverctl map $mode None XF86AudioMicMute spawn 'amixer set "Master" toggle' + riverctl map $mode None XF86AudioMicMute spawn 'amixer --card 1 set "Capture" toggle' # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' diff --git a/dotfiles/.config/river/init.bak b/dotfiles/.config/river/init.bak deleted file mode 100755 index 0e2a8b0..0000000 --- a/dotfiles/.config/river/init.bak +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/sh - -# This is the example configuration file for river. -# -# If you wish to edit this, you will probably want to copy it to -# $XDG_CONFIG_HOME/river/init or $HOME/.config/river/init first. -# -# See the river(1), riverctl(1), and rivertile(1) man pages for complete -# documentation. - -riverctl xcursor-theme Adwaita 24 - -# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. - -# Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) -riverctl map normal Super+Shift Return spawn foot - -# Super+Q to close the focused view -riverctl map normal Super Q close - -# Super+Shift+E to exit river -riverctl map normal Super+Shift E exit - -# Super+J and Super+K to focus the next/previous view in the layout stack -riverctl map normal Super J focus-view next -riverctl map normal Super K focus-view previous - -# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous -# view in the layout stack -riverctl map normal Super+Shift J swap next -riverctl map normal Super+Shift K swap previous - -# Super+Period and Super+Comma to focus the next/previous output -riverctl map normal Super Period focus-output next -riverctl map normal Super Comma focus-output previous - -# Super+Shift+{Period,Comma} to send the focused view to the next/previous output -riverctl map normal Super+Shift Period send-to-output next -riverctl map normal Super+Shift Comma send-to-output previous - -# Super+Return to bump the focused view to the top of the layout stack -riverctl map normal Super Return zoom - -# Super+H and Super+L to decrease/increase the main ratio of rivertile(1) -riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05" -riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05" - -# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1) -riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1" -riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1" - -# Super+Alt+{H,J,K,L} to move views -riverctl map normal Super+Alt H move left 100 -riverctl map normal Super+Alt J move down 100 -riverctl map normal Super+Alt K move up 100 -riverctl map normal Super+Alt L move right 100 - -# Super+Alt+Control+{H,J,K,L} to snap views to screen edges -riverctl map normal Super+Alt+Control H snap left -riverctl map normal Super+Alt+Control J snap down -riverctl map normal Super+Alt+Control K snap up -riverctl map normal Super+Alt+Control L snap right - -# Super+Alt+Shif+{H,J,K,L} to resize views -riverctl map normal Super+Alt+Shift H resize horizontal -100 -riverctl map normal Super+Alt+Shift J resize vertical 100 -riverctl map normal Super+Alt+Shift K resize vertical -100 -riverctl map normal Super+Alt+Shift L resize horizontal 100 - -# Super + Left Mouse Button to move views -riverctl map-pointer normal Super BTN_LEFT move-view - -# Super + Right Mouse Button to resize views -riverctl map-pointer normal Super BTN_RIGHT resize-view - -for i in $(seq 1 9) -do - tags=$((1 << ($i - 1))) - - # Super+[1-9] to focus tag [0-8] - riverctl map normal Super $i set-focused-tags $tags - - # Super+Shift+[1-9] to tag focused view with tag [0-8] - riverctl map normal Super+Shift $i set-view-tags $tags - - # Super+Ctrl+[1-9] to toggle focus of tag [0-8] - riverctl map normal Super+Control $i toggle-focused-tags $tags - - # Super+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view - riverctl map normal Super+Shift+Control $i toggle-view-tags $tags -done - -# Super+0 to focus all tags -# Super+Shift+0 to tag focused view with all tags -all_tags=$(((1 << 32) - 1)) -riverctl map normal Super 0 set-focused-tags $all_tags -riverctl map normal Super+Shift 0 set-view-tags $all_tags - -# Super+Space to toggle float -riverctl map normal Super Space toggle-float - -# Super+F to toggle fullscreen -riverctl map normal Super F toggle-fullscreen - -# Super+{Up,Right,Down,Left} to change layout orientation -riverctl map normal Super Up send-layout-cmd rivertile "main-location top" -riverctl map normal Super Right send-layout-cmd rivertile "main-location right" -riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" -riverctl map normal Super Left send-layout-cmd rivertile "main-location left" - -# Declare a passthrough mode. This mode has only a single mapping to return to -# normal mode. This makes it useful for testing a nested wayland compositor -riverctl declare-mode passthrough - -# Super+F11 to enter passthrough mode -riverctl map normal Super F11 enter-mode passthrough - -# Super+F11 to return to normal mode -riverctl map passthrough Super F11 enter-mode normal - -riverctl map normal Super R spawn 'bemenu-run -i -n' - -# Various media key mapping examples for both normal and locked mode which do -# not have a modifier -for mode in normal locked -do - # Eject the optical drive (well if you still have one that is) - riverctl map $mode None XF86Eject spawn 'eject -T' - - # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) - riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' - riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' - riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' - - # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) - riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' - riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause' - riverctl map $mode None XF86AudioPrev spawn 'playerctl previous' - riverctl map $mode None XF86AudioNext spawn 'playerctl next' - - # Control screen backlight brighness with light (https://github.com/haikarainen/light) - riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5' - riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5' -done - -# Set background and border color -riverctl background-color 0x002b36 -riverctl border-color-focused 0x93a1a1 -riverctl border-color-unfocused 0x586e75 - -# Set keyboard repeat rate -riverctl set-repeat 50 300 - -# Make certain views start floating -riverctl float-filter-add app-id float -riverctl float-filter-add title "popup title with spaces" - -# Set app-ids and titles of views which should use client side decorations -riverctl csd-filter-add app-id "gedit" - -# startup -riverctl spawn "/usr/libexec/pipewire-launcher" -riverctl spawn "kanshi" -#riverctl spawn "kill -HUP $(pidof waybar) && waybar" -riverctl spawn "waybar" - -# Set and exec into the default layout generator, rivertile. -# River will send the process group of the init executable SIGTERM on exit. -riverctl default-layout rivertile -exec rivertile -view-padding 6 -outer-padding 6 diff --git a/dotfiles/.config/river/sharing-float-one.sh b/dotfiles/.config/river/sharing-float-one.sh deleted file mode 100755 index a9798ab..0000000 --- a/dotfiles/.config/river/sharing-float-one.sh +++ /dev/null @@ -1 +0,0 @@ -riverctl float-filter-add title "Firefox — Sharing Indicator" diff --git a/dotfiles/.config/river/sharing-float.sh b/dotfiles/.config/river/sharing-float.sh deleted file mode 100755 index 23b6f99..0000000 --- a/dotfiles/.config/river/sharing-float.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -riverctl float-filter-add title "Firefox — Sharing Indicator" -#riverctl float-filter-add title Firefox — Sharing Indicator -riverctl float-filter-add title 'Firefox — Sharing Indicator' -riverctl float-filter-add title "Firefox — Sharing Indicator" -riverctl float-filter-add title "Firefox — Sharing Indicator" -riverctl float-filter-add title "Firefox — Sharing Indicator" -riverctl float-filter-add title "Firefox — Sharing Indicator" -riverctl float-filter-add title "Firefox — Sharing Indicator"