Add mic-mute.sh for toggling microphone on/off

1.1.5
Pass SSH_AUTH_SOCK to all processes
2024-10-19 23:42:58 +04:00 · 2024-09-04 21:37:57 +04:00 · 2024-07-25 00:00:49 +04:00 · 2024-07-23 18:29:41 +04:00 · 2024-07-20 15:04:09 +04:00 · 2024-07-19 21:58:31 +04:00
41 changed files with 823 additions and 178 deletions
--- a/README.md
+++ b/README.md
@ -0,0 +1,38 @@
+### Default settings for TileOS River edition
+
+Any issues with the default configuration of TileOS River should be reported to [this](https://gitlab.com/tile-os/tileos-settings-river/-/issues) repository. Feel free to suggest your improvements and customizations!
+
+<img src=river.png>
+
+Default theme: [Catppuccin Macchiato](https://github.com/catppuccin/catppuccin) (GTK, Kvantum, i3/Sway, Waybar and cursor). TileOS-specific artwork can be found [here](https://gitlab.com/tile-os/tileos-artwork).
+
+Applications used:
+* [Alacritty](https://github.com/alacritty/alacritty) - Terminal emulator;
+* [Azote](https://github.com/nwg-piotr/azote) - Wallpaper manager;
+* [Btop++](https://github.com/aristocratos/btop) - System load monitor
+* [Calcurse](https://github.com/lfos/calcurse) - Calendar;
+* [Cliphist](https://github.com/sentriz/cliphist) - Clipboard manager;
+* [Dunst](https://github.com/dunst-project/dunst) - Notification system;
+* dconf - GTK/GNOME specific settings manager (used for GTK applications);
+* [Kvantum](https://github.com/tsujan/Kvantum) - Theme manager and engine for Qt-based applications;
+* [Light](https://github.com/perkele1989/light) - Brightness control;
+* [nwg-bar](https://github.com/nwg-piotr/nwg-bar) - Session management (shutdown, reboot, suspend, etc);
+* [nwg-drawer](https://github.com/nwg-piotr/nwg-drawer) - Fullscreen application menu;
+* [nwg-look](https://github.com/nwg-piotr/nwg-look) - Look-n-Feel configurator for GTK;
+* [nwg-wrapper](https://github.com/nwg-piotr/nwg-wrapper) - Used for desktop overlay with a list of default keybindings;
+* [Pavucontrol](https://github.com/pulseaudio/pavucontrol) - Pulseaudio/Pipewire volume control;
+* [Playerctl](https://github.com/altdesktop/playerctl) - utility for control MPRIS-based players;
+* [PCmanFM-Qt](https://github.com/lxqt/pcmanfm-qt) - File manager
+* [Pulsemixer](https://github.com/GeorgeFilipkin/pulsemixer) - console-based volume control for Pulseaudio/Pipewire;
+* [Pluma](https://github.com/mate-desktop/pluma) - GTK-based text editor;
+* [Rofi](https://github.com/lbonn/rofi) - Application launcher with Wayland support (fork);
+* [qt5ct](https://sourceforge.net/projects/qt5ct/) - Styling for Qt5-based applications;
+* [qt6ct](https://github.com/trialuser02/qt6ct) - Styling for Qt6-based applications;
+* [swappy](https://github.com/jtheoof/swappy) - Screenshot manager;
+* [swaybg](https://github.com/swaywm/swaybg) - Wallpaper daemon;
+* [swayidle](https://github.com/swaywm/swayidle) - Idle daemon/watcher;
+* [swaylock](https://github.com/swaywm/swaylock) - Lockscreen daemon;
+* [Waybar](https://github.com/Alexays/Waybar) - Topbar (panel) with various widgets;
+* [wf-recorder](https://github.com/ammen99/wf-recorder) - Screen recorder;
+* [wl-clipboard](https://github.com/bugaevc/wl-clipboard) - Wayland clipboard daemon;
+* [wlsunset](https://sr.ht/~kennylevinsen/wlsunset/) - utility for control color temperature, also known as "Nigth Color Mode".
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,120 @@
+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
+
+  * Set Bibata cursor
+  * Enable idle inhibitor by default
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Wed, 10 Jan 2024 22:01:01 +0400
+
+tileos-settings-river (1.0.1~tileos) unstable; urgency=medium
+
+  * Update window rules
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Tue, 12 Dec 2023 00:07:22 +0400
+
+tileos-settings-river (1.0~tileos) unstable; urgency=medium
+
+  * Small fixes
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Fri, 01 Dec 2023 22:03:04 +0400
+
+tileos-settings-river (0.15~tileos) unstable; urgency=medium
+
+  * Change default cursor theme to Catppuccin
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Fri, 03 Nov 2023 15:38:05 +0400
+
+tileos-settings-river (0.14~tileos) unstable; urgency=medium
+
+  * Fix clipboard manager
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Tue, 31 Oct 2023 21:30:46 +0400
+
+tileos-settings-river (0.13~tileos) unstable; urgency=medium
+
+  * Integrate systemd
+
+ -- Aleksey Samoilov <samoilov.lex@gmail.com>  Thu, 28 Sep 2023 21:32:54 +0400
+
 tileos-settings-river (0.12~tileos) unstable; urgency=medium

  * Add nwg-drawer config
--- a/etc/skel/.azotebg
+++ b/etc/skel/.azotebg
@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 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 &
--- a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
+++ b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
@ -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:
    # Default colors
    primary:
-        background: "#24273A" # base
-        foreground: "#CAD3F5" # text
+        background: *BASE
+        foreground: *TEXT
        # Bright and dim foreground colors
-        dim_foreground: "#CAD3F5" # text
-        bright_foreground: "#CAD3F5" # text
+        dim_foreground: *TEXT
+        bright_foreground: *TEXT

    # Cursor colors
    cursor:
-        text: "#24273A" # base
-        cursor: "#F4DBD6" # rosewater
+        text: *BASE
+        cursor: *ROSEWATER
    vi_mode_cursor:
-        text: "#24273A" # base
-        cursor: "#B7BDF8" # lavender
+        text: *BASE
+        cursor: *LAVENDER

    # Search colors
    search:
        matches:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
+            foreground: *BASE
+            background: *SUBTEXT0
        focused_match:
-            foreground: "#24273A" # base
-            background: "#A6DA95" # green
+            foreground: *BASE
+            background: *GREEN
        footer_bar:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
+            foreground: *BASE
+            background: *SUBTEXT0

    # Keyboard regex hints
    hints:
        start:
-            foreground: "#24273A" # base
-            background: "#EED49F" # yellow
+            foreground: *BASE
+            background: *YELLOW
        end:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
+            foreground: *BASE
+            background: *SUBTEXT0

    # Selection colors
    selection:
-        text: "#24273A" # base
-        background: "#F4DBD6" # rosewater
+        text: *BASE
+        background: *ROSEWATER

    # Normal colors
    normal:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
+        black: *SURFACE1
+        red: *RED
+        green: *GREEN
+        yellow: *YELLOW
+        blue: *BLUE
+        magenta: *PINK
+        cyan: *TEAL
+        white: *SUBTEXT1

    # Bright colors
    bright:
-        black: "#5B6078" # surface2
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#A5ADCB" # subtext0
+        black: *SURFACE2
+        red: *RED
+        green: *GREEN
+        yellow: *YELLOW
+        blue: *BLUE
+        magenta: *PINK
+        cyan: *TEAL
+        white: *SUBTEXT0

    # Dim colors
    dim:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
+        black: *SURFACE1
+        red: *RED
+        green: *GREEN
+        yellow: *YELLOW
+        blue: *BLUE
+        magenta: *PINK
+        cyan: *TEAL
+        white: *SUBTEXT1

    indexed_colors:
-        - { index: 16, color: "#F5A97F" }
-        - { index: 17, color: "#F4DBD6" }
+        - { index: 16, color: *INDEX16 }
+        - { index: 17, color: *INDEX17 }
--- a/etc/skel/.config/bluetuith/bluetuith.conf
+++ b/etc/skel/.config/bluetuith/bluetuith.conf
@ -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"
+  }
+}
--- a/etc/skel/.config/btop/themes/catppuccin_machiato.theme
+++ b/etc/skel/.config/btop/themes/catppuccin_machiato.theme
@ -58,7 +58,7 @@ theme[cached_mid]="#8aadf4"
 theme[cached_end]="#b7bdf8"

 # Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#f5a97f"
+theme[available_start]="#ed6c13"
 theme[available_mid]="#ee99a0"
 theme[available_end]="#ed8796"

@ -68,7 +68,7 @@ theme[used_mid]="#8bd5ca"
 theme[used_end]="#91d7e3"

 # Download graph colors (Peach -> Red)
-theme[download_start]="#f5a97f"
+theme[download_start]="#ed6c13"
 theme[download_mid]="#ee99a0"
 theme[download_end]="#ed8796"

--- a/etc/skel/.config/gtk-3.0/settings.ini
+++ b/etc/skel/.config/gtk-3.0/settings.ini
@ -2,7 +2,7 @@
 gtk-theme-name=Catppuccin-Macchiato-Standard-Blue-Dark
 gtk-icon-theme-name=ePapirus-Dark
 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-toolbar-style=GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
--- a/etc/skel/.config/nwg-bar/bar.json
+++ b/etc/skel/.config/nwg-bar/bar.json
@ -1,7 +1,7 @@
 [
 {
   "label": "Lock",
-   "exec": "riverctl spawn ~/.config/swaylock/lock.sh",
+   "exec": "riverctl spawn /usr/share/river/scripts/lock.sh",
   "icon": "system-lock-screen"
 },
 {
--- a/etc/skel/.config/nwg-wrapper/help.sh
+++ b/etc/skel/.config/nwg-wrapper/help.sh
@ -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>"'
--- a/etc/skel/.config/nwg-wrapper/style.css
+++ b/etc/skel/.config/nwg-wrapper/style.css
@ -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;
+}
--- a/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml
+++ b/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml
@ -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_pink"      value="#f5bde6"/>
 <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_peach"     value="#f5a97f"/>
+<color name="macchiato_peach"     value="#ed6c13"/>
 <color name="macchiato_yellow"    value="#eed49f"/>
 <color name="macchiato_green"     value="#a6da95"/>
 <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_lavender"  value="#b7bdf8"/>
 <color name="macchiato_text"      value="#cad3f5"/>
-<color name="macchiato_subtext1"  value="#b8c0e0"/>
-<color name="macchiato_subtext0"  value="#a5adcb"/>
+<color name="macchiato_subtext1"  value="#ced4e0"/>
+<color name="macchiato_subtext0"  value="#e3e3f3"/>
 <color name="macchiato_overlay2"  value="#939ab7"/>
 <color name="macchiato_overlay1"  value="#8087a2"/>
 <color name="macchiato_overlay0"  value="#6e738d"/>
--- a/etc/skel/.config/qt6ct/qt6ct.conf
+++ b/etc/skel/.config/qt6ct/qt6ct.conf
@ -3,7 +3,7 @@ color_scheme_path=$HOME/.config/qt6ct/colors/Catppuccin-Macchiato.conf
 custom_palette=true
 icon_theme=ePapirus
 standard_dialogs=default
-style=Fusion
+style=kvantum-dark

 [Fonts]
 fixed="Noto Sans,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"
--- a/etc/skel/.config/river/init
+++ b/etc/skel/.config/river/init
@ -36,12 +36,6 @@ trap session_cleanup EXIT INT TERM
 # Wait for StatusNotifierWatcher is available and start XDG Autostart target
 "$SNI_CHECK" && systemctl --user start "$SESSION_XDG_AUTOSTART_TARGET"

-# Set keyboard layout. See man riverctl
-# riverctl keyboard-layout -options "grp:caps_toggle" "us,ru"
-
-# Binding to reload the configuration (good for edits on bindings or adding new stuff
-riverctl map normal "Mod4" R spawn $HOME/.config/river/init
-
 # Polkit agent
 riverctl spawn "/usr/bin/mate-polkit"

@ -51,6 +45,9 @@ riverctl spawn $HOME/.azotebg
 # Include keybindings
 riverctl spawn $HOME/.config/river/keybindings.sh

+# Keybindings help overlay
+riverctl spawn /usr/share/river/scripts/help.sh & disown
+
 # Clipboard daemon
 pkill wl-paste
 wl-paste --watch cliphist store & disown
@ -64,6 +61,10 @@ playerctl -a metadata --format \'{{status}} {{title}}\' --follow | while read li
 pkill nwg-drawer
 nwg-drawer -r & disown

+# Start PCmanFM-Qt as a daemon
+pkill pcmanfm-qt
+pcmanfm-qt -d & disown
+
 # Screenshot notification
 riverctl spawn /usr/share/river/scripts/screenshot-notify.sh & disown

@ -73,6 +74,21 @@ riverctl border-color-focused 0x8aadf4
 riverctl border-color-unfocused 0xa5adcb
 riverctl border-width 2

+# Window rules
+
+# Make all views with an app-id that starts with "floating_shell" start floating.
+riverctl float-filter-add app-id "floating_shell"
+# Set floating view for some apps
+riverctl float-filter-add app-id "engrampa"
+riverctl float-filter-add app-id "calamares"
+riverctl float-filter-add app-id "nwg-look"
+riverctl float-filter-add app-id "qt5ct"
+riverctl float-filter-add app-id "qt6ct"
+riverctl float-filter-add app-id "pavucontrol"
+riverctl float-filter-add app-id "wdisplays"
+riverctl float-filter-add title "Picture-in-Picture"
+riverctl float-filter-add title "Firefox — Sharing Indicator"
+
 # Set the default layout generator to be rivertile and start it.
 # River will send the process group of the init executable SIGTERM on exit.
 riverctl default-layout rivertile
--- a/etc/skel/.config/river/keybindings.sh
+++ b/etc/skel/.config/river/keybindings.sh
@ -7,11 +7,14 @@ mod="Mod4"
 term="alacritty"

 # Application launcher
-launcher="rofi -show combi -combi-modi 'drun,run' -terminal $term -ssh-command '{terminal} {ssh-client} {host} [-p {port}]' -run-shell-command '{terminal} {cmd}' -show-icons -font 'Hack 12'"
+launcher="eval rofi -show combi -combi-modi 'drun,run' -terminal $term -ssh-command '{terminal} {ssh-client} {host} [-p {port}]' -run-shell-command '{terminal} {cmd}'"

 # Volume changing notify
 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_bar="/usr/share/river/scripts/brightness-notify.sh"

@ -22,103 +25,111 @@ screenshot_notify="eval [[ $(wl-paste -l) == "image/png" ]] && notify-send 'Scre
 riverctl map normal "None" Print spawn "/usr/bin/river-grimshot save screen - | swappy -f - && bash -c $screenshot_notify"
 riverctl map normal "$mod" Print spawn "/usr/bin/river-grimshot save area - | swappy -f - && bash -c $screenshot_notify"

-# $mod+Shift+Return to start an instance of terminal
+# Set keyboard layout. See man riverctl
+# riverctl keyboard-layout -options "grp:caps_toggle" "us,ru"
+
+## Action // Reload River Configuration // $mod+R ##
+riverctl map normal $mod R spawn $HOME/.config/river/init
+
+## Launch // Terminal // $mod+Return ##
 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"

-# $mod+Q to close the focused view
-riverctl map normal $mod+Shift Q close
-
-# $mod+Shift+E to run nwg-bar (logout, restart, shutdown, etc)
+## Action // Exit River // $mod+Shift+E ##
 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 K focus-view previous

-# $mod+Shift+J and $mod+Shift+K to swap the focused view with the next/previous
-# view in the layout stack
+## Navigation // Swap the focused view in the layout stack // $mod+Shift+{J,K} ##
 riverctl map normal $mod+Shift J swap next
 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 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 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

-# $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 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 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 J move down 100
 riverctl map normal $mod+Alt K move up 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 J snap down
 riverctl map normal $mod+Alt+Control K snap up
 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 J resize vertical 100
 riverctl map normal $mod+Alt+Shift K resize vertical -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

-# $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

-# $mod + Middle Mouse Button to toggle float
+## Navigation // Toggle float // $mod + Middle Mouse Button ##
 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)
 do
    tags=$((1 << ($i - 1)))

-    # $mod+[1-9] to focus tag [0-8]
    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

-    # $mod+Control+[1-9] to toggle focus of tag [0-8]
    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
 done

-# $mod+0 to focus all tags
-# $mod+Shift+0 to tag focused view with all tags
+## Navigation // Focus all tags // $mod+0 ##
+## Navigation // Tag focused view with all tags // $mod+Shift+0 ##
 all_tags=$(((1 << 32) - 1))
 riverctl map normal $mod 0 set-focused-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

-# $mod+F to toggle fullscreen
+## Action // Toggle fullscreen // $mod+F ##
 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 Right send-layout-cmd rivertile "main-location right"
 riverctl map normal $mod Down  send-layout-cmd rivertile "main-location bottom"
@ -128,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
 riverctl declare-mode passthrough

-# $mod+F11 to enter passthrough mode
+## Action // Enter passthrough mode // $mod+F11 ##
 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

 # Various media key mapping examples for both normal and locked mode which do
@ -145,6 +156,7 @@ do
    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 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)
    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
@ -159,14 +171,3 @@ done

 # Set keyboard repeat rate
 riverctl set-repeat 50 300
-
-# Make all views with an app-id that starts with "floating_shell" start floating.
-riverctl float-filter-add app-id "floating_shell"
-# Set floating view for some apps
-riverctl float-filter-add app-id "engrampa"
-riverctl float-filter-add app-id "nwg-look"
-riverctl float-filter-add app-id "qt5ct"
-riverctl float-filter-add app-id "qt6ct"
-riverctl float-filter-add app-id "pavucontrol"
-riverctl float-filter-add title "Picture-in-Picture"
-riverctl float-filter-add title "Firefox — Sharing Indicator"
--- a/etc/skel/.config/rofi/config.rasi
+++ b/etc/skel/.config/rofi/config.rasi
@ -1,9 +1,14 @@
+configuration {
+    show-icons: true;
+}
+
 * {
    lightbg: #24273a;
    background: #24273a;
    lightfg: #8aadf4;
    foreground: #cad3f5;
    border-color: #8aadf4;
+    font: "Hack 12";
 }

 window {
--- a/etc/skel/.config/waybar/colors/frappe.css
+++ b/etc/skel/.config/waybar/colors/frappe.css
@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Frappe palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #303446;
+@define-color mantle #292c3c;
+@define-color crust  #232634;
+
+@define-color text     #c6d0f5;
+@define-color subtext0 #a5adce;
+@define-color subtext1 #b5bfe2;
+
+@define-color surface0 #414559;
+@define-color surface1 #51576d;
+@define-color surface2 #626880;
+
+@define-color overlay0 #737994;
+@define-color overlay1 #838ba7;
+@define-color overlay2 #949cbb;
+
+@define-color blue      #8caaee;
+@define-color lavender  #babbf1;
+@define-color sapphire  #85c1dc;
+@define-color sky       #99d1db;
+@define-color teal      #81c8be;
+@define-color green     #a6d189;
+@define-color yellow    #e5c890;
+@define-color peach     #ef9f76;
+@define-color maroon    #ea999c;
+@define-color red       #e78284;
+@define-color mauve     #ca9ee6;
+@define-color pink      #f4b8e4;
+@define-color flamingo  #eebebe;
+@define-color rosewater #f2d5cf;
--- a/etc/skel/.config/waybar/colors/latte.css
+++ b/etc/skel/.config/waybar/colors/latte.css
@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Latte palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #eff1f5;
+@define-color mantle #e6e9ef;
+@define-color crust  #dce0e8;
+
+@define-color text     #4c4f69;
+@define-color subtext0 #6c6f85;
+@define-color subtext1 #5c5f77;
+
+@define-color surface0 #ccd0da;
+@define-color surface1 #bcc0cc;
+@define-color surface2 #acb0be;
+
+@define-color overlay0 #9ca0b0;
+@define-color overlay1 #8c8fa1;
+@define-color overlay2 #7c7f93;
+
+@define-color blue      #1e66f5;
+@define-color lavender  #7287fd;
+@define-color sapphire  #209fb5;
+@define-color sky       #04a5e5;
+@define-color teal      #179299;
+@define-color green     #40a02b;
+@define-color yellow    #df8e1d;
+@define-color peach     #fe640b;
+@define-color maroon    #e64553;
+@define-color red       #d20f39;
+@define-color mauve     #8839ef;
+@define-color pink      #ea76cb;
+@define-color flamingo  #dd7878;
+@define-color rosewater #dc8a78;
--- a/etc/skel/.config/waybar/colors/macchiato.css
+++ b/etc/skel/.config/waybar/colors/macchiato.css
@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Macchiato palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #24273a;
+@define-color mantle #1e2030;
+@define-color crust  #181926;
+
+@define-color text     #cad3f5;
+@define-color subtext0 #a5adcb;
+@define-color subtext1 #b8c0e0;
+
+@define-color surface0 #363a4f;
+@define-color surface1 #494d64;
+@define-color surface2 #5b6078;
+
+@define-color overlay0 #6e738d;
+@define-color overlay1 #8087a2;
+@define-color overlay2 #939ab7;
+
+@define-color blue      #8aadf4;
+@define-color lavender  #b7bdf8;
+@define-color sapphire  #7dc4e4;
+@define-color sky       #91d7e3;
+@define-color teal      #8bd5ca;
+@define-color green     #a6da95;
+@define-color yellow    #eed49f;
+@define-color peach     #f5a97f;
+@define-color maroon    #ee99a0;
+@define-color red       #ed8796;
+@define-color mauve     #c6a0f6;
+@define-color pink      #f5bde6;
+@define-color flamingo  #f0c6c6;
+@define-color rosewater #f4dbd6;
--- a/etc/skel/.config/waybar/colors/mocha.css
+++ b/etc/skel/.config/waybar/colors/mocha.css
@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Mocha palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #1e1e2e;
+@define-color mantle #181825;
+@define-color crust  #11111b;
+
+@define-color text     #cdd6f4;
+@define-color subtext0 #a6adc8;
+@define-color subtext1 #bac2de;
+
+@define-color surface0 #313244;
+@define-color surface1 #45475a;
+@define-color surface2 #585b70;
+
+@define-color overlay0 #6c7086;
+@define-color overlay1 #7f849c;
+@define-color overlay2 #9399b2;
+
+@define-color blue      #89b4fa;
+@define-color lavender  #b4befe;
+@define-color sapphire  #74c7ec;
+@define-color sky       #89dceb;
+@define-color teal      #94e2d5;
+@define-color green     #a6e3a1;
+@define-color yellow    #f9e2af;
+@define-color peach     #fab387;
+@define-color maroon    #eba0ac;
+@define-color red       #f38ba8;
+@define-color mauve     #cba6f7;
+@define-color pink      #f5c2e7;
+@define-color flamingo  #f2cdcd;
+@define-color rosewater #f5e0dc;
--- a/etc/skel/.config/waybar/config.jsonc
+++ b/etc/skel/.config/waybar/config.jsonc
@ -7,6 +7,7 @@
    "modules-right": [
        "tray",
        "custom/playerctl",
+        "custom/help",
        "custom/wlsunset",
        "idle_inhibitor",
        "custom/dunst",
@ -31,7 +32,8 @@
    },

    "river/window": {
-       "format": "{}"
+       "format": "{}",
+       "max-length": 50
    },

    "custom/playerctl": {
@ -51,6 +53,12 @@
        "signal": 5
    },

+    "custom/help": {
+        "format": "",
+        "on-click": "/usr/share/river/scripts/help.sh --toggle",
+        "tooltip": "false"
+    },
+
    "custom/wlsunset": {
        "interval": "once",
        "tooltip": true,
@ -73,6 +81,7 @@
            "activated": "",
            "deactivated": ""
        },
+        "start-activated": true,
        "tooltip": true,
        "tooltip-format-activated": "power-saving disabled",
        "tooltip-format-deactivated": "power-saving enabled"
@ -88,8 +97,8 @@
        "format": "",
        "interval": "once",
        "return-type": "json",
-        "on-click": "/usr/share/river/scripts/clipboard-manager.sh --list; pkill -RTMIN+9 waybar",
-        "on-click-right": "/usr/share/river/scripts/clipboard-manager.sh --del; pkill -RTMIN+9 waybar",
+        "on-click": "/usr/share/river/scripts/clipboard.sh --list; pkill -RTMIN+9 waybar",
+        "on-click-right": "/usr/share/river/scripts/clipboard.sh --del; pkill -RTMIN+9 waybar",
        "on-click-middle": "rm -f ~/.cache/cliphist/db; pkill -RTMIN+9 waybar",
        "exec": "printf '{\"tooltip\":\"%s\"}' $(cliphist list | wc -l)' item(s) in the clipboard\r(Mid click to clear)'",
        "exec-if": "[ -x \"$(command -v cliphist)\" ] && [ $(cliphist list | wc -l) -gt 0 ]",
@ -138,6 +147,7 @@
    "bluetooth": {
        "format": "",
        "format-disabled": "",
+        "format-no-controller": "",
        "on-click": "alacritty --class floating_shell -e bluetuith",
        "on-click-right": "rfkill toggle bluetooth",
        "tooltip-format": "{}"
@ -157,9 +167,7 @@
       "tooltip-format": "{icon}  {volume}% {format_source}",
       "on-click": "alacritty --class floating_shell -e pulsemixer",
       "on-click-middle": "pulsemixer --toggle-mute && /usr/share/river/scripts/volume-notify.sh",
-       "on-click-right": "pavucontrol",
-       "on-scroll-up": "pulsemixer --change-volume +5 && /usr/share/river/scripts/volume-notify.sh",
-       "on-scroll-down": "pulsemixer --change-volume -5 && /usr/share/river/scripts/volume-notify.sh"
+       "on-click-right": "pavucontrol"
    },
    
    "clock": {
--- a/etc/skel/.config/waybar/style.css
+++ b/etc/skel/.config/waybar/style.css
@ -1,3 +1,5 @@
+@import "colors/macchiato.css";
+
@keyframes blink-warning {
    70% {
        color: @wm_icon_bg;
@ -5,7 +7,7 @@

    to {
        color: @wm_icon_bg;
-        background-color: @warning_color;
+        background-color: @yellow;
    }
 }

@ -16,7 +18,7 @@

    to {
        color: @wm_icon_bg;
-        background-color: @error_color;
+        background-color: @red;
    }
 }

@ -24,7 +26,7 @@
 * {
    border: 0px;
    border-radius: 0px;
-    color: #cad3f5;
+    color: @text;
    padding: 0 0;
    margin-right: 2px;
    margin-left: 2px;
@ -38,7 +40,7 @@
 }

 window#waybar {
-    background: #24273a;
+    background: @base;
 }

 window#waybar.hidden {
@ -47,33 +49,34 @@ window#waybar.hidden {

 #tags button {
    border-bottom: 2px;
-    border-color: #24273a;
+    border-color: @base;
    border-style: solid;
    margin-bottom: 3px;
    transition-property: none;
 }

 #tags button.focused {
-    color: #7dc4e4;
-    border-color: #7dc4e4;
+    color: @sapphire;
+    border-color: @sapphire;
 }

 #tags button.focused.occupied {
-    color: #7dc4e4;
-    border-color: #7dc4e4;
+    color: @sapphire;
+    border-color: @sapphire;
 }

 #tags button.occupied {
-    color: #939ab7;
-    border-color: #939ab7;
+    color: @overlay2;
+    border-color: @overlay2;
 }

 #tags button.urgent {
-    color: #ed8796;
-    border-color: #ed8796;
+    color: @red;
+    border-color: @red;
 }

 #clock,
+#custom-help,
 #custom-playerctl,
 #custom-power,
 #custom-wlsunset,
@ -95,39 +98,62 @@ window#waybar.hidden {
    margin-bottom: 3px;
 }

-#clock {
-    color: #b7bdf8;
+#custom-menu {
+    color: @green;
 }

-#custom-wlsunset {
-    color: #f5bde6;
+#custom-wf-recorder {
+    color: @red;
+    padding-right: 10px;
+}
+
+#clock {
+    color: @lavender;
+}
+
+#tray {
+    padding-left: 5px;
+    padding-right: 5px;
+    color: @flamingo;
 }

 #custom-playerctl {
-    color: #f0c6c6;
+    color: @pink;
 }

-#custom-power {
-    color: #cad3f5;
+#custom-help {
+    color: @mauve;
 }

-#custom-clipboard {
-    color: #f5a97f;
+#custom-wlsunset {
+    color: @red;
 }

-#custom-menu {
-    color: #a6da95;
+#idle_inhibitor {
+    color: @maroon;
 }

 #custom-dunst {
-    color: #ed8796;
+    color: @peach;
+}
+
+#custom-clipboard {
+    color: @yellow;
+}
+
+#cpu {
+    color: @green;
+}
+
+#memory {
+    color: @teal;
 }

 #battery {
    animation-timing-function: linear;
    animation-iteration-count: infinite;
    animation-direction: alternate;
-    color: #8bd5ca;
+    color: @sky;
 }

 #battery.warning {
@ -152,48 +178,30 @@ label:focus {
    background-color: #000000;
 }

-#cpu {
-    color: #eed49f;
-}
-
-#memory {
-    color: #a6da95;
-}
-
 #network {
-    color: #91d7e3;
-}
-
-#bluetooth {
-    color: #7dc4e4;
-}
-
-#bluetooth.disabled {
-    color: @wm_icon_bg;
+    color: @sapphire;
 }

 #network.disconnected {
    color: @wm_icon_bg
 }

+#bluetooth {
+    color: @blue;
+}
+
+#bluetooth.disabled {
+    color: @wm_icon_bg;
+}
+
 #pulseaudio {
-    color: #8aadf4;
+    color: @lavender;
 }

 #pulseaudio.muted {
    color: @wm_icon_bg;
 }

