Compare commits

...

19 commits

Author SHA1 Message Date
89e7f586a6 v1.2.1 2025-06-06 20:33:55 +04:00
bada3caea1 Fix screenlocker 2025-06-04 15:21:48 +04:00
d8d1f022c0 Add mic-mute.sh for toggling microphone on/off 2024-10-19 23:42:58 +04:00
0bf9521a3c 1.1.5 2024-09-04 21:37:57 +04:00
baf738bed1 Pass SSH_AUTH_SOCK to all processes 2024-07-25 00:00:49 +04:00
51df2746b6 Fix swayidle restart path
Added waybar autorestart service
2024-07-23 18:29:41 +04:00
1ca8db8d25 Update changelog 2024-07-20 15:04:09 +04:00
91d53b955d
Some fixes from Sway edition 2024-07-19 21:58:31 +04:00
5876e2df16
Set qt6 style to kvantum-dark 2024-06-19 17:03:04 +04:00
c40fe91505
waybar: limit window name characters to 50 2024-04-02 16:11:25 +04:00
fd0c23b7f8
Update changelog 2024-03-14 10:27:36 +04:00
ecf24c8a5c Merge branch 'master' into 'master'
correct regexp in getSymbolDict

See merge request tile-os/tileos-settings-river!1
2024-03-14 06:25:39 +00:00
skpp pptf
19af1cbbbf correct regexp in getSymbolDict 2024-03-13 19:48:21 +00:00
d7adecfa02 Change wallpaper 2024-02-14 22:59:04 +04:00
eac1b5cadf waybar: disable bluetooth module if no controller is found 2024-02-08 19:33:28 +04:00
917a377900 Enable idle inhibit on startup 2024-02-02 22:40:26 +04:00
dc9a9f1383 Update changelog 2024-01-29 10:23:43 +04:00
d96b91f97b Add keybindings help overlay 2024-01-27 23:26:08 +04:00
cdc68187e0 Fix cursor for GTK 2 apps 2024-01-12 00:02:03 +04:00
29 changed files with 516 additions and 110 deletions

86
debian/changelog vendored
View file

@ -1,3 +1,89 @@
tileos-settings-river (1.2.1~tileos) unstable; urgency=medium
* Fix screnlocker
-- Aleksey Samoilov <samoilov.lex@gmail.com> Fri, 06 Jun 2025 20:33:13 +0400
tileos-settings-river (1.2.0~tileos) unstable; urgency=medium
* Add mic-mute.sh script for toggling microphone on/off
-- Aleksey Samoilov <samoilov.lex@gmail.com> Sat, 19 Oct 2024 23:41:50 +0400
tileos-settings-river (1.1.5~tileos) unstable; urgency=medium
* Updates from Sway edition
-- Aleksey Samoilov <samoilov.lex@gmail.com> Wed, 04 Sep 2024 21:37:22 +0400
tileos-settings-river (1.1.4~tileos) unstable; urgency=medium
* Pass SSH_AUTH_SOCK to all processes
-- Aleksey Samoilov <samoilov.lex@gmail.com> Thu, 25 Jul 2024 00:00:10 +0400
tileos-settings-river (1.1.3~tileos) unstable; urgency=medium
* Fix swayidle restart path
* Added waybar restart path
-- Aleksey Samoilov <samoilov.lex@gmail.com> Tue, 23 Jul 2024 18:29:06 +0400
tileos-settings-river (1.1.2~tileos) unstable; urgency=medium
* Some fixes
-- Aleksey Samoilov <samoilov.lex@gmail.com> Sat, 20 Jul 2024 15:03:38 +0400
tileos-settings-river (1.1.1~tileos) unstable; urgency=medium
* Set qt6 style to kvantum-dark
-- Aleksey Samoilov <samoilov.lex@gmail.com> Wed, 19 Jun 2024 17:02:21 +0400
tileos-settings-river (1.1.0~tileos) unstable; urgency=medium
* waybar: limit window name characters to 50
-- Aleksey Samoilov <samoilov.lex@gmail.com> Tue, 02 Apr 2024 16:09:36 +0400
tileos-settings-river (1.0.8~tileos) unstable; urgency=medium
* correct regexp in getSymbolDict
-- Aleksey Samoilov <samoilov.lex@gmail.com> Thu, 14 Mar 2024 10:26:55 +0400
tileos-settings-river (1.0.7~tileos) unstable; urgency=medium
* Change wallpaper
-- Aleksey Samoilov <samoilov.lex@gmail.com> Wed, 14 Feb 2024 22:58:39 +0400
tileos-settings-river (1.0.6~tileos) unstable; urgency=medium
* waybar: disable bluetooth module if no controller is found
-- Aleksey Samoilov <samoilov.lex@gmail.com> Thu, 08 Feb 2024 19:32:41 +0400
tileos-settings-river (1.0.5~tileos) unstable; urgency=medium
* Enable idle inhibit on startup
-- Aleksey Samoilov <samoilov.lex@gmail.com> Fri, 02 Feb 2024 22:38:13 +0400
tileos-settings-river (1.0.4~tileos) unstable; urgency=medium
* Add keybindings help overlay
* waybar: add help overlay module
-- Aleksey Samoilov <samoilov.lex@gmail.com> Mon, 29 Jan 2024 10:22:24 +0400
tileos-settings-river (1.0.3~tileos) unstable; urgency=medium
* Fix cursor for GTK 2 apps
-- Aleksey Samoilov <samoilov.lex@gmail.com> Fri, 12 Jan 2024 00:01:33 +0400
tileos-settings-river (1.0.2~tileos) unstable; urgency=medium tileos-settings-river (1.0.2~tileos) unstable; urgency=medium
* Set Bibata cursor * Set Bibata cursor

