debian/changelog

@@ -1,83 +1,3 @@
-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

etc/skel/.azotebg

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

etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml

@@ -1,97 +1,79 @@
-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: *BASE
+        background: "#24273A" # base
-        foreground: *TEXT
+        foreground: "#CAD3F5" # text
         # Bright and dim foreground colors
-        dim_foreground: *TEXT
+        dim_foreground: "#CAD3F5" # text
-        bright_foreground: *TEXT
+        bright_foreground: "#CAD3F5" # text
 
     # Cursor colors
     cursor:
-        text: *BASE
+        text: "#24273A" # base
-        cursor: *ROSEWATER
+        cursor: "#F4DBD6" # rosewater
     vi_mode_cursor:
-        text: *BASE
+        text: "#24273A" # base
-        cursor: *LAVENDER
+        cursor: "#B7BDF8" # lavender
 
     # Search colors
     search:
         matches:
-            foreground: *BASE
+            foreground: "#24273A" # base
-            background: *SUBTEXT0
+            background: "#A5ADCB" # subtext0
         focused_match:
-            foreground: *BASE
+            foreground: "#24273A" # base
-            background: *GREEN
+            background: "#A6DA95" # green
         footer_bar:
-            foreground: *BASE
+            foreground: "#24273A" # base
-            background: *SUBTEXT0
+            background: "#A5ADCB" # subtext0
 
     # Keyboard regex hints
     hints:
         start:
-            foreground: *BASE
+            foreground: "#24273A" # base
-            background: *YELLOW
+            background: "#EED49F" # yellow
         end:
-            foreground: *BASE
+            foreground: "#24273A" # base
-            background: *SUBTEXT0
+            background: "#A5ADCB" # subtext0
 
     # Selection colors
     selection:
-        text: *BASE
+        text: "#24273A" # base
-        background: *ROSEWATER
+        background: "#F4DBD6" # rosewater
 
     # Normal colors
     normal:
-        black: *SURFACE1
+        black: "#494D64" # surface1
-        red: *RED
+        red: "#ED8796" # red
-        green: *GREEN
+        green: "#A6DA95" # green
-        yellow: *YELLOW
+        yellow: "#EED49F" # yellow
-        blue: *BLUE
+        blue: "#8AADF4" # blue
-        magenta: *PINK
+        magenta: "#F5BDE6" # pink
-        cyan: *TEAL
+        cyan: "#8BD5CA" # teal
-        white: *SUBTEXT1
+        white: "#B8C0E0" # subtext1
 
     # Bright colors
     bright:
-        black: *SURFACE2
+        black: "#5B6078" # surface2
-        red: *RED
+        red: "#ED8796" # red
-        green: *GREEN
+        green: "#A6DA95" # green
-        yellow: *YELLOW
+        yellow: "#EED49F" # yellow
-        blue: *BLUE
+        blue: "#8AADF4" # blue
-        magenta: *PINK
+        magenta: "#F5BDE6" # pink
-        cyan: *TEAL
+        cyan: "#8BD5CA" # teal
-        white: *SUBTEXT0
+        white: "#A5ADCB" # subtext0
 
     # Dim colors
     dim:
-        black: *SURFACE1
+        black: "#494D64" # surface1
-        red: *RED
+        red: "#ED8796" # red
-        green: *GREEN
+        green: "#A6DA95" # green
-        yellow: *YELLOW
+        yellow: "#EED49F" # yellow
-        blue: *BLUE
+        blue: "#8AADF4" # blue
-        magenta: *PINK
+        magenta: "#F5BDE6" # pink
-        cyan: *TEAL
+        cyan: "#8BD5CA" # teal
-        white: *SUBTEXT1
+        white: "#B8C0E0" # subtext1
 
     indexed_colors:
-        - { index: 16, color: *INDEX16 }
+        - { index: 16, color: "#F5A97F" }
-        - { index: 17, color: *INDEX17 }
+        - { index: 17, color: "#F4DBD6" }

