debian/changelog

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

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/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/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"
 
@@ -156,7 +153,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/waybar/config.jsonc

@@ -32,8 +32,7 @@
     },
 
     "river/window": {
-       "format": "{}",
+       "format": "{}"
-       "max-length": 50
     },
 
     "custom/playerctl": {

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/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/sway/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"