View file

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
pkill swaybg pkill swaybg
swaybg -o '*' -i "/usr/share/wallpapers/tileos-final.png" -m fill & swaybg -o '*' -i "/usr/share/wallpapers/tileos-final-river.png" -m fill &

View file

@ -1,79 +1,97 @@
color_set:
text: &TEXT "#cad3f5"
subtext0: &SUBTEXT0 "#e3e3f3"
subtext1: &SUBTEXT1 "#ced4e0"
surface2: &SURFACE2 "#5b6078"
surface1: &SURFACE1 "#494d64"
index16: &INDEX16 "#ed6c13"
index17: &INDEX17 "#f4dbd6"
base: &BASE "#24273a"
red: &RED "#ed6070"
green: &GREEN "#a6da95"
blue: &BLUE "#8aadf4"
yellow: &YELLOW "#eed49f"
pink: &PINK "#f5bde6"
teal: &TEAL "#8bd5ca"
rosewater: &ROSEWATER "#f4dbd6"
lavender: &LAVENDER "#b7bdf8"
colors: colors:
# Default colors # Default colors
primary: primary:
background: "#24273A" # base background: *BASE
foreground: "#CAD3F5" # text foreground: *TEXT
# Bright and dim foreground colors # Bright and dim foreground colors
dim_foreground: "#CAD3F5" # text dim_foreground: *TEXT
bright_foreground: "#CAD3F5" # text bright_foreground: *TEXT
# Cursor colors # Cursor colors
cursor: cursor:
text: "#24273A" # base text: *BASE
cursor: "#F4DBD6" # rosewater cursor: *ROSEWATER
vi_mode_cursor: vi_mode_cursor:
text: "#24273A" # base text: *BASE
cursor: "#B7BDF8" # lavender cursor: *LAVENDER
# Search colors # Search colors
search: search:
matches: matches:
foreground: "#24273A" # base foreground: *BASE
background: "#A5ADCB" # subtext0 background: *SUBTEXT0
focused_match: focused_match:
foreground: "#24273A" # base foreground: *BASE
background: "#A6DA95" # green background: *GREEN
footer_bar: footer_bar:
foreground: "#24273A" # base foreground: *BASE
background: "#A5ADCB" # subtext0 background: *SUBTEXT0
# Keyboard regex hints # Keyboard regex hints
hints: hints:
start: start:
foreground: "#24273A" # base foreground: *BASE
background: "#EED49F" # yellow background: *YELLOW
end: end:
foreground: "#24273A" # base foreground: *BASE
background: "#A5ADCB" # subtext0 background: *SUBTEXT0
# Selection colors # Selection colors
selection: selection:
text: "#24273A" # base text: *BASE
background: "#F4DBD6" # rosewater background: *ROSEWATER
# Normal colors # Normal colors
normal: normal:
black: "#494D64" # surface1 black: *SURFACE1
red: "#ED8796" # red red: *RED
green: "#A6DA95" # green green: *GREEN
yellow: "#EED49F" # yellow yellow: *YELLOW
blue: "#8AADF4" # blue blue: *BLUE
magenta: "#F5BDE6" # pink magenta: *PINK
cyan: "#8BD5CA" # teal cyan: *TEAL
white: "#B8C0E0" # subtext1 white: *SUBTEXT1
# Bright colors # Bright colors
bright: bright:
black: "#5B6078" # surface2 black: *SURFACE2
red: "#ED8796" # red red: *RED
green: "#A6DA95" # green green: *GREEN
yellow: "#EED49F" # yellow yellow: *YELLOW
blue: "#8AADF4" # blue blue: *BLUE
magenta: "#F5BDE6" # pink magenta: *PINK
cyan: "#8BD5CA" # teal cyan: *TEAL
white: "#A5ADCB" # subtext0 white: *SUBTEXT0
# Dim colors # Dim colors
dim: dim:
black: "#494D64" # surface1 black: *SURFACE1
red: "#ED8796" # red red: *RED
green: "#A6DA95" # green green: *GREEN
yellow: "#EED49F" # yellow yellow: *YELLOW
blue: "#8AADF4" # blue blue: *BLUE
magenta: "#F5BDE6" # pink magenta: *PINK
cyan: "#8BD5CA" # teal cyan: *TEAL
white: "#B8C0E0" # subtext1 white: *SUBTEXT1
indexed_colors: indexed_colors:
- { index: 16, color: "#F5A97F" } - { index: 16, color: *INDEX16 }
- { index: 17, color: "#F4DBD6" } - { index: 17, color: *INDEX17 }