etc/skel/.config/bluetuith/bluetuith.conf

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

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]="#ed6c13"
+theme[available_start]="#f5a97f"
 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]="#ed6c13"
+theme[download_start]="#f5a97f"
 theme[download_mid]="#ee99a0"
 theme[download_end]="#ed8796"
 

etc/skel/.config/nwg-bar/bar.json

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

etc/skel/.config/nwg-wrapper/help.sh

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

etc/skel/.config/nwg-wrapper/style.css

@@ -1,13 +0,0 @@
-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;
-}

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="#ed6070"/>
+<color name="macchiato_red"       value="#ed8796"/>
 <color name="macchiato_maroon"    value="#ee99a0"/>
-<color name="macchiato_peach"     value="#ed6c13"/>
+<color name="macchiato_peach"     value="#f5a97f"/>
 <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="#ced4e0"/>
+<color name="macchiato_subtext1"  value="#b8c0e0"/>
-<color name="macchiato_subtext0"  value="#e3e3f3"/>
+<color name="macchiato_subtext0"  value="#a5adcb"/>
 <color name="macchiato_overlay2"  value="#939ab7"/>
 <color name="macchiato_overlay1"  value="#8087a2"/>
 <color name="macchiato_overlay0"  value="#6e738d"/>

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=kvantum-dark
+style=Fusion
 
 [Fonts]
 fixed="Noto Sans,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"

etc/skel/.config/river/init

@@ -45,9 +45,6 @@ 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

etc/skel/.config/river/keybindings.sh

@@ -12,9 +12,6 @@ launcher="eval rofi -show combi -combi-modi 'drun,run' -terminal $term -ssh-comm
 # 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"
 
@@ -28,108 +25,106 @@ riverctl map normal "$mod" Print spawn "/usr/bin/river-grimshot save area - | sw
 # Set keyboard layout. See man riverctl
 # riverctl keyboard-layout -options "grp:caps_toggle" "us,ru"
 
-## Action // Reload River Configuration // $mod+R ##
+# Binding to reload the configuration (good for edits on bindings or adding new stuff
 riverctl map normal $mod R spawn $HOME/.config/river/init
 
-## Launch // Terminal // $mod+Return ##
+# $mod+Shift+Return to start an instance of terminal
 riverctl map normal $mod Return spawn $term
 
-## Launch // Launcher // $mod+D ##
+# $mod+D to start an instance of application launcher
 riverctl map normal $mod D spawn "$launcher"
 
-## Action // Exit River // $mod+Shift+E ##
+# $mod+Q to close the focused view
-riverctl map normal $mod+Shift E spawn nwg-bar
-
-## 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} ##
+# $mod+Shift+E to run nwg-bar (logout, restart, shutdown, etc)
+riverctl map normal $mod+Shift E spawn nwg-bar
+
+# $mod+J and $mod+K to focus the next/previous view in the layout stack
 riverctl map normal $mod J focus-view next
 riverctl map normal $mod K focus-view previous
 
-## Navigation // Swap the focused view in the layout stack // $mod+Shift+{J,K} ##
+# $mod+Shift+J and $mod+Shift+K to swap the focused view with the next/previous
+# view in the layout stack
 riverctl map normal $mod+Shift J swap next
 riverctl map normal $mod+Shift K swap previous
 
-## Navigation // Focus the next/previous output // $mod+{, .} ##
+# $mod+Period and $mod+Comma to focus the next/previous output
 riverctl map normal $mod Period focus-output next
 riverctl map normal $mod Comma focus-output previous
 
-## Navigation // Send the focused view to the next/previous output // $mod+Shift+{, .} ##
+# $mod+Shift+{Period,Comma} to send the focused view to the next/previous output
 riverctl map normal $mod+Shift Period send-to-output next
 riverctl map normal $mod+Shift Comma send-to-output previous
 
