docs: updated readme

.gitignore

@@ -0,0 +1,5 @@
+nvim/lazy-lock.json
+mpd/database
+mpd/log
+mpd/mpd
+mpd/sticker.sql

.zshrc

@@ -105,7 +105,6 @@ git_prompt_info() {
 
     branch=$(git branch --show-current 2>/dev/null)
 
-    # Не Git-репозиторий
     if [[ -z "$branch" ]]; then
         return
     fi

README.md

@@ -46,6 +46,7 @@ sudo pacman -S \
     rbw \
     rofi \
     rofi-rbw \
+    wtype \
     python-systemd \
     python-i3ipc \
     rmpc \
@@ -55,7 +56,6 @@ sudo pacman -S \
     mpd \
     mpd-mpris \
     playerctl \
-    xorg-xwayland \ 
     xdg-utils \
     xdg-desktop-portal-gtk \
     xdg-desktop-portal-wlr \
@@ -71,33 +71,38 @@ sudo pacman -S \
     dunst \
     uwsm \
     mc \
-    imv
+    imv \
+    waybar
 ```
 
 ```bash
 yay -S \
     swaddle \
-    clipvault \
+    clipvault-bin \
     pinentry-rofi
 ```
 
 ## Деплой
 
 ```bash
-ln -s ./.zsh ~/.config/.zsh
-ln -s ./.zshrc ~/.zshrc
-ln -s ./dunst ~/.config/dunst
-ln -s ./foot ~/.config/foot
-ln -s ./uwsm ~/.config/uwsm
-ln -s ./systemd/user/* ~/.config/systemd/user/
-ln -s ./sway ~/.config/sway
-ln -s ./swaylock ~/.config/swaylock
-ln -s ./swaddle ~/.config/swaddle
-ln -s ./rofi ~/.config/rofi
-ln -s ./rmpc ~/.config/rmpc
-ln -s ./nvim ~/.config/nvim
-ln -s ./mpv ~/.config/mpv
-ln -s ./mpd ~/.config/mpd
+git clone https://gitea.oyacoi.ru/pyrschtjag/dotfiles-sway ~/Documents/.dotfiles-sway
+```
+
+```bash
+ln -s ~/Documents/.dotfiles-sway/.zsh ~/.config/.zsh
+ln -s ~/Documents/.dotfiles-sway/.zshrc ~/.zshrc
+ln -s ~/Documents/.dotfiles-sway/dunst ~/.config/dunst
+ln -s ~/Documents/.dotfiles-sway/foot ~/.config/foot
+ln -s ~/Documents/.dotfiles-sway/uwsm ~/.config/uwsm
+ln -s ~/Documents/.dotfiles-sway/systemd/user/* ~/.config/systemd/user/
+ln -s ~/Documents/.dotfiles-sway/sway ~/.config/sway
+ln -s ~/Documents/.dotfiles-sway/swaylock ~/.config/swaylock
+ln -s ~/Documents/.dotfiles-sway/swaddle ~/.config/swaddle
+ln -s ~/Documents/.dotfiles-sway/rofi ~/.config/rofi
+ln -s ~/Documents/.dotfiles-sway/rmpc ~/.config/rmpc
+ln -s ~/Documents/.dotfiles-sway/nvim ~/.config/nvim
+ln -s ~/Documents/.dotfiles-sway/mpv ~/.config/mpv
+ln -s ~/Documents/.dotfiles-sway/mpd ~/.config/mpd
 ```
 
 ```bash
@@ -123,7 +128,15 @@ ln -s ./other/pinentry-rofi-wrapper ~/.local/bin/pinentry-rofi-wrapper
 ```bash
 rbw config set email $email
 rbw config set base_url $url
-rbw config set pinentry $pinentry_rofi_wrapper
+rbw config set pinentry ~/.local/bin/pinentry-rofi-wrapper 
+```
+
+```bash
+systemctl --user enable --now clipvault
+systemctl --user enable --now gtk-settings
+systemctl --user enable --now per-window-layout
+systemctl --user enable --now swaddle
+systemctl --user enable --now swayidle
 ```
 
 ## Скриншоты

nvim/lazy-lock.json

@@ -1,11 +0,0 @@
-{
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "72a05f62c52241bc7441c820eb53946f92b2e6a4" },
-  "nvim-tree.lua": { "branch": "master", "commit": "531b807b8f0d6f75016a0ee1e0cd5ce2086e9d95" },
-  "nvim-treesitter": { "branch": "main", "commit": "c9f9ed6c1892f629ea399f4ee7905f2686fa13f2" },
-  "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
-  "render-markdown.nvim": { "branch": "main", "commit": "f422cb5c6855f150e2ddcfaf44e7157b98b34f6a" }
-}

rmpc/config.ron

@@ -155,15 +155,9 @@
                             panes: [
                                 (
                                     size: "1",
-                                    //borders: "ALL",
-                                    //border_symbols: Inherited(parent: Rounded, bottom_left: "├", bottom_right: "┤",),
                                     pane: Split(
                                         direction: Horizontal,
                                         panes: [
-                                            /*(
-                                                size: "1",
-                                                pane: Pane(Empty())
-                                            ),*/
                                             (
                                                 size: "100%",
                                                 pane: Pane(QueueHeader())
@@ -173,15 +167,9 @@
                                 ),
                                 (
                                     size: "100%",
-                                    //borders: "LEFT | RIGHT | BOTTOM",
-                                    //border_symbols: Rounded,
                                     pane: Split(
                                         direction: Horizontal,
                                         panes: [
-                                            /*(
-                                                size: "1",
-                                                pane: Pane(Empty())
-                                            ),*/
                                             (
                                                 size: "100%",
                                                 pane: Pane(Queue)
@@ -199,22 +187,16 @@
                             panes: [
                                 (
                                     size: "19",
-                                    //borders: "", //LEFT | RIGHT | TOP",
-                                    //border_symbols: Rounded,
                                     pane: Pane(AlbumArt)
                                 ),
                                 (
                                     size: "100%",
-                                    //borders: "", //ALL",
-                                    //border_symbols: Inherited(parent: Rounded, top_left: "├", top_right: "┤",),
-                                    //border_title: [(kind: Text(" Lyrics "))],
-                                    //border_title_alignment: Right,
                                     pane: Component("column1"),
                                 ),
                             ],
                         ),
                     ), 
-],
+		],
             ),
         ),
         (
@@ -222,7 +204,7 @@
             pane: Split(
                 size: "100%",
                 direction: Vertical,
-                panes: [(pane: Pane(Directories), size: "100%")] //, borders: "ALL", border_symbols: Rounded)],
+                panes: [(pane: Pane(Directories), size: "100%")],
             )
         ),
         (
@@ -230,7 +212,7 @@
             pane: Split(
                 size: "100%",
                 direction: Vertical,
-                panes: [(pane: Pane(AlbumArtists), size: "100%")] //, borders: "ALL", border_symbols: Rounded)],
+                panes: [(pane: Pane(AlbumArtists), size: "100%")],
             )
         ),
         (
@@ -238,7 +220,7 @@
             pane: Split(
                 size: "100%",
                 direction: Vertical,
-                panes: [(pane: Pane(Playlists), size: "100%")] //, borders: "ALL", border_symbols: Rounded)],
+                panes: [(pane: Pane(Playlists), size: "100%")],
             )
         ),
         (
@@ -246,7 +228,7 @@
             pane: Split(
                 size: "100%",
                 direction: Vertical,
-                panes: [(pane: Pane(Search), size: "100%")] //, borders: "ALL", border_symbols: Rounded)],
+                panes: [(pane: Pane(Search), size: "100%")],
             )
         ),
     ],