View file

@ -0,0 +1,15 @@
{
adapter: ""
gsm-apn: ""
gsm-number: ""
keybindings: {}
receive-dir: ""
theme: {
AdapterPowered: "powderblue",
AdapterNotPowered: "lightcoral",
AdapterPairable: "thistle",
AdapterScanning: "mistyrose",
DevicePropertyDiscovered: "mistyrose",
DevicePropertyConnected: "powderblue"
}
}

View file

@ -58,7 +58,7 @@ theme[cached_mid]="#8aadf4"
theme[cached_end]="#b7bdf8" theme[cached_end]="#b7bdf8"
# Mem/Disk available meter (Peach -> Red) # Mem/Disk available meter (Peach -> Red)
theme[available_start]="#f5a97f" theme[available_start]="#ed6c13"
theme[available_mid]="#ee99a0" theme[available_mid]="#ee99a0"
theme[available_end]="#ed8796" theme[available_end]="#ed8796"
@ -68,7 +68,7 @@ theme[used_mid]="#8bd5ca"
theme[used_end]="#91d7e3" theme[used_end]="#91d7e3"
# Download graph colors (Peach -> Red) # Download graph colors (Peach -> Red)
theme[download_start]="#f5a97f" theme[download_start]="#ed6c13"
theme[download_mid]="#ee99a0" theme[download_mid]="#ee99a0"
theme[download_end]="#ed8796" theme[download_end]="#ed8796"

View file