-## Navigation // Bump the focused view to the top of the layout stack // $mod+Shift+Return ##
+# $mod+Return to bump the focused view to the top of the layout stack
 riverctl map normal $mod+Shift Return zoom
 
-## Navigation // Decrease/increase the main ratio of rivertile // $mod+{H,L} ##
+# $mod+H and $mod+L to decrease/increase the main ratio of rivertile(1)
 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"
 
-## Navigation // Increment/decrement the main count of rivertile // $mod+Shift+{H,L} ##
+# $mod+Shift+H and $mod+Shift+L to increment/decrement the main count of rivertile(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"
 
-## Navigation // Move views // $mod+Alt+{H,J,K,L} ##
+# $mod+Alt+{H,J,K,L} to move views
 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
 
-## Navigation // Snap views to screen edges // $mod+Alt+Control+{H,J,K,L}##
+# $mod+Alt+Control+{H,J,K,L} to snap views to screen edges
 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
 
-## Navigation // Resize views // $mod+Alt+Shift+{H,J,K,L} ##
+# $mod+Alt+Shift+{H,J,K,L} to resize views
 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
 
-## Navigation // Move views with mouse // $mod + Left Mouse Button ##
+# $mod + Left Mouse Button to move views
 riverctl map-pointer normal $mod BTN_LEFT move-view
 
-## Navigation // Resize views with mouse // $mod + Right Mouse Button ##
+# $mod + Right Mouse Button to resize views
 riverctl map-pointer normal $mod BTN_RIGHT resize-view
 
-## Navigation // Toggle float // $mod + Middle Mouse Button ##
+# $mod + Middle Mouse Button to 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)
 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
 
-## Navigation // Focus all tags // $mod+0 ##
+# $mod+0 to focus all tags
-## Navigation // Tag focused view with all tags // $mod+Shift+0 ##
+# $mod+Shift+0 to tag focused view with all tags
 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
 
-## Action // Toggle floating // $mod+Space ##
+# $mod+Space to toggle float
 riverctl map normal $mod Space toggle-float
 
-## Action // Toggle fullscreen // $mod+F ##
+# $mod+F to toggle fullscreen
 riverctl map normal $mod F toggle-fullscreen
 
-## Navigation // Change layout orientation // $mod+{↑ ↓ ← →} ##
+# $mod+{Up,Right,Down,Left} to change layout orientation
 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"
@@ -139,10 +134,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
 
-## Action // Enter passthrough mode // $mod+F11 ##
+# $mod+F11 to enter passthrough mode
 riverctl map normal $mod F11 enter-mode passthrough
 
-## Action // Return to normal mode // $mod+F11 ##
+# $mod+F11 to return to normal mode
 riverctl map passthrough $mod F11 enter-mode normal
 
 # Various media key mapping examples for both normal and locked mode which do
@@ -156,7 +151,6 @@ 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'

etc/skel/.config/swayidle/config

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

etc/skel/.config/waybar/config.jsonc

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

etc/skel/.config/waybar/style.css

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

usr/bin/start-river

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

usr/lib/systemd/user/swayidle-inhibitor.service

@@ -1,12 +0,0 @@
-[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

usr/lib/systemd/user/swayidle-restart.path

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

usr/lib/systemd/user/swayidle-restart.service

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

usr/lib/systemd/user/swayidle.service

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

usr/lib/systemd/user/waybar-restart.path

@@ -1,11 +0,0 @@
-[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

usr/lib/systemd/user/waybar-restart.service

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

usr/share/river/scripts/help.sh

@@ -1,13 +0,0 @@
-#!/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

usr/share/river/scripts/idle-inhibitor.sh

@@ -1,32 +0,0 @@
-#!/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 "$@"

usr/share/river/scripts/lock.sh

@@ -1,10 +0,0 @@
-#!/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

usr/share/river/scripts/mic-mute.sh

@@ -1,14 +0,0 @@
-#!/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"

usr/share/river/scripts/sbdp.py

@@ -1,136 +0,0 @@
-#!/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))