From 3574ec7f6e869c731d46db4e8555982a424e9ca1 Mon Sep 17 00:00:00 2001 From: thek4n Date: Tue, 11 Nov 2025 22:04:32 +0300 Subject: [PATCH] sway notifications + refactor --- .gitignore | 3 +++ TARGETS.sh | 2 +- home/user/.config/mako/config | 1 + home/user/.config/sway/autostart.conf | 2 +- home/user/.config/sway/bindings.conf | 8 +------- home/user/.config/tmux/options.conf | 2 +- home/user/.local/bin/ga | 2 +- home/user/.local/bin/i3blocks_helper | 4 ++-- home/user/.local/bin/screenshot | 17 ++++------------- install-hooks/sway/pre-install | 2 +- 10 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 home/user/.config/mako/config diff --git a/.gitignore b/.gitignore index 8dd2c64..4a8bba0 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ home/user/.config/git/local home/user/.config/i3/config.d/* !home/user/.config/i3/config.d/.gitkeep + +home/user/.config/sway/config.d/* +!home/user/.config/sway/config.d/.gitkeep diff --git a/TARGETS.sh b/TARGETS.sh index 92640c2..0492d6e 100644 --- a/TARGETS.sh +++ b/TARGETS.sh @@ -13,7 +13,7 @@ git:.config/git .local/bin/ga ranger:.config/ranger gpg: i3:.xinitrc .xprofile .Xresources .config/i3 .config/i3blocks .config/rofi .config/picom .local/bin/slm .local/bin/slm_rofi.sh .local/bin/power_rofi.sh .local/bin/i3_switch_workspace.sh .config/mimeapps.list .local/bin/screenshot .local/bin/i3_swap_workspaces .local/bin/i3blocks_helper .local/bin/switch-layout %pomodoro -sway:.config/sway .config/waybar +sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .local/bin/screenshot .local/bin/i3blocks_helper %pomodoro pomodoro: bat:.config/bat font: diff --git a/home/user/.config/mako/config b/home/user/.config/mako/config new file mode 100644 index 0000000..addfa2e --- /dev/null +++ b/home/user/.config/mako/config @@ -0,0 +1 @@ +output=DP-1 diff --git a/home/user/.config/sway/autostart.conf b/home/user/.config/sway/autostart.conf index 84b8df1..d1ad5f3 100644 --- a/home/user/.config/sway/autostart.conf +++ b/home/user/.config/sway/autostart.conf @@ -8,4 +8,4 @@ exec swayidle -w \ # Notifications #systemctl --user enable --now dbus.service -exec --no-startup-id dunst +exec --no-startup-id mako diff --git a/home/user/.config/sway/bindings.conf b/home/user/.config/sway/bindings.conf index 2c5d65c..f5c9535 100644 --- a/home/user/.config/sway/bindings.conf +++ b/home/user/.config/sway/bindings.conf @@ -192,13 +192,7 @@ bindsym --to-code $mod+slash focus mode_toggle input type:keyboard { xkb_layout us,ru - xkb_options grp:win_space_toggle -} - -input * { - xkb_layout "us,ru" - xkb_options "grp:win_space_toggle" - xkb_options caps:ctrl_modifier + xkb_options grp:win_space_toggle,caps:ctrl_modifier xkb_model "pc101" repeat_delay 250 repeat_rate 100 diff --git a/home/user/.config/tmux/options.conf b/home/user/.config/tmux/options.conf index 0728b84..e9062d9 100644 --- a/home/user/.config/tmux/options.conf +++ b/home/user/.config/tmux/options.conf @@ -36,4 +36,4 @@ set -g terminal-overrides[101] "xterm-256color:Tc" set-hook -g after-new-session[101] 'rename-window -t 1 1' -set -g update-environment "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM LANG LC_ALL COLORTERM EDITOR VISUAL" +set -g update-environment "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM LANG LC_ALL COLORTERM EDITOR VISUAL SWAYSOCK WAYLAND_DISPLAY" diff --git a/home/user/.local/bin/ga b/home/user/.local/bin/ga index 93c5276..5ba2cd4 100755 --- a/home/user/.local/bin/ga +++ b/home/user/.local/bin/ga @@ -14,7 +14,7 @@ fzf_get_selected_untracked() { } gitadd() { - xargs git add + xargs git add } git_ls_files() { diff --git a/home/user/.local/bin/i3blocks_helper b/home/user/.local/bin/i3blocks_helper index 1662dd1..92b0353 100755 --- a/home/user/.local/bin/i3blocks_helper +++ b/home/user/.local/bin/i3blocks_helper @@ -77,10 +77,10 @@ cmd_bluetooth_battery() { } cmd_language() { - layout="$(xkblayout-state print %n)" + layout="$(swaymsg -t get_inputs | jq -r '.[] | select(.type == "keyboard") | .xkb_active_layout_name' | head -1)" case "${layout}" in - English) + "English (US)") echo "🇬🇧 En" ;; Russian) diff --git a/home/user/.local/bin/screenshot b/home/user/.local/bin/screenshot index e09ba34..a3144f5 100755 --- a/home/user/.local/bin/screenshot +++ b/home/user/.local/bin/screenshot @@ -45,18 +45,9 @@ _notify_error() { _notify critical "${NOTIFY_TIME_CRITICAL_MS}" "Error: ${1}" } -_maim() { - local maim_args=(--quality 10) - if [ -n "${NOOPENGL}" ]; then - maim_args+=--noopengl - fi - - maim ${maim_args} "${@}" -} - _capture_select() { local -r pipe="$(mktemp)" - _maim --select 2>"${pipe}" + grim -g "$(slurp)" - 2>"${pipe}" local -r code="$?" if grep -F "Selection was cancelled by keystroke or right-click." <"${pipe}"; then rm "${pipe}" @@ -68,15 +59,15 @@ _capture_select() { } _capture_entire() { - _maim + grim - } _capture_window() { - _maim --window "$(xdotool getactivewindow)" + grim -g "$(swaymsg -t get_tree | jq -r '.. | select(.type? == "con" and .focused == true) | .rect | "\(.x),\(.y) \(.width)x\(.height)"')" - } _copy_to_clipboard() { - xclip -selection clipboard -t image/png + wl-copy -t image/png } _save_to_file() { diff --git a/install-hooks/sway/pre-install b/install-hooks/sway/pre-install index cf9adc2..3d72e9c 100755 --- a/install-hooks/sway/pre-install +++ b/install-hooks/sway/pre-install @@ -1,3 +1,3 @@ #!/bin/sh -echo "pacman -S sway waybar swayidle" +echo "pacman -S sway waybar swayidle wl-clipboard ydotool grim slurp mako"