@ -1,7 +1,7 @@
[ [
{ {
"label": "Lock", "label": "Lock",
"exec": "riverctl spawn ~/.config/swaylock/lock.sh", "exec": "riverctl spawn /usr/share/river/scripts/lock.sh",
"icon": "system-lock-screen" "icon": "system-lock-screen"
}, },
{ {

View file

@ -0,0 +1,2 @@
#!/bin/sh
/usr/share/river/scripts/sbdp.py $HOME/.config/river/keybindings.sh | jq --raw-output 'sort_by(.category) | .[] | .action + ": <b>" + .keybinding + "</b>"'

View file

@ -0,0 +1,13 @@
window {
background-color: @theme_bg_color;
font-size: medium;
color: #cad3f5;
}
#box-inner {
border-radius: 0px;
border-style: solid;
border-width: 2px;
border-color: #8aadf4;
padding: 10px;
}

View file

@ -13,9 +13,9 @@ Catppuccin Gedit theme based on Oblivion theme and Cappuccin for Visual Studio C
<color name="macchiato_flamingo" value="#f0c6c6"/> <color name="macchiato_flamingo" value="#f0c6c6"/>
<color name="macchiato_pink" value="#f5bde6"/> <color name="macchiato_pink" value="#f5bde6"/>
<color name="macchiato_mauve" value="#c6a0f6"/> <color name="macchiato_mauve" value="#c6a0f6"/>
<color name="macchiato_red" value="#ed8796"/> <color name="macchiato_red" value="#ed6070"/>
<color name="macchiato_maroon" value="#ee99a0"/> <color name="macchiato_maroon" value="#ee99a0"/>
<color name="macchiato_peach" value="#f5a97f"/> <color name="macchiato_peach" value="#ed6c13"/>
<color name="macchiato_yellow" value="#eed49f"/> <color name="macchiato_yellow" value="#eed49f"/>
<color name="macchiato_green" value="#a6da95"/> <color name="macchiato_green" value="#a6da95"/>
<color name="macchiato_teal" value="#8bd5ca"/> <color name="macchiato_teal" value="#8bd5ca"/>
@ -24,8 +24,8 @@ Catppuccin Gedit theme based on Oblivion theme and Cappuccin for Visual Studio C
<color name="macchiato_blue" value="#8aadf4"/> <color name="macchiato_blue" value="#8aadf4"/>
<color name="macchiato_lavender" value="#b7bdf8"/> <color name="macchiato_lavender" value="#b7bdf8"/>
<color name="macchiato_text" value="#cad3f5"/> <color name="macchiato_text" value="#cad3f5"/>
<color name="macchiato_subtext1" value="#b8c0e0"/> <color name="macchiato_subtext1" value="#ced4e0"/>
<color name="macchiato_subtext0" value="#a5adcb"/> <color name="macchiato_subtext0" value="#e3e3f3"/>
<color name="macchiato_overlay2" value="#939ab7"/> <color name="macchiato_overlay2" value="#939ab7"/>
<color name="macchiato_overlay1" value="#8087a2"/> <color name="macchiato_overlay1" value="#8087a2"/>
<color name="macchiato_overlay0" value="#6e738d"/> <color name="macchiato_overlay0" value="#6e738d"/>

View file

@ -3,7 +3,7 @@ color_scheme_path=$HOME/.config/qt6ct/colors/Catppuccin-Macchiato.conf
custom_palette=true custom_palette=true
icon_theme=ePapirus icon_theme=ePapirus
standard_dialogs=default standard_dialogs=default
style=Fusion style=kvantum-dark
[Fonts] [Fonts]
fixed="Noto Sans,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular" fixed="Noto Sans,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"

View file

@ -45,6 +45,9 @@ riverctl spawn $HOME/.azotebg
# Include keybindings # Include keybindings
riverctl spawn $HOME/.config/river/keybindings.sh riverctl spawn $HOME/.config/river/keybindings.sh
# Keybindings help overlay
riverctl spawn /usr/share/river/scripts/help.sh & disown
# Clipboard daemon # Clipboard daemon
pkill wl-paste pkill wl-paste
wl-paste --watch cliphist store & disown wl-paste --watch cliphist store & disown

View file

@ -12,6 +12,9 @@ launcher="eval rofi -show combi -combi-modi 'drun,run' -terminal $term -ssh-comm
# Volume changing notify # Volume changing notify
volume_bar="/usr/share/river/scripts/volume-notify.sh" volume_bar="/usr/share/river/scripts/volume-notify.sh"
# Mic volume mute
mic_mute="/usr/share/river/scripts/mic-mute.sh"
# Brightness changing notify # Brightness changing notify
brightness_bar="/usr/share/river/scripts/brightness-notify.sh" brightness_bar="/usr/share/river/scripts/brightness-notify.sh"
@ -25,106 +28,108 @@ riverctl map normal "$mod" Print spawn "/usr/bin/river-grimshot save area - | sw
# Set keyboard layout. See man riverctl # Set keyboard layout. See man riverctl
# riverctl keyboard-layout -options "grp:caps_toggle" "us,ru" # riverctl keyboard-layout -options "grp:caps_toggle" "us,ru"
# Binding to reload the configuration (good for edits on bindings or adding new stuff ## Action // Reload River Configuration // $mod+R ##
riverctl map normal $mod R spawn $HOME/.config/river/init riverctl map normal $mod R spawn $HOME/.config/river/init
# $mod+Shift+Return to start an instance of terminal ## Launch // Terminal // $mod+Return ##
riverctl map normal $mod Return spawn $term riverctl map normal $mod Return spawn $term
# $mod+D to start an instance of application launcher ## Launch // Launcher // $mod+D ##
riverctl map normal $mod D spawn "$launcher" riverctl map normal $mod D spawn "$launcher"
# $mod+Q to close the focused view ## Action // Exit River // $mod+Shift+E ##
riverctl map normal $mod+Shift Q close
# $mod+Shift+E to run nwg-bar (logout, restart, shutdown, etc)
riverctl map normal $mod+Shift E spawn nwg-bar riverctl map normal $mod+Shift E spawn nwg-bar
# $mod+J and $mod+K to focus the next/previous view in the layout stack ## Action // Kill focused window // $mod+Q ##
riverctl map normal $mod+Shift Q close
## Navigation // Focus the next/previous view in the layout stack // $mod+{J,K} ##
riverctl map normal $mod J focus-view next riverctl map normal $mod J focus-view next
riverctl map normal $mod K focus-view previous riverctl map normal $mod K focus-view previous
# $mod+Shift+J and $mod+Shift+K to swap the focused view with the next/previous ## Navigation // Swap the focused view in the layout stack // $mod+Shift+{J,K} ##
# view in the layout stack
riverctl map normal $mod+Shift J swap next riverctl map normal $mod+Shift J swap next
riverctl map normal $mod+Shift K swap previous riverctl map normal $mod+Shift K swap previous
# $mod+Period and $mod+Comma to focus the next/previous output ## Navigation // Focus the next/previous output // $mod+{, .} ##
riverctl map normal $mod Period focus-output next riverctl map normal $mod Period focus-output next
riverctl map normal $mod Comma focus-output previous riverctl map normal $mod Comma focus-output previous
# $mod+Shift+{Period,Comma} to send the focused view to the next/previous output ## Navigation // Send the focused view to the next/previous output // $mod+Shift+{, .} ##
riverctl map normal $mod+Shift Period send-to-output next riverctl map normal $mod+Shift Period send-to-output next
riverctl map normal $mod+Shift Comma send-to-output previous riverctl map normal $mod+Shift Comma send-to-output previous
# $mod+Return to bump the focused view to the top of the layout stack ## Navigation // Bump the focused view to the top of the layout stack // $mod+Shift+Return ##
riverctl map normal $mod+Shift Return zoom riverctl map normal $mod+Shift Return zoom
# $mod+H and $mod+L to decrease/increase the main ratio of rivertile(1) ## Navigation // Decrease/increase the main ratio of rivertile // $mod+{H,L} ##
riverctl map normal $mod H send-layout-cmd rivertile "main-ratio -0.05" riverctl map normal $mod H send-layout-cmd rivertile "main-ratio -0.05"
riverctl map normal $mod L send-layout-cmd rivertile "main-ratio +0.05" riverctl map normal $mod L send-layout-cmd rivertile "main-ratio +0.05"
# $mod+Shift+H and $mod+Shift+L to increment/decrement the main count of rivertile(1) ## Navigation // Increment/decrement the main count of rivertile // $mod+Shift+{H,L} ##
riverctl map normal $mod+Shift H send-layout-cmd rivertile "main-count +1" riverctl map normal $mod+Shift H send-layout-cmd rivertile "main-count +1"
riverctl map normal $mod+Shift L send-layout-cmd rivertile "main-count -1" riverctl map normal $mod+Shift L send-layout-cmd rivertile "main-count -1"
# $mod+Alt+{H,J,K,L} to move views ## Navigation // Move views // $mod+Alt+{H,J,K,L} ##
riverctl map normal $mod+Alt H move left 100 riverctl map normal $mod+Alt H move left 100
riverctl map normal $mod+Alt J move down 100 riverctl map normal $mod+Alt J move down 100
riverctl map normal $mod+Alt K move up 100 riverctl map normal $mod+Alt K move up 100
riverctl map normal $mod+Alt L move right 100 riverctl map normal $mod+Alt L move right 100
# $mod+Alt+Control+{H,J,K,L} to snap views to screen edges ## Navigation // Snap views to screen edges // $mod+Alt+Control+{H,J,K,L}##
riverctl map normal $mod+Alt+Control H snap left riverctl map normal $mod+Alt+Control H snap left
riverctl map normal $mod+Alt+Control J snap down riverctl map normal $mod+Alt+Control J snap down
riverctl map normal $mod+Alt+Control K snap up riverctl map normal $mod+Alt+Control K snap up
riverctl map normal $mod+Alt+Control L snap right riverctl map normal $mod+Alt+Control L snap right
# $mod+Alt+Shift+{H,J,K,L} to resize views ## Navigation // Resize views // $mod+Alt+Shift+{H,J,K,L} ##
riverctl map normal $mod+Alt+Shift H resize horizontal -100 riverctl map normal $mod+Alt+Shift H resize horizontal -100
riverctl map normal $mod+Alt+Shift J resize vertical 100 riverctl map normal $mod+Alt+Shift J resize vertical 100
riverctl map normal $mod+Alt+Shift K resize vertical -100 riverctl map normal $mod+Alt+Shift K resize vertical -100
riverctl map normal $mod+Alt+Shift L resize horizontal 100 riverctl map normal $mod+Alt+Shift L resize horizontal 100
# $mod + Left Mouse Button to move views ## Navigation // Move views with mouse // $mod + Left Mouse Button ##
riverctl map-pointer normal $mod BTN_LEFT move-view riverctl map-pointer normal $mod BTN_LEFT move-view
# $mod + Right Mouse Button to resize views ## Navigation // Resize views with mouse // $mod + Right Mouse Button ##
riverctl map-pointer normal $mod BTN_RIGHT resize-view riverctl map-pointer normal $mod BTN_RIGHT resize-view
# $mod + Middle Mouse Button to toggle float ## Navigation // Toggle float // $mod + Middle Mouse Button ##
riverctl map-pointer normal $mod BTN_MIDDLE toggle-float riverctl map-pointer normal $mod BTN_MIDDLE toggle-float
# Tags navigation
## Navigation // Focus tag [0-8] // $mod+[1-9] ##
## Navigation // Tag focused view with tag [0-8] // $mod+Shift+[1-9] ##
## Navigation // Toggle focus of tag [0-8] // mod+Control+[1-9] ##
## Navigation // Toggle tag [0-8] of focused view // $mod+Shift+Control+[1-9] ##
for i in $(seq 1 9) for i in $(seq 1 9)
do do
tags=$((1 << ($i - 1))) tags=$((1 << ($i - 1)))
# $mod+[1-9] to focus tag [0-8]
riverctl map normal $mod $i set-focused-tags $tags riverctl map normal $mod $i set-focused-tags $tags
# $mod+Shift+[1-9] to tag focused view with tag [0-8]
riverctl map normal $mod+Shift $i set-view-tags $tags riverctl map normal $mod+Shift $i set-view-tags $tags
# $mod+Control+[1-9] to toggle focus of tag [0-8]
riverctl map normal $mod+Control $i toggle-focused-tags $tags riverctl map normal $mod+Control $i toggle-focused-tags $tags
# $mod+Shift+Control+[1-9] to toggle tag [0-8] of focused view
riverctl map normal $mod+Shift+Control $i toggle-view-tags $tags riverctl map normal $mod+Shift+Control $i toggle-view-tags $tags
done done
# $mod+0 to focus all tags ## Navigation // Focus all tags // $mod+0 ##
# $mod+Shift+0 to tag focused view with all tags ## Navigation // Tag focused view with all tags // $mod+Shift+0 ##
all_tags=$(((1 << 32) - 1)) all_tags=$(((1 << 32) - 1))
riverctl map normal $mod 0 set-focused-tags $all_tags riverctl map normal $mod 0 set-focused-tags $all_tags
riverctl map normal $mod+Shift 0 set-view-tags $all_tags riverctl map normal $mod+Shift 0 set-view-tags $all_tags
# $mod+Space to toggle float ## Action // Toggle floating // $mod+Space ##
riverctl map normal $mod Space toggle-float riverctl map normal $mod Space toggle-float
# $mod+F to toggle fullscreen ## Action // Toggle fullscreen // $mod+F ##
riverctl map normal $mod F toggle-fullscreen riverctl map normal $mod F toggle-fullscreen
# $mod+{Up,Right,Down,Left} to change layout orientation ## Navigation // Change layout orientation // $mod+{↑ ↓ ← →} ##
riverctl map normal $mod Up send-layout-cmd rivertile "main-location top" riverctl map normal $mod Up send-layout-cmd rivertile "main-location top"
riverctl map normal $mod Right send-layout-cmd rivertile "main-location right" riverctl map normal $mod Right send-layout-cmd rivertile "main-location right"
riverctl map normal $mod Down send-layout-cmd rivertile "main-location bottom" riverctl map normal $mod Down send-layout-cmd rivertile "main-location bottom"
@ -134,10 +139,10 @@ riverctl map normal $mod Left send-layout-cmd rivertile "main-location left"
# normal mode. This makes it useful for testing a nested wayland compositor # normal mode. This makes it useful for testing a nested wayland compositor
riverctl declare-mode passthrough riverctl declare-mode passthrough
# $mod+F11 to enter passthrough mode ## Action // Enter passthrough mode // $mod+F11 ##
riverctl map normal $mod F11 enter-mode passthrough riverctl map normal $mod F11 enter-mode passthrough
# $mod+F11 to return to normal mode ## Action // Return to normal mode // $mod+F11 ##
riverctl map passthrough $mod F11 enter-mode normal riverctl map passthrough $mod F11 enter-mode normal
# Various media key mapping examples for both normal and locked mode which do # Various media key mapping examples for both normal and locked mode which do
@ -151,6 +156,7 @@ do
riverctl map $mode None XF86AudioRaiseVolume spawn "pulsemixer --change-volume +5 && $volume_bar" riverctl map $mode None XF86AudioRaiseVolume spawn "pulsemixer --change-volume +5 && $volume_bar"
riverctl map $mode None XF86AudioLowerVolume spawn "pulsemixer --change-volume -5 && $volume_bar" riverctl map $mode None XF86AudioLowerVolume spawn "pulsemixer --change-volume -5 && $volume_bar"
riverctl map $mode None XF86AudioMute spawn "pulsemixer --toggle-mute && $volume_bar" riverctl map $mode None XF86AudioMute spawn "pulsemixer --toggle-mute && $volume_bar"
riverctl map $mode None XF86AudioMicMute spawn "$mic_mute"
# Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) # 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 XF86AudioMedia spawn 'playerctl play-pause'

View file

@ -1,6 +1,5 @@
timeout 240 'light -G > /tmp/brightness && light -S 10' resume 'light -S $([ -f /tmp/brightness ] && cat /tmp/brightness || echo 100%)' timeout 240 'light -G > /tmp/brightness && light -S 10' resume 'light -S $([ -f /tmp/brightness ] && cat /tmp/brightness || echo 100%)'
timeout 300 ~/.config/swaylock/lock.sh timeout 300 '/usr/share/river/scripts/lock.sh'
timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' timeout 600 'wlopm --off \*' resume 'wlopm --on \*'
before-sleep 'playerctl pause' before-sleep 'playerctl pause'
before-sleep ~/.config/swaylock/lock.sh before-sleep '/usr/share/river/scripts/lock.sh && sleep 2'
lock ~/.config/swaylock/lock.sh

View file

@ -7,6 +7,7 @@
"modules-right": [ "modules-right": [
"tray", "tray",
"custom/playerctl", "custom/playerctl",
"custom/help",
"custom/wlsunset", "custom/wlsunset",
"idle_inhibitor", "idle_inhibitor",
"custom/dunst", "custom/dunst",
@ -31,7 +32,8 @@
}, },
"river/window": { "river/window": {
"format": "{}" "format": "{}",
"max-length": 50
}, },
"custom/playerctl": { "custom/playerctl": {
@ -51,6 +53,12 @@
"signal": 5 "signal": 5
}, },
"custom/help": {
"format": "",
"on-click": "/usr/share/river/scripts/help.sh --toggle",
"tooltip": "false"
},
"custom/wlsunset": { "custom/wlsunset": {
"interval": "once", "interval": "once",
"tooltip": true, "tooltip": true,
@ -139,6 +147,7 @@
"bluetooth": { "bluetooth": {
"format": "", "format": "",
"format-disabled": "", "format-disabled": "",
"format-no-controller": "",
"on-click": "alacritty --class floating_shell -e bluetuith", "on-click": "alacritty --class floating_shell -e bluetuith",
"on-click-right": "rfkill toggle bluetooth", "on-click-right": "rfkill toggle bluetooth",
"tooltip-format": "{}" "tooltip-format": "{}"

View file

@ -76,6 +76,7 @@ window#waybar.hidden {
} }
#clock, #clock,
#custom-help,
#custom-playerctl, #custom-playerctl,
#custom-power, #custom-power,
#custom-wlsunset, #custom-wlsunset,
@ -113,42 +114,46 @@ window#waybar.hidden {
#tray { #tray {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
color: @rosewater;
}
#custom-playerctl {
color: @flamingo; color: @flamingo;
} }
#custom-wlsunset { #custom-playerctl {
color: @pink; color: @pink;
} }
#idle_inhibitor { #custom-help {
color: @mauve; color: @mauve;
} }
#custom-dunst { #custom-wlsunset {
color: @red; color: @red;
} }
#custom-clipboard { #idle_inhibitor {
color: @maroon; color: @maroon;
} }
#cpu { #custom-dunst {
color: @peach; color: @peach;
} }
#memory { #custom-clipboard {
color: @yellow; color: @yellow;
} }
#cpu {
color: @green;
}
#memory {
color: @teal;
}
#battery { #battery {
animation-timing-function: linear; animation-timing-function: linear;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-direction: alternate; animation-direction: alternate;
color: @green; color: @sky;
} }
#battery.warning { #battery.warning {
@ -174,7 +179,7 @@ label:focus {
} }
#network { #network {
color: @teal; color: @sapphire;
} }
#network.disconnected { #network.disconnected {
@ -182,7 +187,7 @@ label:focus {
} }
#bluetooth { #bluetooth {
color: @sky; color: @blue;
} }
#bluetooth.disabled { #bluetooth.disabled {
@ -190,7 +195,7 @@ label:focus {
} }
#pulseaudio { #pulseaudio {
color: @sapphire; color: @lavender;
} }
#pulseaudio.muted { #pulseaudio.muted {
@ -198,5 +203,5 @@ label:focus {
} }
#custom-power { #custom-power {
color: @lavender; color: @text;
} }

