From ecf5f1438bdcfb6bb602b893ae02d826ebb31ef7 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sat, 10 Jun 2023 15:23:06 +0300
Subject: [PATCH] Update dotfiles to linux.org.ru version

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 configs/.zshrc                           | 18 +++++++++++++---
 configs/sway/config                      | 18 ++++++++++------
 configs/sway/lock.sh                     |  3 ++-
 configs/sway/themes/catppuccin-macchiato |  6 +++---
 configs/waybar/config                    | 13 ++++++------
 configs/waybar/style.css                 | 26 ++++++++++++------------
 6 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/configs/.zshrc b/configs/.zshrc
index af4eac4..950ab74 100644
--- a/configs/.zshrc
+++ b/configs/.zshrc
@@ -44,10 +44,12 @@ alias vi="nvim"
 alias vim="nvim"
 alias ls="ls --color=always"
 alias la="ls -la"
+alias rh="rehash"
 alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
 alias timestamp='date -u +%FT%TZ'
 alias yt-dlp-opus="yt-dlp -f 251 -x"
 alias ltcp="cp ~/.dotfiles/latex_template/{macros,preamble,template,letterfonts}.tex ."
+alias jekyll_export="jekyll b -d ./_archive && cd _archive && tar cf ../site.tar ./ && cd .. && gzip -9 -f site.tar && rm -rf _archive"
 
 # ffmpeg section
 
@@ -57,12 +59,22 @@ ffmpeg_convert() {
     ffmpeg -i $2 -c:v ${1}_videotoolbox $(if [ ! -z $4 ]; then echo "-q:v $4"; fi ) $3
 }
 
+# Usage: ffmpeg_telegram_video_sticker: <video_in> <time <= 3> [<chromakey color in hex>] [<chromakey similarity>]
+ffmpeg_telegram_video_sticker() {
+    PWD_START=$(pwd)
+    TMPDIR=/tmp/sticker-$(date +%Y-%m-%d-%H:%M:%S)
+    mkdir $TMPDIR
+    cp $1 $TMPDIR/
+    cd $TMPDIR
+    ffmpeg -i $1 $(if [[ ! -z $3 && ! -z $4 ]]; then echo -vf "chromakey=\#$3:$4:0"; fi) -c copy -c:v png -t $2 tmp.mov
+    ffmpeg -y -i tmp.mov -r 30 -t $2 -an -c:v libvpx-vp9 -pix_fmt yuva420p -vf 'scale=512:512:force_original_aspect_ratio=decrease' -b:v 400K ${1}_sticker.webm
+    cp ${1}_sticker.webm $PWD_START/
+    cd $PWD_START
+    #rm -rf $TMP_DIR
+}
 # AsahiLinux useful aliases
 alias reload_net="sudo systemctl restart NetworkManager wpa_supplicant" # iwd"
 
 # Diskutil aliases
 alias dadc="diskutil apfs deleteContainer"
 alias devff="diskutil eraseVolume free free"
-source /opt/homebrew/opt/chruby/share/chruby/chruby.sh
-source /opt/homebrew/opt/chruby/share/chruby/auto.sh
-chruby ruby-3.1.3 # run chruby to see actual version
diff --git a/configs/sway/config b/configs/sway/config
index 6b19244..c9b831b 100644
--- a/configs/sway/config
+++ b/configs/sway/config
@@ -8,7 +8,7 @@ for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 p
 set $menu exec $term --option window.opacity=1 --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop"
 set $filemgr nemo
 