-#custom-wf-recorder {
-    color: @error_color;
-    padding-right: 10px;
-}
-
-#tray {
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-#idle_inhibitor {
-    color: #c6a0f6;
+#custom-power {
+    color: @text;
 }
--- a/etc/skel/.config/xsettingsd/xsettingsd.conf
+++ b/etc/skel/.config/xsettingsd/xsettingsd.conf
@ -1,6 +1,6 @@
 Net/ThemeName "Catppuccin-Macchiato-Standard-Blue-Dark"
 Net/IconThemeName "ePapirus-Dark"
-Gtk/CursorThemeName "breeze_cursors"
+Gtk/CursorThemeName "Bibata-Modern-Classic"
 Net/EnableEventSounds 1
 EnableInputFeedbackSounds 0
 Xft/Antialias 1
--- a/etc/skel/.gtkrc-2.0
+++ b/etc/skel/.gtkrc-2.0
@ -5,7 +5,7 @@ include "/home/sunderland93/.gtkrc-2.0.mine"
 gtk-theme-name="Catppuccin-Macchiato-Standard-Blue-Dark"
 gtk-icon-theme-name="ePapirus-Dark"
 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-toolbar-style=GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
--- a/etc/skel/.icons/default/index.theme
+++ b/etc/skel/.icons/default/index.theme
@ -2,4 +2,4 @@
 [Icon Theme]
 Name=Default
 Comment=Default Cursor Theme