View file

@ -5,7 +5,7 @@ include "/home/sunderland93/.gtkrc-2.0.mine"
gtk-theme-name="Catppuccin-Macchiato-Standard-Blue-Dark" gtk-theme-name="Catppuccin-Macchiato-Standard-Blue-Dark"
gtk-icon-theme-name="ePapirus-Dark" gtk-icon-theme-name="ePapirus-Dark"
gtk-font-name="Noto Sans 11" gtk-font-name="Noto Sans 11"
gtk-cursor-theme-name="breeze_cursors" gtk-cursor-theme-name="Bibata-Modern-Classic"
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR

View file

@ -47,4 +47,8 @@ if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then
set +o allexport set +o allexport
fi fi
exec systemd-cat -- /usr/bin/river $@ run_river() {
exec systemd-cat -- /usr/bin/ssh-agent /usr/bin/river $@
}
run_river

View file

@ -0,0 +1,12 @@
[Unit]
Description=Toggle idle inhibition depending on whether the audio is playing or not
PartOf=swayidle.service
After=swayidle.service
[Service]
ExecStart=/usr/share/river/scripts/idle-inhibitor.sh
Restart=always
RestartSec=30
[Install]
WantedBy=river-session.target

View file

@ -0,0 +1,9 @@
[Unit]
Description=Automatically restart the swayidle when its configuration changes
PartOf=swayidle.service
[Path]
PathChanged=%h/.config/swayidle/config
[Install]
WantedBy=paths.target