-output * bg ~/Pictures/bg/bg.png fill
+output * bg ~/Pictures/bg/sonoma.jpg fill
 
 input type:keyboard {
     xkb_layout us,ru
@@ -22,6 +22,10 @@ input type:touchpad {
     natural_scroll enabled
 }
 
+input "1452:849:Apple_MTP_multi-touch" {
+    scroll_factor 0.25
+}
+
 bar swaybar_command waybar
 xwayland enable
 
@@ -48,8 +52,8 @@ bindsym $mod+p exec (slurp | grim -g- $screenshot_file)
 # Recordings
 
 set $rec_file \"$HOME/Videos/recording-$(date '+%Y-%m-%d_%H-%M-%S').mp4\"
-bindsym $mod+Shift+o exec wf-recorder --file $rec_file
-bindsym $mod+Shift+p exec (wf-recorder -g "$(slurp)" --file $rec_file)
+bindsym $mod+Shift+o exec wf-recorder -a --file $rec_file
+bindsym $mod+Shift+p exec (wf-recorder -a -g "$(slurp)" --file $rec_file)
 bindsym $mod+Shift+BackSpace exec killall -s SIGINT wf-recorder
 
 # Symbols bind
@@ -139,8 +143,8 @@ bindsym XF86Search exec $menu
 
 # Trackpad gestures
 
-bindgesture swipe:3:right workspace next
-bindgesture swipe:3:left workspace prev
+bindgesture swipe:3:right workspace prev
+bindgesture swipe:3:left workspace next
 
 bindgesture swipe:4:up move up
 bindgesture swipe:4:down move down
@@ -149,6 +153,9 @@ bindgesture swipe:4:right move right
 
 bindgesture pinch:4:inward exec $menu # launchpad like
 
+# Lid binds
+
+bindswitch lid:on exec $HOME/.config/sway/lock.sh
 
 # Floating
 for_window [app_id="pavucontrol"] floating enable, resize 600 300, move absolute position 25ppt 25ppt
@@ -157,7 +164,6 @@ for_window [app_id="nm-connection-editor"] floating enable, resize 300 150, move
 # Autostart
 exec alacritty --class bottom -e btm
 for_window [app_id="bottom"] move container to workspace number 10
-for_window [app_id="bottom"] fullscreen
 exec keepassxc
 for_window [class="KeePassXC"] move container to workspace 9
 
diff --git a/configs/sway/lock.sh b/configs/sway/lock.sh
index a736e5c..323e27f 100755
--- a/configs/sway/lock.sh
+++ b/configs/sway/lock.sh
@@ -2,7 +2,8 @@
 # Times the screen off and puts it to background
 swayidle \
     timeout 10 'swaymsg "output * dpms off" && brightnessctl -d kbd_backlight set 0%' \
-    resume 'swaymsg "output * dpms on" && brightnessctl -d kbd_backlight set 30%' &
+    resume 'swaymsg "output * dpms on"' \
+    before-sleep 'swaylock -c 181924 --font JetBrains\ Mono' &
 # Locks the screen immediately
 swaylock -c 181924 -s stretch --font JetBrains\ Mono
 # Kills last background task so idle timer doesn't keep running
diff --git a/configs/sway/themes/catppuccin-macchiato b/configs/sway/themes/catppuccin-macchiato
index e0b10b8..d4a2b9b 100644
--- a/configs/sway/themes/catppuccin-macchiato
+++ b/configs/sway/themes/catppuccin-macchiato
@@ -1,11 +1,11 @@
-seat seat0 xcursor_theme "Simp1e-Catppuccin-Macchiato"
+seat seat0 xcursor_theme "Catppuccin-Macchiato-Dark-Cursors"
 
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
     gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark'
     gsettings set $gnome-schema icon-theme 'Mint-Y-Dark'
-    gsettings set $gnome-schema cursor-theme 'Simp1e-Catppuccin-Macchiato'
-    gsettings set $gnome-schema font-name 'Noto Sans 9'
+    gsettings set $gnome-schema cursor-theme 'Catppuccin-Macchiato-Dark-Cursors'
+    gsettings set $gnome-schema font-name 'Ubuntu 9'
 }
 
 # Property Name         Border  BG      Text    Indicator Child_border
diff --git a/configs/waybar/config b/configs/waybar/config
index 637df41..87fe999 100644
--- a/configs/waybar/config
+++ b/configs/waybar/config
@@ -1,8 +1,9 @@
 {
+    "height": 32,
     "position": "top",
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": [],
-    "modules-right": ["tray", "idle_inhibitor", "cpu", "memory", "custom/uptime", "pulseaudio", "battery", "sway/language", "clock"],
+    "modules-right": ["tray", "idle_inhibitor", "cpu", "memory", "wireplumber", "battery", "sway/language", "clock"],
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
@@ -17,15 +18,13 @@
         "spacing": 10
     },
     "clock": {
-        "format": "{:%H:%M:%S %d.%m.%Y}",
+        "format": "{:%H:%M:%S %Y-%m-%d}",
         "interval": 1
     },
-    "pulseaudio": {
+    "wireplumber": {
         "scroll-step": 1,
-        "format": "Volume: {volume}%",
-        "format-bluetooth": "Volume: {volume}% (BT)",
-        "format-bluetooth-muted": "Volume: {icon} (BT)",
-        "format-muted": "Vol: {volume}%",
+        "format": "Vol: {volume}%",
+        "format-muted": "Vol: muted",
         "on-click": "pavucontrol"
     },
     "cpu": {
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index bbad34c..343eb57 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -1,9 +1,8 @@
 @import "macchiato.css";
 * {
-    font-family: "Ubuntu", "JetBrains Mono", "Noto Sans";
-    font-size: 9pt;
+    font-family: "JetBrains Mono", "Noto Sans";
+    font-size: 6pt;
     border: none;
-    border-radius: 0;
     font-weight: 400;
     padding: 1px 1px;
 }
@@ -11,18 +10,12 @@
 window#waybar {
     color: transparent;
     background: @base;
+    opacity: 0.75;
     padding-top: 0;
     padding-bottom: 0;
     margin-top: 8px;
 }
 
-#workspaces {
-    transition: none;
-    color: @text;
-}
-
-#workspaces button {
-}
 
 button:hover {
     color: @red;
@@ -39,18 +32,25 @@ button:hover {
 }
 #mode {
     background-color: @mantle;
+    color: @text;
 }
 
+.modules-left {
+    padding-left: 4px;
+    border-radius: 8px;
+}
 .modules-right {
     transition: none;
     background: @base;
     color: @text;
-    padding-left: 4px;
     padding-right: 4px;
 }
 
-#language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime {
-    padding: 0 8px;
+#worspaces, #language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime, #wireplumber {
+    padding: 0 4px;
+    margin: 2 1px;
+    background-color: @mantle;
+    border-radius: 8px;
 }
 
 #window {