diff --git a/debian/changelog b/debian/changelog index d670361..b7bd4a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tileos-settings-river (1.1.5~tileos) unstable; urgency=medium + + * Updates from Sway edition + + -- Aleksey Samoilov 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 diff --git a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml index a68f0e9..a0c8327 100644 --- a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml +++ b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml @@ -1,97 +1,97 @@ color_set: - text: &TEXT "#CAD3F5" - subtext0: &SUBTEXT0 "#E3E3F3" - subtext1: &SUBTEXT1 "#CED4E0" - surface2: &SURFACE2 "#5B6078" - surface1: &SURFACE1 "#494D64" - index16: &INDEX16 "#F5A97F" - 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" + 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 # base - foreground: *TEXT # text + background: *BASE + foreground: *TEXT # Bright and dim foreground colors - dim_foreground: *TEXT # text - bright_foreground: *TEXT # text + dim_foreground: *TEXT + bright_foreground: *TEXT # Cursor colors cursor: - text: *BASE # base - cursor: *ROSEWATER # rosewater + text: *BASE + cursor: *ROSEWATER vi_mode_cursor: - text: *BASE # base - cursor: *LAVENDER # lavender + text: *BASE + cursor: *LAVENDER # Search colors search: matches: - foreground: *BASE # base - background: *SUBTEXT0 # subtext0 + foreground: *BASE + background: *SUBTEXT0 focused_match: - foreground: *BASE # base - background: *GREEN # green + foreground: *BASE + background: *GREEN footer_bar: - foreground: *BASE # base - background: *SUBTEXT0 # subtext0 + foreground: *BASE + background: *SUBTEXT0 # Keyboard regex hints hints: start: - foreground: *BASE # base - background: *YELLOW # yellow + foreground: *BASE + background: *YELLOW end: - foreground: *BASE # base - background: *SUBTEXT0 # subtext0 + foreground: *BASE + background: *SUBTEXT0 # Selection colors selection: - text: *BASE # base - background: *ROSEWATER # rosewater + text: *BASE + background: *ROSEWATER # Normal colors normal: - black: *SURFACE1 # surface1 - red: *RED # red - green: *GREEN # green - yellow: *YELLOW # yellow - blue: *BLUE # blue - magenta: *PINK # pink - cyan: *TEAL # teal - white: *SUBTEXT1 # subtext1 + black: *SURFACE1 + red: *RED + green: *GREEN + yellow: *YELLOW + blue: *BLUE + magenta: *PINK + cyan: *TEAL + white: *SUBTEXT1 # Bright colors bright: - black: *SURFACE2 # surface2 - red: *RED # red - green: *GREEN # green - yellow: *YELLOW # yellow - blue: *BLUE # blue - magenta: *PINK # pink - cyan: *TEAL # teal - white: *SUBTEXT0 # subtext0 + black: *SURFACE2 + red: *RED + green: *GREEN + yellow: *YELLOW + blue: *BLUE + magenta: *PINK + cyan: *TEAL + white: *SUBTEXT0 # Dim colors dim: - black: *SURFACE1 # surface1 - red: *RED # red - green: *GREEN # green - yellow: *YELLOW # yellow - blue: *BLUE # blue - magenta: *PINK # pink - cyan: *TEAL # teal - white: *SUBTEXT1 # 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 } diff --git a/etc/skel/.config/bluetuith/bluetuith.conf b/etc/skel/.config/bluetuith/bluetuith.conf new file mode 100644 index 0000000..e335eea --- /dev/null +++ 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" + } +} diff --git a/etc/skel/.config/btop/themes/catppuccin_machiato.theme b/etc/skel/.config/btop/themes/catppuccin_machiato.theme index 86819d2..59fc259 100644 --- 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" diff --git a/etc/skel/.config/nwg-bar/bar.json b/etc/skel/.config/nwg-bar/bar.json index 85b554b..6a96904 100644 --- 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" }, { diff --git a/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml b/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml index 826a71a..23098aa 100644 --- a/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml +++ b/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml @@ -15,7 +15,7 @@ Catppuccin Gedit theme based on Oblivion theme and Cappuccin for Visual Studio C - + diff --git a/usr/lib/systemd/user/swayidle-inhibitor.service b/usr/lib/systemd/user/swayidle-inhibitor.service new file mode 100644 index 0000000..1fb803d --- /dev/null +++ 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 diff --git a/usr/share/river/scripts/idle-inhibitor.sh b/usr/share/river/scripts/idle-inhibitor.sh new file mode 100755 index 0000000..d0113a5 --- /dev/null +++ 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 "$@" diff --git a/usr/share/river/scripts/lock.sh b/usr/share/river/scripts/lock.sh new file mode 100755 index 0000000..170253f --- /dev/null +++ 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 diff --git a/etc/skel/.config/swaylock/lock.sh b/usr/share/river/scripts/swaylock.sh similarity index 100% rename from etc/skel/.config/swaylock/lock.sh rename to usr/share/river/scripts/swaylock.sh