View file

@ -0,0 +1,6 @@
[Service]
ExecStart=systemctl --user restart swayidle.service
Type=oneshot
[Install]
WantedBy=graphical-session.target

View file

@ -6,7 +6,7 @@ ConditionPathExists=/usr/bin/swayidle
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/swayidle ExecStart=/usr/bin/swayidle -w
[Install] [Install]
WantedBy=river-session.target WantedBy=river-session.target

View file

@ -0,0 +1,11 @@
[Unit]
Description=Automatically restart the waybar when its configuration changes
PartOf=waybar.service
[Path]
PathChanged=%h/.config/waybar
PathChanged=%h/.config/waybar/colors
PathChanged=%h/waybar/config
[Install]
WantedBy=paths.target

View file

@ -0,0 +1,3 @@
[Service]
ExecStart=systemctl --user restart waybar.service
Type=oneshot

13
usr/share/river/scripts/help.sh Executable file
View file

@ -0,0 +1,13 @@
#!/bin/bash
set -x
# toggles the help wrapper state
VISIBILITY_SIGNAL=30
QUIT_SIGNAL=31
if [ "$1" = "--toggle" ]; then
pkill -f -${VISIBILITY_SIGNAL} nwg-wrapper
else
pkill -f -${QUIT_SIGNAL} nwg-wrapper
nwg-wrapper -i -sv ${VISIBILITY_SIGNAL} -sq ${QUIT_SIGNAL} -s help.sh -p left -a end &
fi

