diff --git a/TARGETS.sh b/TARGETS.sh index ada85f8..f2b582d 100644 --- a/TARGETS.sh +++ b/TARGETS.sh @@ -1,18 +1,18 @@ readonly TARGETS="\ colors:.config/terminal-colors.d less:.lesskey .infokey -tmux:.config/tmux .tmux .config/systemd/user/tmux.service .local/bin/tmux_start_session.sh .local/bin/tmux_list_sessions.sh .local/bin/tmux_attach_session.sh .local/bin/tmux_kill_sessions.sh .local/bin/tmux_start_projects.sh +tmux:.config/tmux .tmux .config/systemd/user/tmux.service .local/bin/tmux_start_session.sh .local/bin/tmux_list_sessions.sh .local/bin/tmux_attach_session.sh .local/bin/tmux_kill_sessions.sh .local/bin/tmux_start_projects.sh %copypasta t: note: psw: -zsh:.config/zsh .zshenv .zshenv.d .inputrc %colors +zsh:.config/zsh .zshenv .zshenv.d .inputrc %copypasta %colors alacritty:.config/alacritty nvim:.config/nvim .editorconfig .editrc .local/bin/vim_askpass_helper ssh: git:.config/git .local/bin/ga ranger:.config/ranger gpg: -sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .config/rofi .local/bin/screenshot .local/bin/i3blocks_helper .local/bin/layout_change_handler .config/swaylock .Xresources .local/bin/sway_swap_workspaces .local/bin/slm .local/bin/slm_rofi %pomodoro +sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .config/rofi .local/bin/screenshot .local/bin/i3blocks_helper .local/bin/layout_change_handler .config/swaylock .Xresources .local/bin/sway_swap_workspaces .local/bin/slm .local/bin/slm_rofi %copypasta %pomodoro pomodoro: bat:.config/bat font: @@ -25,5 +25,6 @@ gdb:.config/gdb sandbox: utils:.local/bin/myip .local/bin/genpass .local/bin/gensalt .local/bin/django-create-project .local/bin/mirror-site .local/bin/split-file .local/bin/extract .local/bin/destroy chromium:.local/bin/pchromium .local/share/applications/pchromium.desktop -scripts:.local/bin/httpstatus .local/bin/bb .local/bin/emoji .local/bin/mksh .local/bin/nato .local/bin/pastas .local/bin/timer .local/bin/tryna .local/bin/trynafail .local/bin/bak .local/bin/cleanup-directory .local/bin/cleanup-directory-log .local/bin/cleanup-downloads .local/bin/gobuild .local/bin/json .local/bin/open .local/bin/py .local/bin/sha .local/bin/showtips .local/bin/weather .local/bin/radio .local/bin/rmt .local/bin/scratch .local/bin/tunes +scripts:.local/bin/httpstatus .local/bin/bb .local/bin/emoji .local/bin/mksh .local/bin/nato .local/bin/pastas .local/bin/timer .local/bin/tryna .local/bin/trynafail .local/bin/bak .local/bin/cleanup-directory .local/bin/cleanup-directory-log .local/bin/cleanup-downloads .local/bin/gobuild .local/bin/json .local/bin/open .local/bin/py .local/bin/sha .local/bin/showtips .local/bin/weather .local/bin/radio .local/bin/rmt .local/bin/scratch .local/bin/tunes %copypasta +copypasta:.local/bin/copy .local/bin/pasta all:%less %t %note %tmux %zsh %nvim %git" diff --git a/etc/systemd/system/getty@tty2.service.d/skip-username.conf b/etc/systemd/system/getty@tty2.service.d/skip-username.conf deleted file mode 120000 index d32b143..0000000 --- a/etc/systemd/system/getty@tty2.service.d/skip-username.conf +++ /dev/null @@ -1 +0,0 @@ -../getty@tty1.service.d/skip-username.conf \ No newline at end of file diff --git a/etc/systemd/system/getty@tty2.service.d/skip-username.conf b/etc/systemd/system/getty@tty2.service.d/skip-username.conf new file mode 100644 index 0000000..00e011f --- /dev/null +++ b/etc/systemd/system/getty@tty2.service.d/skip-username.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=-/sbin/agetty -o '-p -- %%USER%%' --noclear --skip-login - $TERM diff --git a/home/user/.config/tmux/mappings.conf b/home/user/.config/tmux/mappings.conf index 2162efe..e6ba8dc 100644 --- a/home/user/.config/tmux/mappings.conf +++ b/home/user/.config/tmux/mappings.conf @@ -183,14 +183,13 @@ bind C-p choose-buffer bind -T copy-mode-vi C-v send-keys -X rectangle-toggle -bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy --trim-newline" -bind -T copy-mode-vi Y send-keys -X copy-selection-and-cancel +bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "copy" bind MouseDrag1Pane copy-mode -bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy --trim-newline" +bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "copy" -bind -r p run-shell "wl-paste --no-newline | tmux load-buffer -; tmux paste-buffer -p" -bind -r з run-shell "wl-paste --no-newline | tmux load-buffer -; tmux paste-buffer -p" +bind -r p run-shell "pasta | tmux load-buffer -; tmux paste-buffer -p" +bind -r з run-shell "pasta | tmux load-buffer -; tmux paste-buffer -p" bind -r P paste-buffer -p diff --git a/home/user/.config/zsh/aliases b/home/user/.config/zsh/aliases index ab4dfda..4d02a09 100644 --- a/home/user/.config/zsh/aliases +++ b/home/user/.config/zsh/aliases @@ -127,25 +127,7 @@ alias colors='for i in {0..255}; do printf "\x1b[38;5;${i}mcolor${i} - ███ alias paste.thek4n.ru='curl --data-binary @- "https://paste.thek4n.ru/" 2>/dev/null' alias pastewww='paste.thek4n.ru' - -# clipboard -if [[ "${OSTYPE}" == "linux-gnu"* ]]; then - if [ -n "${DISPLAY}" ]; then - alias _copy='sed -z "$ s/\n$//" | wl-copy --trim-newline' - alias pasta='wl-paste --no-newline' - else - alias _copy='read -rd "EOF" TTYCLIPBOARD' - alias pasta='echo "$TTYCLIPBOARD"' - fi -elif [[ "${OSTYPE}" == "linux-android"* ]]; then - alias _copy='termux-clipboard-set' - alias pasta='termux-clipboard-get' -elif [[ "${OSTYPE}" == "darwin" ]]; then - alias _copy='pbcopy' - alias pasta='pbpaste' -fi - -alias copy='tee /dev/stderr | _copy' +alias copy='tee /dev/stderr | \copy' alias ssh='TERM=xterm-256color ssh' alias sshn='ssh -S none' diff --git a/home/user/.config/zsh/mappings b/home/user/.config/zsh/mappings index 9725e40..ed7d7b7 100644 --- a/home/user/.config/zsh/mappings +++ b/home/user/.config/zsh/mappings @@ -11,7 +11,7 @@ bindkey -M visual 'a' vi-add-next # Yank to the system clipboard function vi-yank-xclip { zle vi-yank - echo -n "$CUTBUFFER" | wl-copy --trim-newline # alias 'copy' from earlier loaded file + echo -n "$CUTBUFFER" | \copy } zle -N vi-yank-xclip diff --git a/home/user/.local/bin/copy b/home/user/.local/bin/copy new file mode 100755 index 0000000..dad575b --- /dev/null +++ b/home/user/.local/bin/copy @@ -0,0 +1,31 @@ +#!/bin/sh + +set -eu + + +case "${OSTYPE:-}" in + "linux-gnu"*) + if [ -n "${WAYLAND_DISPLAY}" ]; then + wl-copy --trim-newline + exit 0 + elif [ -n "${DISPLAY}" ]; then + xclip -selection clipboard -in + exit 0 + else + sed -z '$ s/\n$//' > "${HOME}/.ttyclipboard" + exit 0 + fi + ;; + "linux-android"*) + termux-clipboard-set + exit 0 + ;; + "darwin") + pbcopy + exit 0 + ;; + *) + sed -z '$ s/\n$//' > "${HOME}/.ttyclipboard" + exit 0 + ;; +esac diff --git a/home/user/.local/bin/pasta b/home/user/.local/bin/pasta new file mode 100755 index 0000000..a0fa920 --- /dev/null +++ b/home/user/.local/bin/pasta @@ -0,0 +1,31 @@ +#!/bin/sh + +set -eu + + +case "${OSTYPE:-}" in + "linux-gnu"*) + if [ -n "${WAYLAND_DISPLAY}" ]; then + wl-paste --no-newline + exit 0 + elif [ -n "${DISPLAY}" ]; then + xclip -selection clipboard -out + exit 0 + else + cat "${HOME}/.ttyclipboard" + exit 0 + fi + ;; + "linux-android"*) + termux-clipboard-get + exit 0 + ;; + "darwin") + pbpaste + exit 0 + ;; + *) + cat "${HOME}/.ttyclipboard" + exit 0 + ;; +esac diff --git a/home/user/.local/bin/pastas b/home/user/.local/bin/pastas index 970ad41..ed2ad43 100755 --- a/home/user/.local/bin/pastas +++ b/home/user/.local/bin/pastas @@ -7,11 +7,11 @@ last_value='' while true do - value="$(xclip -selection clipboard -o)" + value="$(pasta)" - if [ "$last_value" != "$value" ]; then - echo "$value" - last_value="$value" + if [ "${last_value}" != "${value}" ]; then + echo "${value}" + last_value="${value}" fi sleep 0.1