-Inherits=breeze_cursors
+Inherits=Bibata-Modern-Classic
--- a/river.png
+++ b/river.png
--- a/usr/bin/start-river
+++ b/usr/bin/start-river
@ -47,4 +47,8 @@ if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then
    set +o allexport
 fi

-exec systemd-cat -- /usr/bin/river $@
+run_river() {
+    exec systemd-cat -- /usr/bin/ssh-agent /usr/bin/river $@
+}
+
+run_river
--- a/usr/lib/systemd/user/swayidle-inhibitor.service
+++ b/usr/lib/systemd/user/swayidle-inhibitor.service
@ -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
--- a/usr/lib/systemd/user/swayidle-restart.path
+++ b/usr/lib/systemd/user/swayidle-restart.path
@ -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
--- a/usr/lib/systemd/user/swayidle-restart.service
+++ b/usr/lib/systemd/user/swayidle-restart.service
@ -0,0 +1,6 @@
+[Service]
+ExecStart=systemctl --user restart swayidle.service
+Type=oneshot
+
+[Install]
+WantedBy=graphical-session.target
--- a/usr/lib/systemd/user/swayidle.service
+++ b/usr/lib/systemd/user/swayidle.service
@ -6,7 +6,7 @@ ConditionPathExists=/usr/bin/swayidle

 [Service]
 Type=simple