View file

@ -0,0 +1,32 @@
#!/bin/bash
check_status() {
grep -s -l -v "closed" \
/proc/asound/card*/pcm*/sub*/status \
&>/dev/null
}
out() {
printf "Idle inhibition is OFF.\n"
exit 0
}
watch_status() {
printf "Idle inhibition is ON.\n"
while check_status; do
sleep 10
done
out
}
main() {
check_status || out
test "$1" = "-w" && watch_status
systemd-inhibit \
--what=idle \
--who="${0##*/}" \
--why="Inhibit idle due to audio is now playing" \
--mode=block \
"$0" -w
}
main "$@"

10
usr/share/river/scripts/lock.sh Executable file
View file

@ -0,0 +1,10 @@
#!/bin/bash
USER_SCRIPT="$HOME/.config/swaylock/lock.sh"
GLOB_SCRIPT="/usr/share/river/scripts/swaylock.sh"
if [[ -x "$USER_SCRIPT" ]]; then
"$USER_SCRIPT"
else
"$GLOB_SCRIPT"
fi

View file

@ -0,0 +1,14 @@
#!/bin/bash
set -e
MIC="${1:-'Capture'}"
amixer sset "$MIC" toggle
STATE="$(amixer sget "$MIC",0 | sed -E -e '0,/^.*\[(on|off)\].*$/d' -e 's/^.*\[(\w+)\].*$/\1/')"
test -n "$STATE" && notify-send \
--app-name river \
--expire-time 800 \
"Microphone is $STATE"

