Compare commits

...

3 commits

2 changed files with 23 additions and 24 deletions

View file

@ -1,6 +1,6 @@
profile dual { profile dual {
output DP-1 mode 1920x1080@60.00Hz position 0,0 output DP-1 position 0,0
output DP-2 mode 1920x1080@144.00Hz position 1920,0 output DP-2 position 1920,0
} }
profile laptop { profile laptop {

View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/sh
# Do some logging # Do some logging
#exec 3>&1 4>&2 #exec 3>&1 4>&2
#trap 'exec 2>&4 1>&3' 0 1 2 3 RETURN #trap 'exec 2>&4 1>&3' 0 1 2 3
#exec 1>"${XDG_STATE_HOME}"/river.log 2>&1 #exec 1>"${XDG_STATE_HOME}"/river.log 2>&1
# Start kitty # Start kitty
@ -150,19 +150,19 @@ riverctl map-pointer normal Super BTN_MIDDLE toggle-float
for i in $(seq 1 9) for i in $(seq 1 9)
do do
tags=$((1 << ($i - 1))) tags=$((1 << (i - 1)))
# Super+[1-9] to focus tag [0-8] # Super+[1-9] to focus tag [0-8]
riverctl map normal Super $i set-focused-tags $tags riverctl map normal Super "$i" set-focused-tags $tags
# Super+Shift+[1-9] to tag focused view with tag [0-8] # Super+Shift+[1-9] to tag focused view with tag [0-8]
riverctl map normal Super+Shift $i set-view-tags $tags riverctl map normal Super+Shift "$i" set-view-tags $tags
# Super+Control+[1-9] to toggle focus of tag [0-8] # Super+Control+[1-9] to toggle focus of tag [0-8]
riverctl map normal Super+Control $i toggle-focused-tags $tags riverctl map normal Super+Control "$i" toggle-focused-tags $tags
# Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
riverctl map normal Super+Shift+Control $i toggle-view-tags $tags riverctl map normal Super+Shift+Control "$i" toggle-view-tags $tags
done done
# Super+0 to focus all tags # Super+0 to focus all tags
@ -186,41 +186,39 @@ riverctl map normal Super F11 enter-mode passthrough
# Return to normal mode # Return to normal mode
riverctl map passthrough Super F11 enter-mode normal riverctl map passthrough Super F11 enter-mode normal
{{ if (or (eq .chezmoi.hostname "helix") (eq .chezmoi.hostname "triangulum")) }}
# Function/Media keys # Function/Media keys
for mode in normal locked for mode in normal locked
do do
# Volume # Volume
riverctl map "$mode" None XF86AudioMute spawn 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
riverctl map $mode None XF86AudioMute spawn 'pactl set-sink-mute @DEFAULT_SINK@ toggle' riverctl map "$mode" None XF86AudioLowerVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ -5%'
riverctl map $mode None XF86AudioLowerVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ -5%' riverctl map "$mode" None XF86AudioRaiseVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ +5%'
riverctl map $mode None XF86AudioRaiseVolume spawn 'pactl set-sink-volume @DEFAULT_SINK@ +5%' riverctl map "$mode" None XF86AudioMicMute spawn 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
riverctl map $mode None XF86AudioMicMute spawn 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
# Backlight # Backlight
riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5' riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5' riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5'
# Display # Display
#riverctl map $mode None XF86Display spawn '' #riverctl map $mode None XF86Display spawn ''
# WiFi # WiFi
riverctl map $mode None XF86WLAN spawn 'toggle-wifi' riverctl map $mode None XF86WLAN spawn 'toggle-wifi'
# Notifications # Notifications
#riverctl map $mode None XF86NotificationCenter spawn '' #riverctl map $mode None XF86NotificationCenter spawn ''
# Phone # Phone
#riverctl map $mode None XF86PickupPhone spawn '' #riverctl map $mode None XF86PickupPhone spawn ''
#riverctl map $mode None XF86HangupPhone spawn '' #riverctl map $mode None XF86HangupPhone spawn ''
# Favorites # Favorites
#riverctl map $mode None XF86Favorites spawn '' #riverctl map $mode None XF86Favorites spawn ''
done done
{{- end }}
# Set background and border # Set background and border
riverctl background-color 0x323d43 riverctl background-color 0x323d43
riverctl border-color-focused 0xd8caac riverctl border-color-focused 0xd8caac
@ -253,6 +251,7 @@ riverctl focus-output DP-1
# -app-id and title -"foo" start floating # -app-id and title -"foo" start floating
riverctl rule-add -app-id 'Bitwarden' float riverctl rule-add -app-id 'Bitwarden' float
riverctl rule-add -app-id 'Blueman-manager' float
riverctl rule-add -app-id 'connman-gtk' float riverctl rule-add -app-id 'connman-gtk' float
riverctl rule-add -app-id 'galculator' float riverctl rule-add -app-id 'galculator' float
riverctl rule-add -app-id 'org.keepassxc.KeePassXC' float riverctl rule-add -app-id 'org.keepassxc.KeePassXC' float
@ -263,7 +262,7 @@ riverctl rule-add -app-id 'vlc' float
# -app-id "bar" and any title use client-side decorations # -app-id "bar" and any title use client-side decorations
riverctl rule-add -app-id 'emacs' csd riverctl rule-add -app-id 'emacs' csd
# Default layout generator - rivertile(1) # Default layout generator
riverctl default-layout rivertile riverctl default-layout rivertile
rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 & rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 &