-ExecStart=/usr/bin/swayidle
+ExecStart=/usr/bin/swayidle -w

 [Install]
 WantedBy=river-session.target
--- a/usr/lib/systemd/user/waybar-restart.path
+++ b/usr/lib/systemd/user/waybar-restart.path
@ -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
--- a/usr/lib/systemd/user/waybar-restart.service
+++ b/usr/lib/systemd/user/waybar-restart.service
@ -0,0 +1,3 @@
+[Service]
+ExecStart=systemctl --user restart waybar.service
+Type=oneshot
--- a/usr/share/river/scripts/clipboard-manager.sh
+++ b/usr/share/river/scripts/clipboard-manager.sh
@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-case "$1" in
-    --list) cliphist list | fuzzel --dmenu -font -p "Select item to copy:" --lines 10 --width 60 | cliphist decode | wl-copy;;
-    --del) cliphist list | fuzzel --dmenu -font -p "Select item to delete:" --lines 10 --width 60 | cliphist delete;;
-esac
--- a/usr/share/river/scripts/clipboard.sh
+++ b/usr/share/river/scripts/clipboard.sh
@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+case "$1" in
+    --list) cliphist list | rofi -dmenu -p "Select item to copy:" -lines 10 -width 35 | cliphist decode | wl-copy;;
+    --del) cliphist list | rofi -dmenu -p "Select item to delete:" -lines 10 -width 35 | cliphist delete;;
+esac
--- a/usr/share/river/scripts/help.sh
+++ b/usr/share/river/scripts/help.sh
@ -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
--- a/usr/share/river/scripts/idle-inhibitor.sh
+++ b/usr/share/river/scripts/idle-inhibitor.sh
@ -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 "$@"
--- a/usr/share/river/scripts/lock.sh
+++ b/usr/share/river/scripts/lock.sh
@ -0,0 +1,10 @@
+#!/bin/bash
+
+USER_SCRIPT="$HOME/.config/swaylock/lock.sh"
+GLOB_SCRIPT="/usr/share/sway/scripts/swaylock.sh"
+
+if [[ -x "$USER_SCRIPT" ]]; then
+    "$USER_SCRIPT"
+else 
+    "$GLOB_SCRIPT"
+fi
--- a/usr/share/river/scripts/mic-mute.sh
+++ b/usr/share/river/scripts/mic-mute.sh
@ -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"
--- a/usr/share/river/scripts/sbdp.py
+++ b/usr/share/river/scripts/sbdp.py
@ -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))
--- a/usr/share/river/scripts/swaylock.sh
+++ b/usr/share/river/scripts/swaylock.sh
--- a/usr/share/xdg-desktop-portal/river-portals.conf
+++ b/usr/share/xdg-desktop-portal/river-portals.conf
@ -0,0 +1,6 @@
+[preferred]
+# Use xdg-desktop-portal-gtk for every portal interface...
+default=gtk
+# ... except for the ScreenCast and Screenshot
+org.freedesktop.impl.portal.ScreenCast=wlr
+org.freedesktop.impl.portal.Screenshot=wlr
Author	SHA1	Message	Date
Sunderland93	d8d1f022c0	Add mic-mute.sh for toggling microphone on/off	2024-10-19 23:42:58 +04:00
Sunderland93	0bf9521a3c	1.1.5	2024-09-04 21:37:57 +04:00
Sunderland93	baf738bed1	Pass SSH_AUTH_SOCK to all processes	2024-07-25 00:00:49 +04:00
Sunderland93	51df2746b6	Fix swayidle restart path Added waybar autorestart service	2024-07-23 18:29:41 +04:00
Sunderland93	1ca8db8d25	Update changelog	2024-07-20 15:04:09 +04:00
Sunderland93	91d53b955d	Some fixes from Sway edition	2024-07-19 21:58:31 +04:00
Sunderland93	5876e2df16	Set qt6 style to kvantum-dark	2024-06-19 17:03:04 +04:00
Sunderland93	c40fe91505	waybar: limit window name characters to 50	2024-04-02 16:11:25 +04:00
Sunderland93	fd0c23b7f8	Update changelog	2024-03-14 10:27:36 +04:00
Aleksey Samoilov	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
Sunderland93	d7adecfa02	Change wallpaper	2024-02-14 22:59:04 +04:00
Sunderland93	eac1b5cadf	waybar: disable bluetooth module if no controller is found	2024-02-08 19:33:28 +04:00
Sunderland93	917a377900	Enable idle inhibit on startup	2024-02-02 22:40:26 +04:00
Sunderland93	dc9a9f1383	Update changelog	2024-01-29 10:23:43 +04:00
Sunderland93	d96b91f97b	Add keybindings help overlay	2024-01-27 23:26:08 +04:00
Sunderland93	cdc68187e0	Fix cursor for GTK 2 apps	2024-01-12 00:02:03 +04:00
Sunderland93	b83833443b	Set Bibata cursor, update changelog	2024-01-10 22:01:58 +04:00
Sunderland93	eecf7f6a0f	Enable idle inhibitor by default	2024-01-08 18:34:12 +04:00
Aleksey Samoilov	c128107c37	Update README.md	2023-12-13 17:15:03 +00:00
Sunderland93	13261e5292	Add README and screenshot	2023-12-13 21:14:25 +04:00
Sunderland93	aede33f38b	Update window rules	2023-12-12 00:08:03 +04:00
Sunderland93	6509e16474	Add some window rules	2023-12-11 17:13:33 +04:00
Sunderland93	3ffde7fd46	Small fixes	2023-12-01 22:03:32 +04:00
Sunderland93	7b4dc9607b	Rename clipboard script	2023-11-25 18:24:56 +04:00
Sunderland93	7502333e4e	Start PCManFM-Qt as a daemon	2023-11-24 15:56:28 +04:00
Sunderland93	c8a7aedd49	waybar: add color schemes	2023-11-21 13:40:06 +04:00
Sunderland93	086b8ed8a3	Reduce panel size	2023-11-21 11:58:47 +04:00
Sunderland93	980709e712	waybar: remove mouse scroll settings from Pulseaudio module otherwise it starts consuming up to 100% CPU since the module already has built-in support for volume control with the mouse wheel, and with an additional command to change the volume with the wheel, it connects to two sound servers	2023-11-14 15:34:09 +04:00
Sunderland93	96bf4e01ab	Change default cursor theme to Catppuccin	2023-11-03 15:38:42 +04:00
Sunderland93	0cbddcbbc5	Update changelog	2023-10-31 21:31:13 +04:00
Sunderland93	c61fac8781	Fix clipboard manager	2023-10-27 17:18:18 +04:00
Sunderland93	c9a769ac0b	Remove duplicated strings	2023-10-15 15:34:49 +04:00
Sunderland93	c6b1e92706	Add portals config	2023-10-15 14:09:22 +04:00
Sunderland93	a6bba9c151	Move all keybindings from init script	2023-10-15 14:09:00 +04:00
Sunderland93	424d0143ae	Update changelog	2023-09-28 21:33:23 +04:00
Aleksey Samoilov	6058c356cc	Merge pull request #1 from Tile-OS/systemd-integration Systemd integration	2023-09-28 21:28:25 +04:00
Sunderland93	1bbdc73ee8	Fix Rofi launch	2023-09-21 22:19:31 +04:00