136
usr/share/river/scripts/sbdp.py Executable file
View file

@ -0,0 +1,136 @@
#!/usr/bin/python3
import sys
import glob
import re
from typing import Text
import json
if len(sys.argv) >= 2:
rootPath = sys.argv[1]
else:
rootPath = './keybindings.sh'
def readFile(filePath):
try:
paths = glob.glob(filePath)
except (Exception, IndexError):
print("couldn't resolve glob:", filePath)
paths = []
allLines: list[str] = []
for path in paths:
allLines = allLines + open(path, "r").readlines()
finalLines: list[str] = []
for line in allLines:
if re.search(r'^include\s+(.+?)$', line):
nextPath = re.findall(r'^include\s+(.+?)$', line)[0]
finalLines = finalLines + readFile(nextPath)
else:
finalLines = finalLines + [line]
return finalLines
lines = readFile(rootPath)
def findKeybindingForLine(lineNumber: int, lines: list[str]):
return lines[lineNumber + 1].split(' ')[3]
class DocsConfig:
category: Text
action: Text
keybinding: Text
def getDocsConfig(lines: list[str]):
docsLineRegex = r"^## (?P<category>.+?) // (?P<action>.+?)\s+(// (?P<keybinding>.+?))*##"
docsConfig: list[DocsConfig] = []
for index, line in enumerate(lines):
match = re.match(docsLineRegex, line)
if match:
config = DocsConfig()
config.category = match.group('category')
config.action = match.group('action')
config.keybinding = match.group('keybinding')
if config.keybinding is None:
config.keybinding = findKeybindingForLine(index, lines)
docsConfig = docsConfig + [config]
return docsConfig
def getSymbolDict(lines: list[str]):
setRegex = r"^(?P<variable>\w+)\=\"(?P<value>[^\"]+)+\" ?"
dictionary = {}
for line in lines:
match = re.match(setRegex, line)
if match:
if match.group('variable'):
dictionary['$'+match.group('variable')] = match.group('value')
return dict(dictionary)
translations = {
'Mod1': "Alt",
'Mod2': "NumLk",
'Mod3': "",
'Mod4': "",
'Mod5': "Scroll",
'question': "?",
'space': "",
'minus': "-",
'plus': '+',
'Return': "Enter",
'XF86AudioRaiseVolume': "",
'XF86AudioLowerVolume': "",
'XF86AudioMute': "",
'XF86AudioMicMute': '',
'XF86MonBrightnessUp': "",
'XF86MonBrightnessDown': "",
'XF86PowerOff': "",
'XF86TouchpadToggle': "Toggle Touchpad"
}
def translate(word: Text, dictionary: dict):
try:
return dictionary[word.strip()]
except KeyError:
return word.strip()
def replaceBindingFromMap(binding: Text, dictionary: dict):
elements = binding.split('+')
resultElements = []
for el in elements:
translation = translate(translate(el, dictionary), translations)
resultElements = resultElements + [translation]
return " + ".join(resultElements)
def sanitize(configs: list[DocsConfig], symbolDict: dict):
for index, config in enumerate(configs):
config.keybinding = replaceBindingFromMap(
config.keybinding, symbolDict)
configs[index] = config
return configs
def getDocsList(lines: list[str]):
docsConfig = getDocsConfig(lines)
symbolDict = getSymbolDict(lines)
sanitizedConfig = sanitize(docsConfig, symbolDict)
return sanitizedConfig
docsList = getDocsList(lines)
result = []
for config in docsList:
result = result + [{'category': config.category,
'action': config.action, 'keybinding': config.keybinding}]
print(json.dumps(result))