rofi/config.rasi

@@ -4,7 +4,7 @@ configuration {
     scroll-method:         1;
     show-icons:            true;
     sidebar-mode:          true;
-    modi: "drun,internet:~/.config/rofi/rofi-filter internet,dev:~/.config/rofi/rofi-filter dev,games:~/.config/rofi/rofi-filter games,system:~/.config/rofi/rofi-filter system,media:~/.config/rofi/rofi-filter media,notifications:~/.config/rofi/rofi-filter notifications,clipboard:~/.config/rofi/rofi-filter clipboard";
+    modi: "drun,internet:~/.config/rofi/rofi-filter internet,dev:~/.config/rofi/rofi-filter dev,games:~/.config/rofi/rofi-filter games,system:~/.config/rofi/rofi-filter system,media:~/.config/rofi/rofi-filter media,notifications:~/.config/rofi/rofi-filter notifications,clipboard:~/.config/rofi/rofi-filter clipboard,powermenu:~/.config/rofi/rofi-filter powermenu";
     display-drun:          "ALL";
     display-internet:      "NET";
     display-dev:           "DEV";
@@ -13,6 +13,7 @@ configuration {
     display-media:         "MED";
     display-notifications: "NTF";
     display-clipboard:     "CLP";
+    display-powermenu:     "PWR";
     kb-remove-to-eol:      "";
     kb-mode-complete:      "";
     kb-remove-char-back:   "BackSpace,Shift+BackSpace";

rofi/rofi-filter

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 set -uo pipefail
 tmp_dir="/tmp/cliphist"
 mkdir -p "$tmp_dir"
@@ -12,6 +13,14 @@ if [[ -n "$selection" ]]; then
     elif [[ "$mode" == "notifications" ]]; then
         body="${selection#*— }"
         printf '%s' "$body" | wl-copy
+    elif [[ "$mode" == "powermenu" ]]; then
+        case "$ROFI_INFO" in
+            lock)      swaylock ;;
+            suspend)   systemctl suspend ;;
+            reboot)    systemctl reboot ;;
+            shutdown)  systemctl poweroff ;;
+            logout)    loginctl terminate-session "${XDG_SESSION_ID-}" ;;
+        esac
     else
         target_app=$(grep -rl "^Name=${selection}\$" /usr/share/applications/*.desktop 2>/dev/null | head -n1)
         if [[ -n "$target_app" ]]; then
@@ -72,4 +81,12 @@ case "$mode" in
             }
         ' /usr/share/applications/*.desktop 2>/dev/null
         ;;
+    powermenu)
+        echo -e "\0markup-rows\x1ftrue"
+        printf '%s\0info\x1flock\n'     "<span foreground=\"#88c0d0\"></span> lock"
+        printf '%s\0info\x1fsuspend\n'  "<span foreground=\"#5e81ac\">󰤄</span> suspend"
+        printf '%s\0info\x1freboot\n'   "<span foreground=\"#ebcb8b\"></span> reboot"
+        printf '%s\0info\x1fshutdown\n' "<span foreground=\"#bf616a\">⏻</span> shutdown"
+        printf '%s\0info\x1flogout\n'   "<span foreground=\"#b48ead\">󰗽</span> logout"
+    ;;
 esac

sway/config

@@ -25,16 +25,16 @@ set $right l
 set $term foot
 set $menu rofi -show drun
 set $file foot mc
-workspace 1 output HDMI-A-2
-workspace 2 output HDMI-A-2
-workspace 3 output HDMI-A-2
-workspace 4 output HDMI-A-2
-workspace 5 output HDMI-A-2
-workspace 6 output HDMI-A-2
-workspace 7 output DP-1
-workspace 8 output DP-1
-workspace 9 output DP-2
-workspace 0 output DP-2
+workspace 1  output HDMI-A-2
+workspace 2  output HDMI-A-2
+workspace 3  output HDMI-A-2
+workspace 4  output HDMI-A-2
+workspace 5  output HDMI-A-2
+workspace 6  output HDMI-A-2
+workspace 7  output DP-1
+workspace 8  output DP-1
+workspace 9  output DP-2
+workspace 10 output DP-2
 workspace 1
 output DP-1     bg ~/Pictures/wallhaven-43qlkd.jpg fill
 output HDMI-A-2 bg ~/Pictures/wallhaven-478kjo.jpg fill 

uwsm/env-sway

@@ -1,3 +1,4 @@
 export QT_QPA_PLATFORMTHEME=qt6ct
 export QT_QPA_PLATFORMTHEME_QT6=qt6ct
 export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/rbw/ssh-agent-socket"
+export SWAY_UNSUPPORTED_GPU=true

waybar/style.css

@@ -128,12 +128,14 @@ window#waybar {
     margin: 0 10px 0 0;
 }
 
-#wireplumber.source-muted,
-#wireplumber.sink-muted {
-    color: @nord3;
+#wireplumber.muted {
     color: @nord3;
 }
 
+#wireplumber {
+    color: @nord6;
+}
+
 #cpu,
 #temperature.cpu,
 #wireplumber.source {